Skip to content

Commit 603010c

Browse files
author
Marius van Zundert
committed
Split up mysqli and tokenizer
1 parent b45f395 commit 603010c

4 files changed

Lines changed: 34 additions & 14 deletions

File tree

docker-compose.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ services:
5656
- INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}
5757
- INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
5858
- INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
59-
- INSTALL_EXIF=${PHP_FPM_DOCKER_FILE}
60-
- INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_DOCKER_FILE}
61-
- CODEIGNITER=${PHP_FPM_DOCKER_FILE}
59+
- INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
60+
- INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
61+
- INSTALL_MYSQLI=${PHP_FPM_MYSQLI}
62+
- INSTALL_TOKENIZER=${PHP_FPM_TOKENIZER}
6263
dockerfile: ${PHP_FPM_DOCKER_FILE}
6364
volumes_from:
6465
- applications

env-example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ PHP_FPM_INSTALL_MEMCACHED=false
5151
PHP_FPM_INSTALL_OPCACHE=false
5252
PHP_FPM_INSTALL_EXIF=false
5353
PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
54-
PHP_FPM_CODEIGNITER=falses
54+
PHP_FPM_MYSQLI=false
55+
PHP_FPM_TOKENIZER=false
5556

5657
# NGINX
5758
NGINX_HOST_HTTP_PORT=8080

php-fpm/Dockerfile-56

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,22 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
142142
COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
143143

144144
#####################################
145-
# Codeigniter Modifications:
145+
# Mysqli Modifications:
146146
#####################################
147147

148-
ARG CODEIGNITER=false
149-
RUN if [ ${CODEIGNITER} = true ]; then \
150-
# Install Codeigniter PHP extentions requirements
151-
docker-php-ext-install mysqli && \
148+
ARG INSTALL_MYSQLI=false
149+
RUN if [ ${INSTALL_MYSQLI} = true ]; then \
150+
# Install mysqli PHP extentions requirements
151+
docker-php-ext-install mysqli && \
152+
;fi
153+
154+
#####################################
155+
# Tokenizer Modifications:
156+
#####################################
157+
158+
ARG INSTALL_TOKENIZER=false
159+
RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
160+
# Install tokenizer PHP extentions requirements
152161
docker-php-ext-install tokenizer \
153162
;fi
154163

php-fpm/Dockerfile-70

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,22 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \
176176
COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini
177177

178178
#####################################
179-
# Codeigniter Modifications:
179+
# Mysqli Modifications:
180180
#####################################
181181

182-
ARG CODEIGNITER=false
183-
RUN if [ ${CODEIGNITER} = true ]; then \
184-
# Install Codeigniter PHP extentions requirements
185-
docker-php-ext-install mysqli && \
182+
ARG INSTALL_MYSQLI=false
183+
RUN if [ ${INSTALL_MYSQLI} = true ]; then \
184+
# Install mysqli PHP extentions requirements
185+
docker-php-ext-install mysqli && \
186+
;fi
187+
188+
#####################################
189+
# Tokenizer Modifications:
190+
#####################################
191+
192+
ARG INSTALL_TOKENIZER=false
193+
RUN if [ ${INSTALL_TOKENIZER} = true ]; then \
194+
# Install tokenizer PHP extentions requirements
186195
docker-php-ext-install tokenizer \
187196
;fi
188197

0 commit comments

Comments
 (0)