README.md aktualisiert

.gitea/workflows/registry.yml

@@ -1,11 +1,13 @@
 name: release-tag
 on:
-  push
+  push:
+    branches:
+      - 'main'
 jobs:
   release-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-fast
     env:
-      DOCKER_ORG: sendnrw
+      DOCKER_ORG: ${{ vars.DOCKER_ORG }}
       DOCKER_LATEST: latest
       RUNNER_TOOL_CACHE: /toolcache
     steps:
@@ -19,14 +21,14 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with: # replace it with your local IP
           config-inline: |
-            [registry."git.send.nrw"] 
+            [registry."${{ vars.DOCKER_REGISTRY }}"] 
               http = true
               insecure = true            
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          registry: git.send.nrw # replace it with your local IP
+          registry: ${{ vars.DOCKER_REGISTRY }} # replace it with your local IP
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           
@@ -45,5 +47,17 @@ jobs:
             linux/amd64                       
           push: true
           tags: | # replace it with your local IP and tags
-            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
-            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+
+      - name: Build and push Ubuntu
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile_Ubuntu
+          platforms: |
+            linux/amd64                       
+          push: true
+          tags: | # replace it with your local IP and tags
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}_ubuntu
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}_ubuntu

.gitea/workflows/staging.yml

@@ -0,0 +1,51 @@
+name: release-tag
+on:
+  push:
+    branches:
+      - 'staging'
+jobs:
+  release-image:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_ORG: sendnrw
+      DOCKER_LATEST: staging
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+        with: # replace it with your local IP
+          config-inline: |
+            [registry."git.send.nrw"] 
+              http = true
+              insecure = true                                    
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: git.send.nrw # replace it with your local IP
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT                                    
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64                                               
+          push: true
+          tags: | # replace it with your local IP and tags
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}

Dockerfile

@@ -1,13 +1,67 @@
 FROM alpine:latest
 RUN apk update && apk upgrade
 RUN apk add bash
-RUN apk add autoconf automake make gcc g++ 
+RUN apk add autoconf
+RUN apk add automake
+RUN apk add make
+RUN apk add gcc
+RUN apk add g++
 RUN apk add nginx
-RUN apk add php83 php83-fpm php83-opcache php83-tokenizer
-RUN apk add php83-gd php83-zlib php83-curl php83-bz2 php83-bcmath php83-exif php83-fileinfo php83-iconv php83-imap php83-intl php83-ldap php83-mbstring php83-mysqli php83-odbc php83-pdo php83-pdo_mysql php83-pdo_odbc php83-pdo_pgsql php83-pdo_sqlite php83-pear php83-pecl-imagick php83-pecl-memcache php83-pecl-memcached php83-pecl-mongodb php83-pecl-redis php83-pecl-smbclient php83-pecl-ssh2 php83-pecl-xdebug php83-pecl-yaml php83-pgsql php83-phar php83-phpdbg php83-session php83-simplexml php83-snmp php83-soap php83-sockets php83-sodium php83-sqlite3 php83-sysvmsg php83-tidy php83-xml php83-xmlreader php83-xmlwriter php83-xsl php83-zip
 RUN apk add redis
+RUN apk add php84
+RUN apk add php84-fpm
+RUN apk add php84-opcache
+RUN apk add php84-gd
+RUN apk add php84-zlib
+RUN apk add php84-curl
+RUN apk add php84-bz2
+RUN apk add php84-bcmath
+RUN apk add php84-exif
+RUN apk add php84-fileinfo
+RUN apk add php84-iconv
+RUN apk add php84-imap
+RUN apk add php84-intl
+RUN apk add php84-ldap
+RUN apk add php84-mbstring
+RUN apk add php84-mysqli
+RUN apk add php84-odbc
+RUN apk add php84-pdo
+RUN apk add php84-pdo_mysql
+RUN apk add php84-pdo_odbc
+RUN apk add php84-pdo_pgsql
+RUN apk add php84-pdo_sqlite
+RUN apk add php84-pdo_dblib
+RUN apk add php84-pear
+RUN apk add php84-pecl-imagick
+RUN apk add php84-pecl-memcache
+RUN apk add php84-pecl-memcached
+RUN apk add php84-pecl-mongodb
+RUN apk add php84-pecl-redis
+RUN apk add php84-pecl-smbclient
+RUN apk add php84-pecl-ssh2
+RUN apk add php84-pecl-xdebug
+RUN apk add php84-pecl-yaml
+RUN apk add php84-pgsql
+RUN apk add php84-phar
+RUN apk add php84-phpdbg
+RUN apk add php84-session
+RUN apk add php84-simplexml
+RUN apk add php84-snmp
+RUN apk add php84-soap
+RUN apk add php84-sockets
+RUN apk add php84-sodium
+RUN apk add php84-sqlite3
+RUN apk add php84-sysvmsg
+RUN apk add php84-tidy
+RUN apk add php84-xml
+RUN apk add php84-xmlreader
+RUN apk add php84-xmlwriter
+RUN apk add php84-xsl
+RUN apk add php84-zip
+RUN apk add php84-ctype
+RUN apk add php84-tokenizer
 COPY nginx /etc/nginx
-COPY php /etc/php83
+COPY php /etc/php84
 COPY redis/redis.conf /etc/redis.conf
 RUN mkdir /var/run/php
 EXPOSE 80
@@ -15,4 +69,4 @@ EXPOSE 443
 EXPOSE 6379
 EXPOSE 9000
 STOPSIGNAL SIGTERM
-CMD ["/bin/bash", "-c", "php-fpm83 && chmod 755 /usr/share/nginx/html/* && nginx -g 'daemon off;' && redis-server /etc/redis.conf"]
+CMD ["/bin/bash", "-c", "chmod 755 /usr/share/nginx/html && php-fpm84 && nginx -g 'daemon off;' && redis-server /etc/redis.conf"]

Dockerfile_Ubuntu

@@ -0,0 +1,25 @@
+FROM ubuntu:latest
+RUN apt-get update && apt-get upgrade -y
+RUN apt install -y bash autoconf automake make gcc g++ nginx redis-server graphviz
+RUN apt install -y php php-fpm php-opcache php-gd php-curl php-bz2 php-bcmath php-exif php-fileinfo php-iconv php-imap php-intl php-ldap php-mbstring php-mysqli php-odbc php-pdo php-mysql php-odbc php-pgsql php-sqlite3 php-pear php-imagick php-memcache php-memcached php-mongodb php-redis php-smbclient php-ssh2 php-xdebug php-yaml php-phar php-phpdbg php-snmp php-soap php-sockets php-sysvmsg php-tidy php-xml php-xmlreader php-xmlwriter php-xsl php-zip php-ctype php-tokenizer
+COPY nginx /etc/nginx
+COPY php /etc/php
+COPY redis/redis.conf /etc/redis/redis.conf
+RUN mkdir -p /var/run/php
+RUN groupadd -g 1001 swarmdocker
+RUN useradd -u 3041 -g swarmdocker -s /bin/bash -m phpitop
+RUN useradd -u 3040 -g swarmdocker -s /bin/bash -m nginxitop
+RUN echo "\
+    #!/bin/sh\n\
+    echo \"Starting services...\"\n\
+    service php8.3-fpm start\n\
+    nginx -g \"daemon off;\" &\n\
+    echo \"Ready.\"\n\
+    tail -s 1 /var/log/nginx/*.log -f\n\
+    " > /start.sh
+EXPOSE 80
+EXPOSE 443
+EXPOSE 6379
+EXPOSE 9000
+STOPSIGNAL SIGTERM
+CMD ["sh", "/start.sh"]

README.md

@@ -1,2 +1,9 @@
 # docker_php
 
+- 2025-01-02: Patches and Security-Updates
+- 2025-01-22: Patches and Security-Updates
+- 2025-02-09: Patches and Security-Updates
+- 2025-03-25: Patches and Security-Updates
+- 2025-03-28: Patches and Security-Updates
+- 2025-07-31: Patches and Security-Updates
+- 2025-08-06: Patches and Security-Updates + Critical Fix https://wid.cert-bund.de/portal/wid/securityadvisory?name=WID-SEC-2025-1460

php/php-fpm.conf

@@ -118,4 +118,4 @@
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php83/php-fpm.d/*.conf
+include=/etc/php84/php-fpm.d/*.conf