Skip to content

Commit 1028527

Browse files
cytopiacytopia
authored
Merge pull request #159 from devilbox/release-0.107
 Release 0.107
2 parents de9642c + 0a04342 commit 1028527

30 files changed

Lines changed: 246 additions & 142 deletions

‎.github/workflows/php-ci.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ jobs:
118118
- name: Build Base
119119
run: |
120120
retry() {
121-
for ((n=0; n<${RETRIES}; n++)); do
122-
echo "[${n}] ${*}";
121+
for n in $(seq ${RETRIES}); do
122+
echo "[${n}/${RETRIES}] ${*}";
123123
if eval "${*}"; then
124124
return 0;
125125
fi;
@@ -135,8 +135,8 @@ jobs:
135135
- name: Test Base
136136
run: |
137137
retry() {
138-
for ((n=0; n<${RETRIES}; n++)); do
139-
echo "[${n}] ${*}";
138+
for n in $(seq ${RETRIES}); do
139+
echo "[${n}/${RETRIES}] ${*}";
140140
if eval "${*}"; then
141141
return 0;
142142
fi;
@@ -156,8 +156,8 @@ jobs:
156156
- name: Build Mods
157157
run: |
158158
retry() {
159-
for ((n=0; n<${RETRIES}; n++)); do
160-
echo "[${n}] ${*}";
159+
for n in $(seq ${RETRIES}); do
160+
echo "[${n}/${RETRIES}] ${*}";
161161
if eval "${*}"; then
162162
return 0;
163163
fi;
@@ -173,8 +173,8 @@ jobs:
173173
- name: Test Mods
174174
run: |
175175
retry() {
176-
for ((n=0; n<${RETRIES}; n++)); do
177-
echo "[${n}] ${*}";
176+
for n in $(seq ${RETRIES}); do
177+
echo "[${n}/${RETRIES}] ${*}";
178178
if eval "${*}"; then
179179
return 0;
180180
fi;
@@ -194,8 +194,8 @@ jobs:
194194
- name: Build Prod
195195
run: |
196196
retry() {
197-
for ((n=0; n<${RETRIES}; n++)); do
198-
echo "[${n}] ${*}";
197+
for n in $(seq ${RETRIES}); do
198+
echo "[${n}/${RETRIES}] ${*}";
199199
if eval "${*}"; then
200200
return 0;
201201
fi;
@@ -211,8 +211,8 @@ jobs:
211211
- name: Test Prod
212212
run: |
213213
retry() {
214-
for ((n=0; n<${RETRIES}; n++)); do
215-
echo "[${n}] ${*}";
214+
for n in $(seq ${RETRIES}); do
215+
echo "[${n}/${RETRIES}] ${*}";
216216
if eval "${*}"; then
217217
return 0;
218218
fi;
@@ -232,8 +232,8 @@ jobs:
232232
- name: Build Work
233233
run: |
234234
retry() {
235-
for ((n=0; n<${RETRIES}; n++)); do
236-
echo "[${n}] ${*}";
235+
for n in $(seq ${RETRIES}); do
236+
echo "[${n}/${RETRIES}] ${*}";
237237
if eval "${*}"; then
238238
return 0;
239239
fi;
@@ -249,8 +249,8 @@ jobs:
249249
- name: Test Work
250250
run: |
251251
retry() {
252-
for ((n=0; n<${RETRIES}; n++)); do
253-
echo "[${n}] ${*}";
252+
for n in $(seq ${RETRIES}); do
253+
echo "[${n}/${RETRIES}] ${*}";
254254
if eval "${*}"; then
255255
return 0;
256256
fi;
@@ -283,8 +283,8 @@ jobs:
283283
- name: Publish images (only repo owner)
284284
run: |
285285
retry() {
286-
for ((n=0; n<${RETRIES}; n++)); do
287-
echo "[${n}] ${*}";
286+
for n in $(seq ${RETRIES}); do
287+
echo "[${n}/${RETRIES}] ${*}";
288288
if eval "${*}"; then
289289
return 0;
290290
fi;

‎.github/workflows/php-nightly.yml‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
- cron: '0 0 * * *'
1616

1717

18-
1918
# -------------------------------------------------------------------------------------------------
2019
# What to run
2120
# -------------------------------------------------------------------------------------------------
@@ -55,6 +54,12 @@ jobs:
5554
RUNNER_CONTEXT: ${{ toJson(runner) }}
5655
run: echo "${RUNNER_CONTEXT}"
5756

57+
- name: Show git info
58+
env:
59+
RUNNER_CONTEXT: ${{ toJson(runner) }}
60+
run: |
61+
git log | head -20
62+
5863
5964
build:
6065
name: "[ ${{ matrix.version }} ]"
@@ -113,8 +118,8 @@ jobs:
113118
- name: Build Base
114119
run: |
115120
retry() {
116-
for ((n=0; n<${RETRIES}; n++)); do
117-
echo "[${n}] ${*}";
121+
for n in $(seq ${RETRIES}); do
122+
echo "[${n}/${RETRIES}] ${*}";
118123
if eval "${*}"; then
119124
return 0;
120125
fi;
@@ -130,8 +135,8 @@ jobs:
130135
- name: Test Base
131136
run: |
132137
retry() {
133-
for ((n=0; n<${RETRIES}; n++)); do
134-
echo "[${n}] ${*}";
138+
for n in $(seq ${RETRIES}); do
139+
echo "[${n}/${RETRIES}] ${*}";
135140
if eval "${*}"; then
136141
return 0;
137142
fi;
@@ -151,8 +156,8 @@ jobs:
151156
- name: Build Mods
152157
run: |
153158
retry() {
154-
for ((n=0; n<${RETRIES}; n++)); do
155-
echo "[${n}] ${*}";
159+
for n in $(seq ${RETRIES}); do
160+
echo "[${n}/${RETRIES}] ${*}";
156161
if eval "${*}"; then
157162
return 0;
158163
fi;
@@ -168,8 +173,8 @@ jobs:
168173
- name: Test Mods
169174
run: |
170175
retry() {
171-
for ((n=0; n<${RETRIES}; n++)); do
172-
echo "[${n}] ${*}";
176+
for n in $(seq ${RETRIES}); do
177+
echo "[${n}/${RETRIES}] ${*}";
173178
if eval "${*}"; then
174179
return 0;
175180
fi;
@@ -189,8 +194,8 @@ jobs:
189194
- name: Build Prod
190195
run: |
191196
retry() {
192-
for ((n=0; n<${RETRIES}; n++)); do
193-
echo "[${n}] ${*}";
197+
for n in $(seq ${RETRIES}); do
198+
echo "[${n}/${RETRIES}] ${*}";
194199
if eval "${*}"; then
195200
return 0;
196201
fi;
@@ -206,8 +211,8 @@ jobs:
206211
- name: Test Prod
207212
run: |
208213
retry() {
209-
for ((n=0; n<${RETRIES}; n++)); do
210-
echo "[${n}] ${*}";
214+
for n in $(seq ${RETRIES}); do
215+
echo "[${n}/${RETRIES}] ${*}";
211216
if eval "${*}"; then
212217
return 0;
213218
fi;
@@ -227,8 +232,8 @@ jobs:
227232
- name: Build Work
228233
run: |
229234
retry() {
230-
for ((n=0; n<${RETRIES}; n++)); do
231-
echo "[${n}] ${*}";
235+
for n in $(seq ${RETRIES}); do
236+
echo "[${n}/${RETRIES}] ${*}";
232237
if eval "${*}"; then
233238
return 0;
234239
fi;
@@ -244,8 +249,8 @@ jobs:
244249
- name: Test Work
245250
run: |
246251
retry() {
247-
for ((n=0; n<${RETRIES}; n++)); do
248-
echo "[${n}] ${*}";
252+
for n in $(seq ${RETRIES}); do
253+
echo "[${n}/${RETRIES}] ${*}";
249254
if eval "${*}"; then
250255
return 0;
251256
fi;
@@ -278,8 +283,8 @@ jobs:
278283
- name: Publish images (only repo owner)
279284
run: |
280285
retry() {
281-
for ((n=0; n<${RETRIES}; n++)); do
282-
echo "[${n}] ${*}";
286+
for n in $(seq ${RETRIES}); do
287+
echo "[${n}/${RETRIES}] ${*}";
283288
if eval "${*}"; then
284289
return 0;
285290
fi;

‎.travis.yml‎

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ services:
1515
env:
1616
global:
1717
- IMAGE: devilbox/php-fpm
18-
# travis encrypt DOCKER_USERNAME=user
19-
# travis encrypt DOCKER_PASSWORD=pass
20-
# Must be regenerated when repository name/owner changes
21-
# DOCKER_USERNAME
22-
- secure: "Y7xt3qZW9Zwrsgdd/aCf8ZqA7I039506ZDf/u/WVzGwNHta5YJJ7XYy8XG7XugyqGGXRVpfBiaqmDH4xsPLXyHXdOt2G38GXZHZXIgJOiEJ6aUfpdUxyeu8XIXkD2MDMmc3Kb27Yub/OadxRMLWEflzRnSXXs3KJ8TsbPHh0yRWDMsmHYOYl16gDGUX1izLkEx4J+9iA3+JwIFZk8by/OUuIIQ93bSNORpwHT8A1j7Y1kh8kYkPZ6nRxWO8xrc2wI1Rbp0X+ivLnOotxDZo53UI/0KroeSckDpoWfoz+B7mP+M+5B6kGlI2pKDNQB/ErYvnya6PdtFSS9skbvepR4tBhUOZDDY7NMRg9m3w0b9T1no+g3A4LBGXy6+OZZoiYAGy9LvqMhFkINqbBhRBX+mZhtG0pNXunfcu5dk81Ni/XpXDiy9JU98jItwsRj4SeaPfSt0LUNNXMS/fEwZyTy6TihN1CM3krJpV30Ic5rN64FRnrRjUuNU4lJ/W36yUhM29gb13ahh+f7sDsYoCzMwDM9HFe0YLb3ar3mW1lb3FuUugU2f2EupgCPY60X2XrY9aSgCfbdiVsA84dbLtRfHTPG7UbEcJW5RH8HS+9qVZBK+AcPqon9jbOJRVh7q99YW+R8X/XeyYpz7amacVmRus80+toZ16bbU7D2Qgjdek="
23-
# DOCKER_PASSWORD
24-
- secure: "ZRrVOVOkSCS2UxEi1HNF1iKefK4sDT/sPRl1HxMQjLnRRaAMdG0aRnBwQf2YAM2qzhCfN85qt6zZtC4awc2mHiZ88JrAZxBjK6xj4BwOyLbDuzpBsKXnx8Nix+wyYYKSjsC3LOYrsUe+4rvkw3tVvVaX8G2llojwdksF34VDmmHBmzCG/Bsexk7UqC+qw0PZm7BtctQO+IL0btmMDijRDElxfR+AuPvf9JdkhYzw9TOO7Jqd53NssNVGyL+XSV0dfGn8PkZTp1e8D+28pLK4oGVog+Wk7Cq94hSGjk5AkWKvL5441rupG1AA8K3njeDNMKdov4o+dmnkAH7Jh8tjShMhNhoxHce3IzpczjhoE1EyYQcyPf1qdfhV35Xv096iWX5809pp1MZF2oE5eism8JaU9NpGClryVbKVKtup8ko9/tCqz01Czq5Vue40feMkGtdePulg59OhyyPLYldsObw8QlZydkrmgVZe6b+GyybeiHraTfDq4pvTgUrC4Cmm5J3IB5Ig1THEiYKHfRJ5hSSMDDODeBXc8Xh6mFssEVshNx/jbUQWuAVYQFw/GIquVHxr6btbevrWIoD+zmqcc0L98u9pYH8w7b+gMgVJNCC4QQz2NCGGWw9l9/TmLrKJgeXbG18n8D314le1zuna6/VfH9pXIlbNO4hgz5NLHJk="
2518
matrix:
2619
- PHP=5.2
2720
- PHP=5.3
@@ -103,44 +96,44 @@ before_script:
10396
###
10497
script:
10598
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
106-
echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin &&
99+
make login USERNAME="${DOCKER_USERNAME}" PASSWORD="${DOCKER_PASSWORD}";
107100
if [ "${TRAVIS_BRANCH}" == "master" ]; then
108101
echo "Pushing latest";
109-
until docker push "${IMAGE}:${PHP}-base"; do sleep 1; done;
110-
until docker push "${IMAGE}:${PHP}-mods"; do sleep 1; done;
111-
until docker push "${IMAGE}:${PHP}-prod"; do sleep 1; done;
112-
until docker push "${IMAGE}:${PHP}-work"; do sleep 1; done;
102+
make push TAG="${PHP}-base" &&
103+
make push TAG="${PHP}-mods" &&
104+
make push TAG="${PHP}-prod" &&
105+
make push TAG="${PHP}-work";
113106
elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then
114107
echo "Pushing branch ${TRAVIS_BRANCH}";
115-
docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}" &&
116-
docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}" &&
117-
docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}" &&
118-
docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}" &&
119-
until docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}"; do sleep 1; done;
120-
until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}"; do sleep 1; done;
121-
until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}"; do sleep 1; done;
122-
until docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}"; do sleep 1; done;
108+
make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${TRAVIS_BRANCH}" &&
109+
make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${TRAVIS_BRANCH}" &&
110+
make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${TRAVIS_BRANCH}" &&
111+
make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${TRAVIS_BRANCH}" &&
112+
make push TAG="${PHP}-base-${TRAVIS_BRANCH}" &&
113+
make push TAG="${PHP}-mods-${TRAVIS_BRANCH}" &&
114+
make push TAG="${PHP}-prod-${TRAVIS_BRANCH}" &&
115+
make push TAG="${PHP}-work-${TRAVIS_BRANCH}";
123116
elif [ -n "${TRAVIS_TAG}" ]; then
124117
echo "Pushing tag ${TRAVIS_TAG}";
125-
docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_TAG}" &&
126-
docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}" &&
127-
docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}" &&
128-
docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_TAG}" &&
129-
until docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}"; do sleep 1; done;
130-
until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}"; do sleep 1; done;
131-
until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}"; do sleep 1; done;
132-
until docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}"; do sleep 1; done;
118+
make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${TRAVIS_TAG}" &&
119+
make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${TRAVIS_TAG}" &&
120+
make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${TRAVIS_TAG}" &&
121+
make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${TRAVIS_TAG}" &&
122+
make push TAG="${PHP}-base-${TRAVIS_TAG}" &&
123+
make push TAG="${PHP}-mods-${TRAVIS_TAG}" &&
124+
make push TAG="${PHP}-prod-${TRAVIS_TAG}" &&
125+
make push TAG="${PHP}-work-${TRAVIS_TAG}";
133126
elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then
134127
if MY_TAG="$( git describe --exact-match "$(git rev-parse HEAD)" 2>/dev/null )"; then
135128
echo "Pushing cron tag ${MY_TAG}";
136-
docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${MY_TAG}" &&
137-
docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${MY_TAG}" &&
138-
docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${MY_TAG}" &&
139-
docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${MY_TAG}" &&
140-
until docker push "${IMAGE}:${PHP}-base-${MY_TAG}"; do sleep 1; done;
141-
until docker push "${IMAGE}:${PHP}-mods-${MY_TAG}"; do sleep 1; done;
142-
until docker push "${IMAGE}:${PHP}-prod-${MY_TAG}"; do sleep 1; done;
143-
until docker push "${IMAGE}:${PHP}-work-${MY_TAG}"; do sleep 1; done;
129+
make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${MY_TAG}" &&
130+
make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${MY_TAG}" &&
131+
make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${MY_TAG}" &&
132+
make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${MY_TAG}" &&
133+
make push TAG="${PHP}-base-${MY_TAG}" &&
134+
make push TAG="${PHP}-mods-${MY_TAG}" &&
135+
make push TAG="${PHP}-prod-${MY_TAG}" &&
136+
make push TAG="${PHP}-work-${MY_TAG}";
144137
fi
145138
else
146139
echo "Skipping push to dockerhub on normal branches";

‎CHANGELOG.md‎

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

66

7+
## Release 0.107
8+
9+
#### Fixed
10+
- Fixes login to Dockerhub for CI jobs
11+
- Fixes imagick segfault by setting its threads to 1
12+
13+
#### Added
14+
- Re-added imap for PHP 7.4
15+
- Adding `certbot` binary
16+
17+
718
## Release 0.106
819

920
#### Fixed

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN set -eux \
2626
libjpeg-dev \
2727
libkrb5-dev \
2828
libldap2-dev \
29+
libmagickwand-dev \
2930
libmcrypt-dev \
3031
libmemcached-dev \
3132
libnghttp2-dev \
@@ -41,6 +42,7 @@ RUN set -eux \
4142
libssl-dev \
4243
libtidy-dev \
4344
libvpx-dev \
45+
libwebp5 \
4446
libxml2-dev \
4547
libxpm-dev \
4648
libxslt-dev \
@@ -194,6 +196,19 @@ RUN set -eux \
194196
&& true
195197

196198

199+
# -------------------- Installing PHP Extension: imagick --------------------
200+
RUN set -eux \
201+
# Installation: Version specific
202+
# Type: PECL extension
203+
# Default: Pecl command
204+
&& pecl install imagick \
205+
# Enabling
206+
&& docker-php-ext-enable imagick \
207+
# Generic post-command
208+
&& sed -i'' 's|.*"thread".*| <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
209+
&& true
210+
211+
197212
# -------------------- Installing PHP Extension: imap --------------------
198213
RUN set -eux \
199214
# Generic pre-command
@@ -696,6 +711,7 @@ RUN set -eux \
696711
libfreetype6 \
697712
libicu52 \
698713
libjpeg62-turbo \
714+
libmagickwand-6.q16-2 \
699715
libmcrypt4 \
700716
libmemcachedutil2 \
701717
libmysqlclient18 \
@@ -708,6 +724,7 @@ RUN set -eux \
708724
libsybdb5 \
709725
libtidy-0.99-0 \
710726
libvpx1 \
727+
libwebp5 \
711728
libxpm4 \
712729
libxslt1.1 \
713730
libyaml-0-2 \
@@ -722,6 +739,8 @@ RUN set -eux \
722739
### Post Install
723740
###
724741
RUN set -eux \
742+
# ---------- imagick ----------
743+
&& sed -i'' 's|.*"thread".*| <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
725744
# ---------- oci8 ----------
726745
&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
727746
&& ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -790,6 +809,8 @@ RUN set -eux \
790809
&& php-fpm -m | grep -oiE '^iconv$' \
791810
&& php -m | grep -oiE '^igbinary$' \
792811
&& php-fpm -m | grep -oiE '^igbinary$' \
812+
&& php -m | grep -oiE '^imagick$' \
813+
&& php-fpm -m | grep -oiE '^imagick$' \
793814
&& php -m | grep -oiE '^imap$' \
794815
&& php-fpm -m | grep -oiE '^imap$' \
795816
&& php -m | grep -oiE '^interbase$' \

0 commit comments

Comments
 (0)