Skip to content

Commit

Permalink
Merge pull request #14 from CSCfi/docs/update-emscript-libsodium
Browse files Browse the repository at this point in the history
Docs/update emscript libsodium
  • Loading branch information
blankdots authored Dec 18, 2023
2 parents 79b0d86 + 11f1360 commit 70bde47
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ARG EMSCRIPTEN_VERSION=3.1.43
ARG EMSCRIPTEN_VERSION=3.1.51

# Build libsodium
FROM emscripten/emsdk:$EMSCRIPTEN_VERSION AS SODIUM
FROM docker.io/emscripten/emsdk:$EMSCRIPTEN_VERSION AS SODIUM

ARG LIBSODIUM_VERSION=1.0.18-stable
ARG LIBSODIUM_VERSION=1.0.19-stable

ADD https://download.libsodium.org/libsodium/releases/libsodium-${LIBSODIUM_VERSION}.tar.gz .

Expand All @@ -12,9 +12,9 @@ RUN tar xvf libsodium-${LIBSODIUM_VERSION}.tar.gz \
&& dist-build/emscripten.sh --sumo

# Build openssl
FROM emscripten/emsdk:$EMSCRIPTEN_VERSION AS OPENSSL
FROM docker.io/emscripten/emsdk:$EMSCRIPTEN_VERSION AS OPENSSL

ARG OPENSSL_VERSION=1.1.1u
ARG OPENSSL_VERSION=1.1.1w

ADD https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz .
ADD https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz.sha256 .
Expand All @@ -30,7 +30,7 @@ RUN bash -c 'echo "$(cat openssl-${OPENSSL_VERSION}.tar.gz.sha256) openssl-${OPE
&& emmake make install

# Build libcrypt4gh
FROM emscripten/emsdk:$EMSCRIPTEN_VERSION AS LIBCRYPT4GH
FROM docker.io/emscripten/emsdk:$EMSCRIPTEN_VERSION AS LIBCRYPT4GH

RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache

Expand All @@ -57,7 +57,7 @@ RUN export EMCC_CFLAGS="-I/emsdk/upstream/include -L/emsdk/upstream/lib" \
&& emmake make install

# Build libcrypt4gh-keys
FROM emscripten/emsdk:$EMSCRIPTEN_VERSION AS LIBCRYPT4GHKEYS
FROM docker.io/emscripten/emsdk:$EMSCRIPTEN_VERSION AS LIBCRYPT4GHKEYS

COPY --from=SODIUM /src/libsodium-stable/libsodium-js-sumo/include/ /emsdk/upstream/include/
COPY --from=SODIUM /src/libsodium-stable/libsodium-js-sumo/lib/ /emsdk/upstream/lib/
Expand Down Expand Up @@ -85,7 +85,7 @@ RUN export EMCC_CFLAGS="-I/emsdk/upstream/include -L/emsdk/upstream/lib" \
&& emmake make install

# Build wasm application
FROM emscripten/emsdk:$EMSCRIPTEN_VERSION AS WASMCRYPT
FROM docker.io/emscripten/emsdk:$EMSCRIPTEN_VERSION AS WASMCRYPT

LABEL maintainer="CSC Developers"
LABEL org.label-schema.schema-version="1.0"
Expand Down

0 comments on commit 70bde47

Please sign in to comment.