Skip to content

Commit 7948539

Browse files
lotyplotyp
committed
feat: removed bz2, pdo_mysql. minor fixes in templates
1 parent 376ee71 commit 7948539

File tree

15 files changed

+54
-125
lines changed

15 files changed

+54
-125
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ all: build test
1717
PHONY: all
1818

1919
build:
20-
cd $(CURRENT_DIR)/$(DOCKERFILE_DIR); \
20+
cd $(CURRENT_DIR)$(DOCKERFILE_DIR); \
2121
docker build . -t $(IMAGE_TAG)
2222
PHONY: build
2323

2424
build-from-cache:
25-
cd $(CURRENT_DIR)/$(DOCKERFILE_DIR); \
25+
cd $(CURRENT_DIR)$(DOCKERFILE_DIR); \
2626
docker build --cache-from $(CACHE_FROM) . -t $(IMAGE_TAG)
2727
PHONY: build-from-cache
2828

‎dist/base/7.4-cli-alpine/Dockerfile‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Auto-generated via Ansible: edit src/ansible/Dockerfiles/base/Dockerfile.j2 instead.
1+
# Auto-generated via Ansible: edit src/Dockerfiles/base/Dockerfile.j2 instead.
22

33
FROM php:7.4-cli-alpine
44

@@ -28,14 +28,11 @@ ENV PHP_MEMORY_LIMIT="256M"
2828

2929
RUN set -eux; \
3030
apk -U upgrade -a \
31-
# Add production dependencies
32-
&& apk add --update --no-cache \
33-
curl \
3431
# Temporary build dependencies for compiling Pecl extensions
35-
&& apk add --update --no-cache --virtual .temp-build-deps \
32+
&& apk add --no-cache --virtual .temp-build-deps \
3633
$PHPIZE_DEPS \
3734
# Intl - Internationalization; "icu-dev" is temporary build dependency
38-
&& apk add --update --no-cache \
35+
&& apk add --no-cache \
3936
icu-libs \
4037
icu-dev \
4138
&& docker-php-ext-install -j$(nproc) intl \
@@ -44,7 +41,6 @@ RUN set -eux; \
4441
&& docker-php-ext-install -j$(nproc) pcntl \
4542
&& docker-php-ext-install -j$(nproc) --ini-name docker-php-ext-00-sockets.ini sockets \
4643
# MySQL
47-
&& docker-php-ext-install -j$(nproc) pdo_mysql \
4844
# Postgres; "postgresql-dev" is temporary build dependency
4945
&& apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/main postgresql-dev \
5046
&& apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/main postgresql-libs \
@@ -53,35 +49,31 @@ RUN set -eux; \
5349
# Opcache
5450
&& docker-php-ext-install -j$(nproc) opcache \
5551
# Zip
56-
&& apk add --update --no-cache \
52+
&& apk add --no-cache \
5753
libzip \
5854
libzip-dev zlib-dev \
5955
&& docker-php-ext-install -j$(nproc) zip \
6056
&& apk del libzip-dev zlib-dev \
6157
# Bz2
62-
&& apk add --update --no-cache \
63-
libbz2 \
64-
bzip2-dev \
65-
&& docker-php-ext-install -j$(nproc) bz2 \
66-
&& apk del bzip2-dev \
6758
# Bcmath - Arbitrary Precision Mathematics
6859
&& docker-php-ext-install -j$(nproc) bcmath \
6960
####################################################################################################################
7061
# Pecl Dependencies
7162
# Redis - In-memory data structure store driver; zstd-dev is temporary build dependency
72-
&& apk add --update --no-cache \
63+
&& apk add --no-cache \
7364
zstd-libs \
7465
zstd-dev \
7566
&& pecl install redis-5.3.5RC1 \
7667
&& docker-php-ext-enable redis \
7768
&& apk del zstd-dev \
7869
# Decimal - Correctly-rounded arbitrary precision decimal floating point arithmetic
79-
&& apk add --update --no-cache \
70+
&& apk add --no-cache \
8071
mpdecimal-dev \
8172
mpdecimal \
8273
&& pecl install decimal-1.4.0 \
8374
&& docker-php-ext-enable decimal \
8475
&& apk del mpdecimal-dev \
76+
&& chown -R www-data /usr/local/etc/php/conf.d/ \
8577
&& apk del -f .temp-build-deps
8678

8779
COPY --chown=www-data ./configs/ /usr/local/etc/php/conf.d/

‎dist/base/7.4-cli-alpine/goss.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@ command:
3434
"php -m":
3535
stdout:
3636
- bcmath
37-
- bz2
3837
- decimal
3938
- intl
4039
- OPcache
4140
- pcntl
42-
- pdo_mysql
4341
- pdo_pgsql
4442
- redis
4543
- sockets

‎dist/base/7.4-fpm-alpine/Dockerfile‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Auto-generated via Ansible: edit src/ansible/Dockerfiles/base/Dockerfile.j2 instead.
1+
# Auto-generated via Ansible: edit src/Dockerfiles/base/Dockerfile.j2 instead.
22

33
FROM php:7.4-fpm-alpine
44

@@ -29,14 +29,11 @@ ENV PHPFPM_SLOWLOG_TIMEOUT="5s"
2929

3030
RUN set -eux; \
3131
apk -U upgrade -a \
32-
# Add production dependencies
33-
&& apk add --update --no-cache \
34-
curl \
3532
# Temporary build dependencies for compiling Pecl extensions
36-
&& apk add --update --no-cache --virtual .temp-build-deps \
33+
&& apk add --no-cache --virtual .temp-build-deps \
3734
$PHPIZE_DEPS \
3835
# Intl - Internationalization; "icu-dev" is temporary build dependency
39-
&& apk add --update --no-cache \
36+
&& apk add --no-cache \
4037
icu-libs \
4138
icu-dev \
4239
&& docker-php-ext-install -j$(nproc) intl \
@@ -45,7 +42,6 @@ RUN set -eux; \
4542
&& docker-php-ext-install -j$(nproc) pcntl \
4643
&& docker-php-ext-install -j$(nproc) --ini-name docker-php-ext-00-sockets.ini sockets \
4744
# MySQL
48-
&& docker-php-ext-install -j$(nproc) pdo_mysql \
4945
# Postgres; "postgresql-dev" is temporary build dependency
5046
&& apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/main postgresql-dev \
5147
&& apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/main postgresql-libs \
@@ -54,35 +50,31 @@ RUN set -eux; \
5450
# Opcache
5551
&& docker-php-ext-install -j$(nproc) opcache \
5652
# Zip
57-
&& apk add --update --no-cache \
53+
&& apk add --no-cache \
5854
libzip \
5955
libzip-dev zlib-dev \
6056
&& docker-php-ext-install -j$(nproc) zip \
6157
&& apk del libzip-dev zlib-dev \
6258
# Bz2
63-
&& apk add --update --no-cache \
64-
libbz2 \
65-
bzip2-dev \
66-
&& docker-php-ext-install -j$(nproc) bz2 \
67-
&& apk del bzip2-dev \
6859
# Bcmath - Arbitrary Precision Mathematics
6960
&& docker-php-ext-install -j$(nproc) bcmath \
7061
####################################################################################################################
7162
# Pecl Dependencies
7263
# Redis - In-memory data structure store driver; zstd-dev is temporary build dependency
73-
&& apk add --update --no-cache \
64+
&& apk add --no-cache \
7465
zstd-libs \
7566
zstd-dev \
7667
&& pecl install redis-5.3.5RC1 \
7768
&& docker-php-ext-enable redis \
7869
&& apk del zstd-dev \
7970
# Decimal - Correctly-rounded arbitrary precision decimal floating point arithmetic
80-
&& apk add --update --no-cache \
71+
&& apk add --no-cache \
8172
mpdecimal-dev \
8273
mpdecimal \
8374
&& pecl install decimal-1.4.0 \
8475
&& docker-php-ext-enable decimal \
8576
&& apk del mpdecimal-dev \
77+
&& chown -R www-data /usr/local/etc/php/conf.d/ \
8678
&& apk del -f .temp-build-deps
8779

8880
COPY --chown=www-data ./configs/ /usr/local/etc/php/conf.d/

‎dist/base/7.4-fpm-alpine/goss.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@ command:
4545
"php -m":
4646
stdout:
4747
- bcmath
48-
- bz2
4948
- decimal
5049
- intl
5150
- OPcache
5251
- pcntl
53-
- pdo_mysql
5452
- pdo_pgsql
5553
- redis
5654
- sockets

‎dist/base/8.0-cli-alpine/Dockerfile‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Auto-generated via Ansible: edit src/ansible/Dockerfiles/base/Dockerfile.j2 instead.
1+
# Auto-generated via Ansible: edit src/Dockerfiles/base/Dockerfile.j2 instead.
22

33
FROM php:8.0-cli-alpine
44

@@ -28,14 +28,11 @@ ENV PHP_MEMORY_LIMIT="256M"
2828

2929
RUN set -eux; \
3030
apk -U upgrade -a \
31-
# Add production dependencies
32-
&& apk add --update --no-cache \
33-
curl \
3431
# Temporary build dependencies for compiling Pecl extensions
35-
&& apk add --update --no-cache --virtual .temp-build-deps \
32+
&& apk add --no-cache --virtual .temp-build-deps \
3633
$PHPIZE_DEPS \
3734
# Intl - Internationalization; "icu-dev" is temporary build dependency
38-
&& apk add --update --no-cache \
35+
&& apk add --no-cache \
3936
icu-libs \
4037
icu-dev \
4138
&& docker-php-ext-install -j$(nproc) intl \
@@ -44,7 +41,6 @@ RUN set -eux; \
4441
&& docker-php-ext-install -j$(nproc) pcntl \
4542
&& docker-php-ext-install -j$(nproc) --ini-name docker-php-ext-00-sockets.ini sockets \
4643
# MySQL
47-
&& docker-php-ext-install -j$(nproc) pdo_mysql \
4844
# Postgres; "postgresql-dev" is temporary build dependency
4945
&& apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/main postgresql-dev \
5046
&& apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/main postgresql-libs \
@@ -53,35 +49,31 @@ RUN set -eux; \
5349
# Opcache
5450
&& docker-php-ext-install -j$(nproc) opcache \
5551
# Zip
56-
&& apk add --update --no-cache \
52+
&& apk add --no-cache \
5753
libzip \
5854
libzip-dev zlib-dev \
5955
&& docker-php-ext-install -j$(nproc) zip \
6056
&& apk del libzip-dev zlib-dev \
6157
# Bz2
62-
&& apk add --update --no-cache \
63-
libbz2 \
64-
bzip2-dev \
65-
&& docker-php-ext-install -j$(nproc) bz2 \
66-
&& apk del bzip2-dev \
6758
# Bcmath - Arbitrary Precision Mathematics
6859
&& docker-php-ext-install -j$(nproc) bcmath \
6960
####################################################################################################################
7061
# Pecl Dependencies
7162
# Redis - In-memory data structure store driver; zstd-dev is temporary build dependency
72-
&& apk add --update --no-cache \
63+
&& apk add --no-cache \
7364
zstd-libs \
7465
zstd-dev \
7566
&& pecl install redis-5.3.5RC1 \
7667
&& docker-php-ext-enable redis \
7768
&& apk del zstd-dev \
7869
# Decimal - Correctly-rounded arbitrary precision decimal floating point arithmetic
79-
&& apk add --update --no-cache \
70+
&& apk add --no-cache \
8071
mpdecimal-dev \
8172
mpdecimal \
8273
&& pecl install decimal-1.4.0 \
8374
&& docker-php-ext-enable decimal \
8475
&& apk del mpdecimal-dev \
76+
&& chown -R www-data /usr/local/etc/php/conf.d/ \
8577
&& apk del -f .temp-build-deps
8678

8779
COPY --chown=www-data ./configs/ /usr/local/etc/php/conf.d/

‎dist/base/8.0-cli-alpine/goss.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@ command:
3434
"php -m":
3535
stdout:
3636
- bcmath
37-
- bz2
3837
- decimal
3938
- intl
4039
- OPcache
4140
- pcntl
42-
- pdo_mysql
4341
- pdo_pgsql
4442
- redis
4543
- sockets

‎dist/base/8.0-fpm-alpine/Dockerfile‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Auto-generated via Ansible: edit src/ansible/Dockerfiles/base/Dockerfile.j2 instead.
1+
# Auto-generated via Ansible: edit src/Dockerfiles/base/Dockerfile.j2 instead.
22

33
FROM php:8.0-fpm-alpine
44

@@ -29,14 +29,11 @@ ENV PHPFPM_SLOWLOG_TIMEOUT="5s"
2929

3030
RUN set -eux; \
3131
apk -U upgrade -a \
32-
# Add production dependencies
33-
&& apk add --update --no-cache \
34-
curl \
3532
# Temporary build dependencies for compiling Pecl extensions
36-
&& apk add --update --no-cache --virtual .temp-build-deps \
33+
&& apk add --no-cache --virtual .temp-build-deps \
3734
$PHPIZE_DEPS \
3835
# Intl - Internationalization; "icu-dev" is temporary build dependency
39-
&& apk add --update --no-cache \
36+
&& apk add --no-cache \
4037
icu-libs \
4138
icu-dev \
4239
&& docker-php-ext-install -j$(nproc) intl \
@@ -45,7 +42,6 @@ RUN set -eux; \
4542
&& docker-php-ext-install -j$(nproc) pcntl \
4643
&& docker-php-ext-install -j$(nproc) --ini-name docker-php-ext-00-sockets.ini sockets \
4744
# MySQL
48-
&& docker-php-ext-install -j$(nproc) pdo_mysql \
4945
# Postgres; "postgresql-dev" is temporary build dependency
5046
&& apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/main postgresql-dev \
5147
&& apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/main postgresql-libs \
@@ -54,35 +50,31 @@ RUN set -eux; \
5450
# Opcache
5551
&& docker-php-ext-install -j$(nproc) opcache \
5652
# Zip
57-
&& apk add --update --no-cache \
53+
&& apk add --no-cache \
5854
libzip \
5955
libzip-dev zlib-dev \
6056
&& docker-php-ext-install -j$(nproc) zip \
6157
&& apk del libzip-dev zlib-dev \
6258
# Bz2
63-
&& apk add --update --no-cache \
64-
libbz2 \
65-
bzip2-dev \
66-
&& docker-php-ext-install -j$(nproc) bz2 \
67-
&& apk del bzip2-dev \
6859
# Bcmath - Arbitrary Precision Mathematics
6960
&& docker-php-ext-install -j$(nproc) bcmath \
7061
####################################################################################################################
7162
# Pecl Dependencies
7263
# Redis - In-memory data structure store driver; zstd-dev is temporary build dependency
73-
&& apk add --update --no-cache \
64+
&& apk add --no-cache \
7465
zstd-libs \
7566
zstd-dev \
7667
&& pecl install redis-5.3.5RC1 \
7768
&& docker-php-ext-enable redis \
7869
&& apk del zstd-dev \
7970
# Decimal - Correctly-rounded arbitrary precision decimal floating point arithmetic
80-
&& apk add --update --no-cache \
71+
&& apk add --no-cache \
8172
mpdecimal-dev \
8273
mpdecimal \
8374
&& pecl install decimal-1.4.0 \
8475
&& docker-php-ext-enable decimal \
8576
&& apk del mpdecimal-dev \
77+
&& chown -R www-data /usr/local/etc/php/conf.d/ \
8678
&& apk del -f .temp-build-deps
8779

8880
COPY --chown=www-data ./configs/ /usr/local/etc/php/conf.d/

‎dist/base/8.0-fpm-alpine/goss.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@ command:
4545
"php -m":
4646
stdout:
4747
- bcmath
48-
- bz2
4948
- decimal
5049
- intl
5150
- OPcache
5251
- pcntl
53-
- pdo_mysql
5452
- pdo_pgsql
5553
- redis
5654
- sockets

0 commit comments

Comments
 (0)