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

0 commit comments

Comments
 (0)