Skip to content

Commit 70e3fc6

Browse files
cytopiacytopia
authored
Merge pull request #249 from devilbox/release-0.142
Release 0.142
2 parents 8a7ca18 + e6564db commit 70e3fc6

25 files changed

+170
-116
lines changed

‎.github/workflows/action-schedule_master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
with:
3636
enabled: true
3737
can_deploy: true
38-
is_scheduled: true
3938
versions: ${{ needs.params.outputs.versions }}
4039
refs: ${{ needs.params.outputs.refs }}
4140
secrets:
@@ -54,6 +53,7 @@ jobs:
5453
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
5554
run_tests: false
5655
upload_artifact: true
56+
pull_base_image: true
5757
matrix: ${{ needs.configure.outputs.matrix_build }}
5858
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
5959
stage: base

‎.github/workflows/action-schedule_tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
with:
3636
enabled: true
3737
can_deploy: true
38-
is_scheduled: true
3938
versions: ${{ needs.params.outputs.versions }}
4039
refs: ${{ needs.params.outputs.refs }}
4140
secrets:
@@ -54,6 +53,7 @@ jobs:
5453
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
5554
run_tests: false
5655
upload_artifact: true
56+
pull_base_image: true
5757
matrix: ${{ needs.configure.outputs.matrix_build }}
5858
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
5959
stage: base

‎.github/workflows/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
with:
3636
enabled: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && (github.event.pull_request.user.login != 'cytopia')) }}
3737
can_deploy: ${{ (github.repository == 'devilbox/docker-php-fpm') && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-')) }}
38-
is_scheduled: false
3938
versions: ${{ needs.params.outputs.versions }}
4039
refs: ${{ needs.params.outputs.refs }}
4140
secrets:
@@ -54,6 +53,7 @@ jobs:
5453
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
5554
run_tests: false
5655
upload_artifact: true
56+
pull_base_image: true
5757
matrix: ${{ needs.configure.outputs.matrix_build }}
5858
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
5959
stage: base

‎.github/workflows/params-nightly_master.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ jobs:
6161
- name: "[Set-Output] jsonify VERSIONS"
6262
id: set-versions
6363
run: |
64-
echo "::set-output name=versions::$( echo '${{ env.VERSIONS }}' | jq -M -c )"
64+
VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
65+
echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
6566
6667
- name: "[Set-Output] jsonify REFS"
6768
id: set-refs
6869
run: |
69-
echo "::set-output name=refs::$( echo '${{ env.REFS }}' | jq -M -c )"
70+
REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
71+
echo "refs=${REFS}" >> $GITHUB_OUTPUT

‎.github/workflows/params-nightly_tags.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ jobs:
6161
- name: "[Set-Output] jsonify VERSIONS"
6262
id: set-versions
6363
run: |
64-
echo "::set-output name=versions::$( echo '${{ env.VERSIONS }}' | jq -M -c )"
64+
VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
65+
echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
6566
6667
- name: "[Set-Output] jsonify REFS"
6768
id: set-refs
6869
run: |
69-
echo "::set-output name=refs::$( echo '${{ env.REFS }}' | jq -M -c )"
70+
REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
71+
echo "refs=${REFS}" >> $GITHUB_OUTPUT

‎.github/workflows/params.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ jobs:
6161
- name: "[Set-Output] jsonify VERSIONS"
6262
id: set-versions
6363
run: |
64-
echo "::set-output name=versions::$( echo '${{ env.VERSIONS }}' | jq -M -c )"
64+
VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
65+
echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
6566
6667
- name: "[Set-Output] jsonify REFS"
6768
id: set-refs
6869
run: |
69-
echo "::set-output name=refs::$( echo '${{ env.REFS }}' | jq -M -c )"
70+
REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
71+
echo "refs=${REFS}" >> $GITHUB_OUTPUT

‎CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44
## Unreleased
55

66

7+
## Release 0.142
8+
9+
### Fixed
10+
- Fixed `phalcon` module
11+
- Fixed `swoole` module
12+
- Fixed installation of wkhtmltopdf [#245](https://github.com/devilbox/docker-php-fpm/pull/245)
13+
- FIxed installation of drupalconsole [#246](https://github.com/devilbox/docker-php-fpm/pull/246)
14+
- Fixed installation of symfoni cli [#247](https://github.com/devilbox/docker-php-fpm/pull/247)
15+
- Fixed installation of NodeJS
16+
- Fixed installation of PostgreSQL client for PHP 5.6
17+
- Fixed installation of PostgreSQL client for PHP 7.0
18+
- Disabled Phalcon Devtools for PHP 7.4 as it breaks
19+
20+
721
## Release 0.141
822

923
### Fixed

‎Dockerfiles/mods/Dockerfile-7.2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -534,12 +534,12 @@ RUN set -eux \
534534

535535
# -------------------- Installing PHP Extension: phalcon --------------------
536536
RUN set -eux \
537-
# Installation: Generic
537+
# Installation: Version specific
538538
# Type: GIT extension
539539
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
540540
&& cd /tmp/phalcon \
541541
# Custom: Branch
542-
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
542+
&& git checkout v4.1.1 \
543543
# Custom: Install command
544544
&& cd build && ./install \
545545
# Enabling
@@ -807,10 +807,10 @@ RUN set -eux \
807807

808808
# -------------------- Installing PHP Extension: swoole --------------------
809809
RUN set -eux \
810-
# Installation: Generic
810+
# Installation: Version specific
811811
# Type: PECL extension
812-
# Custom: Pecl command
813-
&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
812+
# Default: Pecl command
813+
&& pecl install swoole-4.8.12 \
814814
# Enabling
815815
&& docker-php-ext-enable swoole \
816816
&& true

‎Dockerfiles/mods/Dockerfile-7.3

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -524,12 +524,12 @@ RUN set -eux \
524524

525525
# -------------------- Installing PHP Extension: phalcon --------------------
526526
RUN set -eux \
527-
# Installation: Generic
527+
# Installation: Version specific
528528
# Type: GIT extension
529529
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
530530
&& cd /tmp/phalcon \
531531
# Custom: Branch
532-
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
532+
&& git checkout v4.1.2 \
533533
# Custom: Install command
534534
&& cd build && ./install \
535535
# Enabling
@@ -797,10 +797,10 @@ RUN set -eux \
797797

798798
# -------------------- Installing PHP Extension: swoole --------------------
799799
RUN set -eux \
800-
# Installation: Generic
800+
# Installation: Version specific
801801
# Type: PECL extension
802-
# Custom: Pecl command
803-
&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
802+
# Default: Pecl command
803+
&& pecl install swoole-4.8.12 \
804804
# Enabling
805805
&& docker-php-ext-enable swoole \
806806
&& true

‎Dockerfiles/mods/Dockerfile-7.4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -783,10 +783,10 @@ RUN set -eux \
783783

784784
# -------------------- Installing PHP Extension: swoole --------------------
785785
RUN set -eux \
786-
# Installation: Generic
786+
# Installation: Version specific
787787
# Type: PECL extension
788-
# Custom: Pecl command
789-
&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
788+
# Default: Pecl command
789+
&& pecl install swoole-4.8.12 \
790790
# Enabling
791791
&& docker-php-ext-enable swoole \
792792
&& true

‎Dockerfiles/work/Dockerfile-5.2

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ RUN set -eux \
148148
\
149149
\
150150
# -------------------- nvm --------------------
151+
&& NODE_VERSION="17" \
152+
\
151153
&& NVM_VERSION="$( \
152154
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
153155
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -156,8 +158,7 @@ RUN set -eux \
156158
| tail -1 \
157159
)" \
158160
&& mkdir -p /opt/nvm \
159-
\
160-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
161+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
161162
| NVM_DIR="/opt/nvm" bash \
162163
\
163164
&& { \
@@ -168,9 +169,9 @@ RUN set -eux \
168169
\
169170
&& chown -R devilbox:devilbox "/opt/nvm" \
170171
\
171-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
172-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
173-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
172+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
173+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
174+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
174175
\
175176
&& chmod 0777 /opt/nvm \
176177
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-5.3

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ RUN set -eux \
160160
\
161161
\
162162
# -------------------- nvm --------------------
163+
&& NODE_VERSION="17" \
164+
\
163165
&& NVM_VERSION="$( \
164166
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
165167
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
168170
| tail -1 \
169171
)" \
170172
&& mkdir -p /opt/nvm \
171-
\
172-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173174
| NVM_DIR="/opt/nvm" bash \
174175
\
175176
&& { \
@@ -180,9 +181,9 @@ RUN set -eux \
180181
\
181182
&& chown -R devilbox:devilbox "/opt/nvm" \
182183
\
183-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
184-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
185-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
184+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
185+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
186187
\
187188
&& chmod 0777 /opt/nvm \
188189
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-5.4

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ RUN set -eux \
160160
\
161161
\
162162
# -------------------- nvm --------------------
163+
&& NODE_VERSION="17" \
164+
\
163165
&& NVM_VERSION="$( \
164166
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
165167
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
168170
| tail -1 \
169171
)" \
170172
&& mkdir -p /opt/nvm \
171-
\
172-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173174
| NVM_DIR="/opt/nvm" bash \
174175
\
175176
&& { \
@@ -180,9 +181,9 @@ RUN set -eux \
180181
\
181182
&& chown -R devilbox:devilbox "/opt/nvm" \
182183
\
183-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
184-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
185-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
184+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
185+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
186187
\
187188
&& chmod 0777 /opt/nvm \
188189
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-5.5

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ RUN set -eux \
160160
\
161161
\
162162
# -------------------- nvm --------------------
163+
&& NODE_VERSION="17" \
164+
\
163165
&& NVM_VERSION="$( \
164166
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
165167
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
168170
| tail -1 \
169171
)" \
170172
&& mkdir -p /opt/nvm \
171-
\
172-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173174
| NVM_DIR="/opt/nvm" bash \
174175
\
175176
&& { \
@@ -180,9 +181,9 @@ RUN set -eux \
180181
\
181182
&& chown -R devilbox:devilbox "/opt/nvm" \
182183
\
183-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
184-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
185-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
184+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
185+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
186187
\
187188
&& chmod 0777 /opt/nvm \
188189
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-5.6

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ RUN set -eux \
162162
\
163163
\
164164
# -------------------- nvm --------------------
165+
&& NODE_VERSION="17" \
166+
\
165167
&& NVM_VERSION="$( \
166168
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
167169
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -170,8 +172,7 @@ RUN set -eux \
170172
| tail -1 \
171173
)" \
172174
&& mkdir -p /opt/nvm \
173-
\
174-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175176
| NVM_DIR="/opt/nvm" bash \
176177
\
177178
&& { \
@@ -182,9 +183,9 @@ RUN set -eux \
182183
\
183184
&& chown -R devilbox:devilbox "/opt/nvm" \
184185
\
185-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
186-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
187-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
187+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
188+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
188189
\
189190
&& chmod 0777 /opt/nvm \
190191
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
@@ -194,7 +195,7 @@ RUN set -eux \
194195
# -------------------- pgsql_client --------------------
195196
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
196197
curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
197-
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
198+
&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
198199
&& apt-get update; \
199200
fi \
200201
\

‎Dockerfiles/work/Dockerfile-7.0

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ RUN set -eux \
162162
\
163163
\
164164
# -------------------- nvm --------------------
165+
&& NODE_VERSION="17" \
166+
\
165167
&& NVM_VERSION="$( \
166168
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
167169
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -170,8 +172,7 @@ RUN set -eux \
170172
| tail -1 \
171173
)" \
172174
&& mkdir -p /opt/nvm \
173-
\
174-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175176
| NVM_DIR="/opt/nvm" bash \
176177
\
177178
&& { \
@@ -182,9 +183,9 @@ RUN set -eux \
182183
\
183184
&& chown -R devilbox:devilbox "/opt/nvm" \
184185
\
185-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
186-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
187-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
187+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
188+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
188189
\
189190
&& chmod 0777 /opt/nvm \
190191
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
@@ -194,7 +195,7 @@ RUN set -eux \
194195
# -------------------- pgsql_client --------------------
195196
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
196197
curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
197-
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
198+
&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
198199
&& apt-get update; \
199200
fi \
200201
\

0 commit comments

Comments
 (0)