Skip to content

v1.2.2 #9

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
Feb 5, 2021
Merged

v1.2.2 #9

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
ed571d3
Using new Alpine / Nginx builds
bfren Feb 5, 2021
4766d8f
Removing fix for using older Nginx image
bfren Feb 5, 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
14 changes: 1 addition & 13 deletions .github/workflows/build_7_3-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ jobs:
-
name: Checkout code
uses: actions/checkout@v2
-
name: Read PHP version - minor
uses: bencgreen/read-file-action@v1
with:
path: ./7.3/PHP_MINOR
id: php_minor
-
name: Read PHP version - revision
uses: bencgreen/read-file-action@v1
Expand All @@ -37,12 +31,6 @@ jobs:
with:
path: ./7.3/PHP_BUILD
id: php_build
-
name: Read image version
uses: bencgreen/read-file-action@v1
with:
path: ./VERSION
id: version
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
Expand All @@ -67,7 +55,7 @@ jobs:
#platforms: linux/amd64,linux/arm/v7
#platforms: linux/amd64,linux/arm64
tags: |
bcgdesign/nginx-php:php-${{ steps.php_minor.outputs.content }}
bcgdesign/nginx-php:php-7.3
bcgdesign/nginx-php:php-${{ steps.php_revision.outputs.content }}
bcgdesign/nginx-php:php-${{ steps.php_build.outputs.content }}
-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_7_4-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: docker/setup-buildx-action@v1
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -42,7 +42,7 @@ jobs:
#platforms: linux/amd64,linux/arm/v7
#platforms: linux/amd64,linux/arm64
tags: |
bcgdesign/nginx-php:dev
bcgdesign/nginx-php:dev-php-7
bcgdesign/nginx-php:dev-php-7.4
-
name: Image digest
Expand Down
16 changes: 2 additions & 14 deletions .github/workflows/build_7_4-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@ jobs:
-
name: Checkout code
uses: actions/checkout@v2
-
name: Read PHP version - major
uses: bencgreen/read-file-action@v1
with:
path: ./7.4/PHP_MAJOR
id: php_major
-
name: Read PHP version - minor
uses: bencgreen/read-file-action@v1
with:
path: ./7.4/PHP_MINOR
id: php_minor
-
name: Read PHP version - revision
uses: bencgreen/read-file-action@v1
Expand Down Expand Up @@ -75,8 +63,8 @@ jobs:
tags: |
bcgdesign/nginx-php:latest
bcgdesign/nginx-php:${{ steps.version.outputs.content }}
bcgdesign/nginx-php:php-${{ steps.php_major.outputs.content }}
bcgdesign/nginx-php:php-${{ steps.php_minor.outputs.content }}
bcgdesign/nginx-php:php-7
bcgdesign/nginx-php:php-7.4
bcgdesign/nginx-php:php-${{ steps.php_revision.outputs.content }}
bcgdesign/nginx-php:php-${{ steps.php_build.outputs.content }}
-
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_8_0-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: docker/setup-buildx-action@v1
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -43,6 +43,7 @@ jobs:
#platforms: linux/amd64,linux/arm64
tags: |
bcgdesign/nginx-php:dev
bcgdesign/nginx-php:dev-php-8
bcgdesign/nginx-php:dev-php-8.0
-
name: Image digest
Expand Down
16 changes: 2 additions & 14 deletions .github/workflows/build_8_0-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@ jobs:
-
name: Checkout code
uses: actions/checkout@v2
-
name: Read PHP version - major
uses: bencgreen/read-file-action@v1
with:
path: ./8.0/PHP_MAJOR
id: php_major
-
name: Read PHP version - minor
uses: bencgreen/read-file-action@v1
with:
path: ./8.0/PHP_MINOR
id: php_minor
-
name: Read PHP version - revision
uses: bencgreen/read-file-action@v1
Expand Down Expand Up @@ -73,8 +61,8 @@ jobs:
#platforms: linux/amd64,linux/arm/v7
#platforms: linux/amd64,linux/arm64
tags: |
bcgdesign/nginx-php:php-${{ steps.php_major.outputs.content }}
bcgdesign/nginx-php:php-${{ steps.php_minor.outputs.content }}
bcgdesign/nginx-php:php-8
bcgdesign/nginx-php:php-8.0
bcgdesign/nginx-php:php-${{ steps.php_revision.outputs.content }}
bcgdesign/nginx-php:php-${{ steps.php_build.outputs.content }}
-
Expand Down
6 changes: 1 addition & 5 deletions 7.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Use version from Alpine 3.12 branch
FROM bcgdesign/nginx:1.1.0
FROM bcgdesign/nginx:alpine-3.12-1.2.2

LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
org.label-schema.name="Nginx + PHP" \
Expand Down Expand Up @@ -34,6 +33,3 @@ RUN export PHP_VERSION=$(cat /tmp/PHP_BUILD) \
COPY ./overlay /
COPY ./overlay-nginx-conf /etc/nginx/conf.d
COPY ./7.3/php-fpm /etc/services.d/php-fpm

# fix for using with old Nginx image
RUN rm /etc/nginx/sites/localhost
1 change: 0 additions & 1 deletion 7.3/PHP_MINOR
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 7.4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bcgdesign/nginx:1.2.1
FROM bcgdesign/nginx:alpine-3.13-1.2.2

LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
org.label-schema.name="Nginx + PHP" \
Expand Down
2 changes: 1 addition & 1 deletion 7.4/PHP_BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4.14-r0
7.4.15-r0
1 change: 0 additions & 1 deletion 7.4/PHP_MAJOR
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion 7.4/PHP_MINOR
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 7.4/PHP_REVISION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4.14
7.4.15
2 changes: 1 addition & 1 deletion 8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bcgdesign/nginx:1.2.1
FROM bcgdesign/nginx:alpine-3.13-1.2.2

LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
org.label-schema.name="Nginx + PHP" \
Expand Down
2 changes: 1 addition & 1 deletion 8.0/PHP_BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.0.1-r0
8.0.2-r0
1 change: 0 additions & 1 deletion 8.0/PHP_MAJOR
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion 8.0/PHP_MINOR
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 8.0/PHP_REVISION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.0.1
8.0.2
16 changes: 9 additions & 7 deletions Dockerfile-automated
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,21 @@ ENV PHP_FPM_LOG_LEVEL="notice" \
PHP_INI_MAX_UPLOAD="64M" \
PHP_SESSION_MAX_LIFETIME=86400

ENV PHP_DIR=/etc/php7
ENV PHP_DIR=/etc/php8

COPY ./7.4/PHP_BUILD /tmp/PHP_BUILD
COPY ./8.0/PHP_BUILD /tmp/PHP_BUILD
RUN export PHP_VERSION=$(cat /tmp/PHP_BUILD) \
&& echo "PHP v${PHP_VERSION}" \
&& apk -U upgrade \
&& apk add \
bash \
php7=${PHP_VERSION} \
php7-common=${PHP_VERSION} \
php7-fpm=${PHP_VERSION} \
php7-session=${PHP_VERSION} \
php8=${PHP_VERSION} \
php8-common=${PHP_VERSION} \
php8-fpm=${PHP_VERSION} \
php8-session=${PHP_VERSION} \
&& ln -s /usr/bin/php8 /usr/bin/php \
&& rm -rf /var/cache/apk/* /www/* /tmp/*

COPY ./overlay /
COPY ./7.4/php-fpm /etc/services.d/php-fpm
COPY ./overlay-nginx-conf /etc/nginx/http.d
COPY ./8.0/php-fpm /etc/services.d/php-fpm
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1
1.2.2