Skip to content

Commit 3134221

Browse files
Fixing aerospike
1 parent 4cf5f3e commit 3134221

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

php-fpm/Dockerfile-71

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,15 @@ RUN if [ ${INSTALL_EXIF} = true ]; then \
158158

159159
ARG INSTALL_AEROSPIKE=false
160160
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
161+
161162
# Copy aerospike configration for remote debugging
162163
COPY ./aerospike.ini /usr/local/etc/php/conf.d/aerospike.ini
164+
163165
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
166+
# Fix dependencies for PHPUnit within aerospike extension
167+
apt-get update -yqq && \
168+
apt-get -y install sudo wget && \
169+
164170
# Install the php aerospike extension
165171
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
166172
&& mkdir -p aerospike-client-php \
@@ -172,7 +178,10 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
172178
&& make install \
173179
) \
174180
&& rm /tmp/aerospike-client-php.tar.gz \
175-
&& docker-php-ext-enable aerospike \
181+
;fi
182+
183+
RUN if [ ${INSTALL_AEROSPIKE} = false ]; then \
184+
rm /usr/local/etc/php/conf.d/aerospike.ini \
176185
;fi
177186

178187
#####################################

workspace/Dockerfile-71

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,17 @@ RUN if [ ${INSTALL_YARN} = true ]; then \
274274
#####################################
275275
USER root
276276

277-
ARG INSTALL_AEROSPIKE=true
277+
ARG INSTALL_AEROSPIKE=false
278278
ENV INSTALL_AEROSPIKE ${INSTALL_AEROSPIKE}
279279

280280
# Copy aerospike configration for remote debugging
281281
COPY ./aerospike.ini /etc/php/7.1/cli/conf.d/aerospike.ini
282282

283283
RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
284+
# Fix dependencies for PHPUnit within aerospike extension
285+
apt-get update -yqq && \
286+
apt-get -y install sudo wget && \
287+
284288
# Install the php aerospike extension
285289
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
286290
&& mkdir -p aerospike-client-php \

0 commit comments

Comments
 (0)