Skip to content

Commit d9f9d97

Browse files
j0nnymoej0nnymoe
authored
Merge pull request #75 from linuxserver/3.13-php8-dev
release 3.13 with php8 on a new tag
2 parents 00204c1 + 950db79 commit d9f9d97

File tree

11 files changed

+97
-100
lines changed

11 files changed

+97
-100
lines changed

‎.github/workflows/external_trigger.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
external-trigger-master:
7+
external-trigger-3-13-php8:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2.3.3
1111

1212
- name: External Trigger
13-
if: github.ref == 'refs/heads/master'
13+
if: github.ref == 'refs/heads/3.13-php8'
1414
run: |
1515
echo "**** No external release, exiting ****"
1616
exit 0

‎.github/workflows/package_trigger.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
package-trigger-master:
7+
package-trigger-3-13-php8:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2.3.3
1111

1212
- name: Package Trigger
13-
if: github.ref == 'refs/heads/master'
13+
if: github.ref == 'refs/heads/3.13-php8'
1414
run: |
15-
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_MASTER }}" ]; then
16-
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_MASTER is set; skipping trigger. ****"
15+
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_13_PHP8 }}" ]; then
16+
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_13_PHP8 is set; skipping trigger. ****"
1717
exit 0
1818
fi
19-
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
19+
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.13-php8/lastBuild/api/json | jq -r '.building') == "true" ]; then
2020
echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
2121
exit 0
2222
fi
23-
echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_MASTER\". ****"
23+
echo "**** Package trigger running off of 3.13-php8 branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_13_PHP8\". ****"
2424
response=$(curl -iX POST \
25-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/master/buildWithParameters?PACKAGE_CHECK=true \
25+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.13-php8/buildWithParameters?PACKAGE_CHECK=true \
2626
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
2727
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
2828
echo "**** Sleeping 10 seconds until job starts ****"

‎Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ RUN \
1111
nano \
1212
nginx \
1313
openssl \
14-
php7 \
15-
php7-fileinfo \
16-
php7-fpm \
17-
php7-json \
18-
php7-mbstring \
19-
php7-openssl \
20-
php7-session \
21-
php7-simplexml \
22-
php7-xml \
23-
php7-xmlwriter \
24-
php7-zlib && \
14+
php8 \
15+
php8-fileinfo \
16+
php8-fpm \
17+
php8-json \
18+
php8-mbstring \
19+
php8-openssl \
20+
php8-session \
21+
php8-simplexml \
22+
php8-xml \
23+
php8-xmlwriter \
24+
php8-zlib && \
2525
echo "**** configure nginx ****" && \
2626
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
2727
/etc/nginx/fastcgi_params && \

‎Dockerfile.aarch64‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ RUN \
1111
nano \
1212
nginx \
1313
openssl \
14-
php7 \
15-
php7-fileinfo \
16-
php7-fpm \
17-
php7-json \
18-
php7-mbstring \
19-
php7-openssl \
20-
php7-session \
21-
php7-simplexml \
22-
php7-xml \
23-
php7-xmlwriter \
24-
php7-zlib && \
14+
php8 \
15+
php8-fileinfo \
16+
php8-fpm \
17+
php8-json \
18+
php8-mbstring \
19+
php8-openssl \
20+
php8-session \
21+
php8-simplexml \
22+
php8-xml \
23+
php8-xmlwriter \
24+
php8-zlib && \
2525
echo "**** configure nginx ****" && \
2626
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
2727
/etc/nginx/fastcgi_params && \

‎Dockerfile.armhf‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ RUN \
1111
nano \
1212
nginx \
1313
openssl \
14-
php7 \
15-
php7-fileinfo \
16-
php7-fpm \
17-
php7-json \
18-
php7-mbstring \
19-
php7-openssl \
20-
php7-session \
21-
php7-simplexml \
22-
php7-xml \
23-
php7-xmlwriter \
24-
php7-zlib && \
14+
php8 \
15+
php8-fileinfo \
16+
php8-fpm \
17+
php8-json \
18+
php8-mbstring \
19+
php8-openssl \
20+
php8-session \
21+
php8-simplexml \
22+
php8-xml \
23+
php8-xmlwriter \
24+
php8-zlib && \
2525
echo "**** configure nginx ****" && \
2626
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
2727
/etc/nginx/fastcgi_params && \

‎Jenkinsfile‎

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

‎jenkins-vars.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# jenkins variables
44
project_name: docker-baseimage-alpine-nginx
55
external_type: os
6-
release_type: stable
7-
release_tag: "3.13"
8-
ls_branch: master
6+
release_type: prerelease
7+
release_tag: "3.13-php8"
8+
ls_branch: 3.13-php8
99
repo_vars:
1010
- BUILD_VERSION_ARG = 'OS'
1111
- LS_USER = 'linuxserver'

‎root/defaults/default‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ server {
1919

2020
location ~ \.php$ {
2121
fastcgi_split_path_info ^(.+\.php)(/.+)$;
22-
# With php5-cgi alone:
2322
fastcgi_pass 127.0.0.1:9000;
24-
# With php5-fpm:
25-
#fastcgi_pass unix:/var/run/php5-fpm.sock;
2623
fastcgi_index index.php;
2724
include /etc/nginx/fastcgi_params;
2825

‎root/etc/cont-init.d/20-config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ mkdir -p \
1919
[[ ! -f /config/php/php-local.ini ]] && \
2020
printf "; Edit this file to override php.ini directives and restart the container\\n\\ndate.timezone = %s\\n" "$TZ" > /config/php/php-local.ini
2121
# copy user php-local.ini to image
22-
cp /config/php/php-local.ini /etc/php7/conf.d/php-local.ini
22+
cp /config/php/php-local.ini /etc/php8/conf.d/php-local.ini
2323
#fix php-fpm log location
24-
sed -i "s#;error_log = log/php7/error.log.*#error_log = /config/log/php/error.log#g" /etc/php7/php-fpm.conf
24+
sed -i "s#;error_log = log/php7/error.log.*#error_log = /config/log/php/error.log#g" /etc/php8/php-fpm.conf
2525
#fix php-fpm user
26-
sed -i "s#user = nobody.*#user = abc#g" /etc/php7/php-fpm.d/www.conf
27-
sed -i "s#group = nobody.*#group = abc#g" /etc/php7/php-fpm.d/www.conf
26+
sed -i "s#user = nobody.*#user = abc#g" /etc/php8/php-fpm.d/www.conf
27+
sed -i "s#group = nobody.*#group = abc#g" /etc/php8/php-fpm.d/www.conf
2828
# create override for www.conf if it doesn't exist
2929
[[ ! -f /config/php/www2.conf ]] && \
3030
printf "; Edit this file to override www.conf and php-fpm.conf directives and restart the container\\n\\n; Pool name\\n[www]\\n\\n" > /config/php/www2.conf
3131
# copy user www2.conf to image
32-
cp /config/php/www2.conf /etc/php7/php-fpm.d/www2.conf
32+
cp /config/php/www2.conf /etc/php8/php-fpm.d/www2.conf
3333

3434
# permissions
3535
chown -R abc:abc \

‎root/etc/logrotate.d/php-fpm7‎ renamed to ‎root/etc/logrotate.d/php-fpm8‎

File renamed without changes.

0 commit comments

Comments
 (0)