Skip to content

Commit bf40dd6

Browse files
authoredMay 4, 2019
Merge pull request #24 from devilbox/release-0.23
Fix build of sodium
2 parents 4554889 + 0f15f8c commit bf40dd6

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed
 

‎Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,10 @@ RUN set -eux; \
174174
# https://wiki.php.net/rfc/argon2_password_hash (7.2+)
175175
--with-password-argon2 \
176176
# https://wiki.php.net/rfc/libsodium
177-
--with-sodium=shared \
177+
#--with-sodium=shared \
178+
# TODO: The above resulted in: undefined symbol: sodium_init
179+
# https://github.com/docker-library/php/blob/master/7.3/stretch/fpm/Dockerfile#L173
180+
--with-sodium \
178181
\
179182
--with-curl \
180183
--with-libedit \
@@ -223,8 +226,10 @@ RUN set -eux; \
223226

224227
COPY data/docker-php-ext-* data/docker-php-entrypoint /usr/local/bin/
225228

229+
# https://github.com/docker-library/php/blob/master/7.3/stretch/fpm/Dockerfile#L221
226230
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
227-
RUN docker-php-ext-enable sodium
231+
# TODO: --with-sodium=shared it results in: undefined symbol: sodium_init
232+
#RUN docker-php-ext-enable sodium
228233

229234
ENTRYPOINT ["docker-php-entrypoint"]
230235
##<autogenerated>##

0 commit comments

Comments
 (0)
Failed to load comments.