Skip to content

release 3.13 with php8 on a new tag #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 16, 2021
Merged

release 3.13 with php8 on a new tag #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a5b69f
release 3.13 with php8
aptalca Mar 2, 2021
950db79
update templates
aptalca Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/external_trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ on:
workflow_dispatch:

jobs:
external-trigger-master:
external-trigger-3-13-php8:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.3

- name: External Trigger
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/3.13-php8'
run: |
echo "**** No external release, exiting ****"
exit 0
14 changes: 7 additions & 7 deletions .github/workflows/package_trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ on:
workflow_dispatch:

jobs:
package-trigger-master:
package-trigger-3-13-php8:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.3

- name: Package Trigger
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/3.13-php8'
run: |
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_MASTER }}" ]; then
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_MASTER is set; skipping trigger. ****"
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_13_PHP8 }}" ]; then
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_13_PHP8 is set; skipping trigger. ****"
exit 0
fi
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
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
echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
exit 0
fi
echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_MASTER\". ****"
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\". ****"
response=$(curl -iX POST \
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/master/buildWithParameters?PACKAGE_CHECK=true \
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.13-php8/buildWithParameters?PACKAGE_CHECK=true \
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
echo "**** Sleeping 10 seconds until job starts ****"
Expand Down
22 changes: 11 additions & 11 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ RUN \
nano \
nginx \
openssl \
php7 \
php7-fileinfo \
php7-fpm \
php7-json \
php7-mbstring \
php7-openssl \
php7-session \
php7-simplexml \
php7-xml \
php7-xmlwriter \
php7-zlib && \
php8 \
php8-fileinfo \
php8-fpm \
php8-json \
php8-mbstring \
php8-openssl \
php8-session \
php8-simplexml \
php8-xml \
php8-xmlwriter \
php8-zlib && \
echo "**** configure nginx ****" && \
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
/etc/nginx/fastcgi_params && \
Expand Down
22 changes: 11 additions & 11 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ RUN \
nano \
nginx \
openssl \
php7 \
php7-fileinfo \
php7-fpm \
php7-json \
php7-mbstring \
php7-openssl \
php7-session \
php7-simplexml \
php7-xml \
php7-xmlwriter \
php7-zlib && \
php8 \
php8-fileinfo \
php8-fpm \
php8-json \
php8-mbstring \
php8-openssl \
php8-session \
php8-simplexml \
php8-xml \
php8-xmlwriter \
php8-zlib && \
echo "**** configure nginx ****" && \
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
/etc/nginx/fastcgi_params && \
Expand Down
22 changes: 11 additions & 11 deletions Dockerfile.armhf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ RUN \
nano \
nginx \
openssl \
php7 \
php7-fileinfo \
php7-fpm \
php7-json \
php7-mbstring \
php7-openssl \
php7-session \
php7-simplexml \
php7-xml \
php7-xmlwriter \
php7-zlib && \
php8 \
php8-fileinfo \
php8-fpm \
php8-json \
php8-mbstring \
php8-openssl \
php8-session \
php8-simplexml \
php8-xml \
php8-xmlwriter \
php8-zlib && \
echo "**** configure nginx ****" && \
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
/etc/nginx/fastcgi_params && \
Expand Down
92 changes: 46 additions & 46 deletions Jenkinsfile
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions jenkins-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# jenkins variables
project_name: docker-baseimage-alpine-nginx
external_type: os
release_type: stable
release_tag: "3.13"
ls_branch: master
release_type: prerelease
release_tag: "3.13-php8"
ls_branch: 3.13-php8
repo_vars:
- BUILD_VERSION_ARG = 'OS'
- LS_USER = 'linuxserver'
Expand Down
3 changes: 0 additions & 3 deletions root/defaults/default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ server {

location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
# With php5-cgi alone:
fastcgi_pass 127.0.0.1:9000;
# With php5-fpm:
#fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php;
include /etc/nginx/fastcgi_params;

Expand Down
10 changes: 5 additions & 5 deletions root/etc/cont-init.d/20-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ mkdir -p \
[[ ! -f /config/php/php-local.ini ]] && \
printf "; Edit this file to override php.ini directives and restart the container\\n\\ndate.timezone = %s\\n" "$TZ" > /config/php/php-local.ini
# copy user php-local.ini to image
cp /config/php/php-local.ini /etc/php7/conf.d/php-local.ini
cp /config/php/php-local.ini /etc/php8/conf.d/php-local.ini
#fix php-fpm log location
sed -i "s#;error_log = log/php7/error.log.*#error_log = /config/log/php/error.log#g" /etc/php7/php-fpm.conf
sed -i "s#;error_log = log/php7/error.log.*#error_log = /config/log/php/error.log#g" /etc/php8/php-fpm.conf
#fix php-fpm user
sed -i "s#user = nobody.*#user = abc#g" /etc/php7/php-fpm.d/www.conf
sed -i "s#group = nobody.*#group = abc#g" /etc/php7/php-fpm.d/www.conf
sed -i "s#user = nobody.*#user = abc#g" /etc/php8/php-fpm.d/www.conf
sed -i "s#group = nobody.*#group = abc#g" /etc/php8/php-fpm.d/www.conf
# create override for www.conf if it doesn't exist
[[ ! -f /config/php/www2.conf ]] && \
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
# copy user www2.conf to image
cp /config/php/www2.conf /etc/php7/php-fpm.d/www2.conf
cp /config/php/www2.conf /etc/php8/php-fpm.d/www2.conf

# permissions
chown -R abc:abc \
Expand Down
0 root/etc/logrotate.d/php-fpm7 → root/etc/logrotate.d/php-fpm8
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion root/etc/services.d/php-fpm/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/with-contenv bash

exec /usr/sbin/php-fpm7 -F
exec /usr/sbin/php-fpm8 -F