Skip to content

Commit

Permalink
Merge pull request #179 from GrahamCampbell/upgrade-libsodium
Browse files Browse the repository at this point in the history
Upgrade libsodium to 1.0.20
  • Loading branch information
mnapoli authored Jun 10, 2024
2 parents 534f3cb + a702ce4 commit 0af22c1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions php-80/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,11 @@ RUN cmake --build . --target install
# https://github.com/jedisct1/libsodium/releases
# Needed by:
# - php
ENV VERSION_LIBSODIUM=1.0.19
ENV VERSION_LIBSODIUM=1.0.20
ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium
RUN set -xe; \
mkdir -p ${LIBSODIUM_BUILD_DIR}; \
curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}.tar.gz \
curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}-RELEASE.tar.gz \
| tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1
WORKDIR ${LIBSODIUM_BUILD_DIR}/
RUN CFLAGS="" \
Expand Down
4 changes: 2 additions & 2 deletions php-81/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,11 @@ RUN cmake --build . --target install
# https://github.com/jedisct1/libsodium/releases
# Needed by:
# - php
ENV VERSION_LIBSODIUM=1.0.19
ENV VERSION_LIBSODIUM=1.0.20
ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium
RUN set -xe; \
mkdir -p ${LIBSODIUM_BUILD_DIR}; \
curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}.tar.gz \
curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}-RELEASE.tar.gz \
| tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1
WORKDIR ${LIBSODIUM_BUILD_DIR}/
RUN CFLAGS="" \
Expand Down
4 changes: 2 additions & 2 deletions php-82/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,11 @@ RUN cmake --build . --target install
# https://github.com/jedisct1/libsodium/releases
# Needed by:
# - php
ENV VERSION_LIBSODIUM=1.0.19
ENV VERSION_LIBSODIUM=1.0.20
ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium
RUN set -xe; \
mkdir -p ${LIBSODIUM_BUILD_DIR}; \
curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}.tar.gz \
curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}-RELEASE.tar.gz \
| tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1
WORKDIR ${LIBSODIUM_BUILD_DIR}/
RUN CFLAGS="" \
Expand Down
4 changes: 2 additions & 2 deletions php-83/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,11 @@ RUN cmake --build . --target install
# https://github.com/jedisct1/libsodium/releases
# Needed by:
# - php
ENV VERSION_LIBSODIUM=1.0.19
ENV VERSION_LIBSODIUM=1.0.20
ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium
RUN set -xe; \
mkdir -p ${LIBSODIUM_BUILD_DIR}; \
curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}.tar.gz \
curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}-RELEASE.tar.gz \
| tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1
WORKDIR ${LIBSODIUM_BUILD_DIR}/
RUN CFLAGS="" \
Expand Down

0 comments on commit 0af22c1

Please sign in to comment.