Merge branch 'master' of github.com:KIMB-technologies/PHP-NGINX-Docker

Author: kimbtech

.github/workflows/docker-build.yml

@@ -0,0 +1,61 @@
+name: Docker Image Push (on commit and base image update)
+
+on:
+  push:
+    branches: [ "master" ]
+  schedule:
+    - cron: "15 */8 * * *"
+
+env:
+  IMAGE_OWNER: kimbtechnologies
+  IMAGE_NAME: php_nginx
+  BASE_IMAGE: library/php:fpm-alpine
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      
+    # check if update needed
+    - name: Check for new baseimage 
+      id: check
+      uses: lucacome/docker-image-update-checker@v1
+      with:
+        base-image: "${{env.BASE_IMAGE}}"
+        image: "${{env.IMAGE_OWNER}}/${{env.IMAGE_NAME}}:latest"
+      #env:
+      #  DEBUG: true
+      if: github.event_name != 'push'
+    
+    # setup build env.
+    - name: Access repository contents
+      uses: actions/checkout@v4
+      if: ${{ (github.event_name == 'push') || (steps.check.outputs.needs-updating == 'true') }}
+    - name: Login to DockerHub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_TOKEN }}
+      if: ${{ (github.event_name == 'push') || (steps.check.outputs.needs-updating == 'true') }}
+
+    # build local AMD image
+    - name: Build the AMD image
+      run: docker build . --file "Dockerfile" --tag "$IMAGE_OWNER/$IMAGE_NAME:latest"
+      if: ${{ (github.event_name == 'push') || (steps.check.outputs.needs-updating == 'true') }}
+    - name: Push tag 8-latest  
+      run: docker tag "$IMAGE_OWNER/$IMAGE_NAME:latest" "$IMAGE_OWNER/$IMAGE_NAME:8-latest"; docker push "$IMAGE_OWNER/$IMAGE_NAME:8-latest";
+      if: ${{ (github.event_name == 'push') || (steps.check.outputs.needs-updating == 'true') }}
+
+     # Multi platform support
+    - name: Set up QEMU for Docker Buildx
+      uses: docker/setup-qemu-action@v3
+      if: ${{ (github.event_name == 'push') || (steps.check.outputs.needs-updating == 'true') }}
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      if: ${{ (github.event_name == 'push') || (steps.check.outputs.needs-updating == 'true') }}
+  
+    # Multi platform image build and push
+    - name: Build and push the ARM Docker images
+      run: php_v=$(docker run --rm "$IMAGE_OWNER/$IMAGE_NAME:latest" sh -c 'echo "$PHP_VERSION"'); php_v=$(echo $php_v | grep -o '[0-9\.]*'); docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/arm64 . --file "Dockerfile" --tag "$IMAGE_OWNER/$IMAGE_NAME:latest" --tag "$IMAGE_OWNER/$IMAGE_NAME:php-$php_v" --push
+      if: ${{ (github.event_name == 'push') || (steps.check.outputs.needs-updating == 'true') }}
+      

.travis.yml

@@ -1,5 +1,4 @@
-ARG BASEIMAGE_VERSION
-FROM php:${BASEIMAGE_VERSION}-fpm-alpine
+FROM php:fpm-alpine
 
 # install nginx
 RUN apk add --update --no-cache nginx \

Dockerfile

@@ -1,6 +1,8 @@
 # PHP-NGINX-Docker
 
-An easy to use php and nginx image for docker.
+An easy to use php and nginx image for Docker.
+
+Currently available for AMD64, ARMv6, ARMv7 and ARM64 (v8).
 
 ## Docker Command
 
@@ -22,15 +24,14 @@ version: "2"
 
 services:
   web:
-    image: kimbtechnologies/php_nginx:latest # uses php 7.4
-    #image: kimbtechnologies/php_nginx:8-latest # uses php 8.*
+    image: kimbtechnologies/php_nginx:latest # uses php 8.*
     container_name: php_nginx
     ports:
       - "127.0.0.1:8080:80"
     volumes:
       - ./php/:/php-code/ # load custom php code
-	# - ./more-server-conf.conf:/etc/nginx/more-server-conf.conf:ro # add config options to the nginx conf (see file in repository for example)
-	# - ./init.sh:/startup-before.sh # script to be run before php, nginx startup (e.g. for system updates, ..., runs as root)
+      # - ./more-server-conf.conf:/etc/nginx/more-server-conf.conf:ro # add config options to the nginx conf (see file in repository for example)
+      # - ./init.sh:/startup-before.sh # script to be run before php, nginx startup (e.g. for system updates, ..., runs as root)
     restart: always
 
 ```

README.md

@@ -9,9 +9,6 @@ services:
     ports:
       - "127.0.0.1:8080:80"
     build:
-      args:
-        #- BASEIMAGE_VERSION=7
-        - BASEIMAGE_VERSION=8
       context: .
     volumes:
      - ./init.sh:/startup-before.sh