fix: satiate hadolint
Build Container Image / build_emscripten_amd64 (push) Successful in 6m40s Details
Build Container Image / build_emscripten (push) Successful in 1m0s Details
Build Container Image / push_emscripten_amd64 (push) Successful in 2m13s Details
Build Container Image / push_emscripten (push) Successful in 51s Details
Build Container Image / build_wasi_amd64 (push) Failing after 1m16s Details
Build Container Image / push_wasi_amd64 (push) Has been skipped Details
Build Container Image / build_wasi (push) Has been skipped Details
Build Container Image / push_wasi (push) Has been skipped Details
Build Container Image / update_readme (push) Has been skipped Details
Build Container Image / build_latest_amd64 (push) Failing after 5m43s Details
Build Container Image / push_latest_amd64 (push) Has been skipped Details
Build Container Image / build_latest (push) Has been skipped Details
Build Container Image / push_latest (push) Has been skipped Details

This commit is contained in:
Daniel Wolf 2024-03-31 14:40:06 -04:00
parent cdb1bda35f
commit 7386dcbbad
Signed by: nephatrine
GPG Key ID: 59D70EC2E4AAB4D0
3 changed files with 35 additions and 28 deletions

View File

@ -2,14 +2,17 @@
#
# SPDX-License-Identifier: ISC
# hadolint ignore=DL3007
FROM code.nephatrine.net/nephnet/nxb-debian:latest
LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ENV EMSCRIPTEN_PATH=/opt/emsdk
ARG EMSCRIPTEN_VERSION=3.1.56
RUN echo "====== INSTALL EMSCRIPTEN ======" \
&& git -C /opt clone -b "$EMSCRIPTEN_VERSION" --single-branch --depth=1 https://github.com/emscripten-core/emsdk.git && cd /opt/emsdk \
&& ./emsdk install "${EMSCRIPTEN_VERSION}" --shallow --generator=Ninja \
RUN git -C /opt clone -b "$EMSCRIPTEN_VERSION" --single-branch --depth=1 https://github.com/emscripten-core/emsdk.git
WORKDIR /opt/emsdk
# hadolint ignore=SC1091
RUN ./emsdk install "${EMSCRIPTEN_VERSION}" --shallow --generator=Ninja \
&& ./emsdk activate "${EMSCRIPTEN_VERSION}" \
&& . ./emsdk_env.sh \
&& embuilder build SYSTEM --pic --lto \
@ -17,20 +20,20 @@ RUN echo "====== INSTALL EMSCRIPTEN ======" \
ENV PATH=${EMSCRIPTEN_PATH}:${EMSCRIPTEN_PATH}/upstream/emscripten:$PATH
ARG WASI_VERSION=21
RUN echo "====== INSTALL WASI-SDK ======" \
&& cd /opt \
&& curl https://wasmtime.dev/install.sh -sSf | bash \
&& wget --progress=dot:giga https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION}.0-linux.tar.gz \
&& tar -xvzf wasi-sdk-${WASI_VERSION}.0-linux.tar.gz \
&& mv wasi-sdk-${WASI_VERSION}.0 wasi-sdk \
&& cp -nrvs /opt/wasi-sdk/share/cmake/Platform/. "/usr/share/$(ls /usr/share/ | egrep 'cmake-[0-9]' | tail -1)/Modules/Platform/" \
&& rm -rf /tmp/* /var/tmp/* /opt/wasi-sdk-${WASI_VERSION}.0-linux.tar.gz
WORKDIR /opt
# hadolint ignore=SC2010
RUN curl https://wasmtime.dev/install.sh -sSf | bash \
&& curl -O "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION}.0-linux.tar.gz" \
&& tar -xvzf "wasi-sdk-${WASI_VERSION}.0-linux.tar.gz" \
&& mv "wasi-sdk-${WASI_VERSION}.0 wasi-sdk" \
&& cp -nrvs /opt/wasi-sdk/share/cmake/Platform/. "/usr/share/$(ls /usr/share/ | grep -E 'cmake-[0-9]' | tail -1)/Modules/Platform/" \
&& rm -rf /tmp/* /var/tmp/* "/opt/wasi-sdk-${WASI_VERSION}.0-linux.tar.gz"
ENV WASI_SDK_PREFIX=/opt/wasi-sdk WASMTIME_HOME=/root/.wasmtime
ENV PATH=${WASMTIME_HOME}/bin:$PATH
COPY override /
RUN echo "====== TEST TOOLCHAINS ======" \
&& git -C "${HOME}" clone --single-branch --depth=1 https://code.nephatrine.net/nephatrine/hello-test.git \
# hadolint ignore=DL3003
RUN git -C "${HOME}" clone --single-branch --depth=1 https://code.nephatrine.net/nephatrine/hello-test.git \
&& mkdir /tmp/build-emscripten && cd /tmp/build-emscripten \
&& nxbuild-emscripten -GNinja "${HOME}/hello-test" \
&& ninja && node HelloTest \

View File

@ -2,14 +2,16 @@
#
# SPDX-License-Identifier: ISC
# hadolint ignore=DL3007
FROM code.nephatrine.net/nephnet/nxb-debian:latest
LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
ENV EMSCRIPTEN_PATH=/opt/emsdk
ARG EMSCRIPTEN_VERSION=3.1.56
RUN echo "====== INSTALL EMSCRIPTEN ======" \
&& git -C /opt clone -b "$EMSCRIPTEN_VERSION" --single-branch --depth=1 https://github.com/emscripten-core/emsdk.git && cd /opt/emsdk \
&& ./emsdk install "${EMSCRIPTEN_VERSION}" --shallow --generator=Ninja \
RUN git -C /opt clone -b "$EMSCRIPTEN_VERSION" --single-branch --depth=1 https://github.com/emscripten-core/emsdk.git
WORKDIR /opt/emsdk
# hadolint ignore=SC1091
RUN ./emsdk install "${EMSCRIPTEN_VERSION}" --shallow --generator=Ninja \
&& ./emsdk activate "${EMSCRIPTEN_VERSION}" \
&& . ./emsdk_env.sh \
&& embuilder build SYSTEM --pic --lto \
@ -17,8 +19,8 @@ RUN echo "====== INSTALL EMSCRIPTEN ======" \
ENV PATH=${EMSCRIPTEN_PATH}:${EMSCRIPTEN_PATH}/upstream/emscripten:$PATH
COPY override/usr/local/bin/nxbuild-emscripten /usr/local/bin/
RUN echo "====== TEST TOOLCHAINS ======" \
&& git -C "${HOME}" clone --single-branch --depth=1 https://code.nephatrine.net/nephatrine/hello-test.git \
# hadolint ignore=DL3003
RUN git -C "${HOME}" clone --single-branch --depth=1 https://code.nephatrine.net/nephatrine/hello-test.git \
&& mkdir /tmp/build-emscripten && cd /tmp/build-emscripten \
&& nxbuild-emscripten -GNinja "${HOME}/hello-test" \
&& ninja && node HelloTest \

View File

@ -2,24 +2,26 @@
#
# SPDX-License-Identifier: ISC
# hadolint ignore=DL3007
FROM code.nephatrine.net/nephnet/nxb-debian:latest
LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG WASI_VERSION=21
RUN echo "====== INSTALL WASI-SDK ======" \
&& cd /opt \
&& curl https://wasmtime.dev/install.sh -sSf | bash \
&& wget --progress=dot:giga https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION}.0-linux.tar.gz \
&& tar -xvzf wasi-sdk-${WASI_VERSION}.0-linux.tar.gz \
&& mv wasi-sdk-${WASI_VERSION}.0 wasi-sdk \
&& cp -nrvs /opt/wasi-sdk/share/cmake/Platform/. "/usr/share/$(ls /usr/share/ | egrep 'cmake-[0-9]' | tail -1)/Modules/Platform/" \
&& rm -rf /tmp/* /var/tmp/* /opt/wasi-sdk-${WASI_VERSION}.0-linux.tar.gz
WORKDIR /opt
# hadolint ignore=SC2010
RUN curl https://wasmtime.dev/install.sh -sSf | bash \
&& curl -O "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION}.0-linux.tar.gz" \
&& tar -xvzf "wasi-sdk-${WASI_VERSION}.0-linux.tar.gz" \
&& mv "wasi-sdk-${WASI_VERSION}.0" wasi-sdk \
&& cp -nrvs /opt/wasi-sdk/share/cmake/Platform/. "/usr/share/$(ls /usr/share/ | grep -E 'cmake-[0-9]' | tail -1)/Modules/Platform/" \
&& rm -rf /tmp/* /var/tmp/* "/opt/wasi-sdk-${WASI_VERSION}.0-linux.tar.gz"
ENV WASI_SDK_PREFIX=/opt/wasi-sdk WASMTIME_HOME=/root/.wasmtime
ENV PATH=${WASMTIME_HOME}/bin:${WASI_SDK_PREFIX}/bin:$PATH
COPY override/usr/local/bin/nxbuild-wasi /usr/local/bin/
RUN echo "====== TEST TOOLCHAINS ======" \
&& git -C "${HOME}" clone --single-branch --depth=1 https://code.nephatrine.net/nephatrine/hello-test.git \
# hadolint ignore=DL3003
RUN git -C "${HOME}" clone --single-branch --depth=1 https://code.nephatrine.net/nephatrine/hello-test.git \
&& mkdir /tmp/build-wasi && cd /tmp/build-wasi \
&& nxbuild-wasi -GNinja "${HOME}/hello-test" \
&& ninja && wasmtime HelloTest \