migrate to ghcr

agence-adeliom · Dec 2, 2024 · e853a92 · e853a92
1 parent a8a43a1
commit e853a92
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 25 deletions.
diff --git a/.github/workflows/build_php.yml b/.github/workflows/build_php.yml
@@ -18,13 +18,17 @@ on:
         required: false
         type: string
       registry:
-        default: "adeliom"
+        default: "ghcr.io/agence-adeliom"
         required: true
         type: string
     outputs:
       repository:
         value: ${{ jobs.base-images.repository.outputs.REPOSITORY }}
 
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   frankenphp:
     runs-on: ubuntu-latest
@@ -43,8 +47,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set image tag
         run: echo "IMAGE_TAG=${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.version }}-${{ matrix.variant }}" >> $GITHUB_OUTPUT
         id: image_tag
@@ -109,8 +113,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set image tag
         run: echo "IMAGE_TAG=${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.version }}-${{ matrix.variant }}" >> $GITHUB_OUTPUT
         id: image_tag
@@ -175,8 +179,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set image tag
         run: echo "IMAGE_TAG=${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.version }}-${{ matrix.variant }}" >> $GITHUB_OUTPUT
         id: image_tag
@@ -242,8 +246,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set image tag
         run: echo "IMAGE_TAG=${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.version }}-${{ matrix.variant }}" >> $GITHUB_OUTPUT
         id: image_tag
@@ -310,8 +314,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set image tag
         run: echo "IMAGE_TAG=${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.version }}-${{ matrix.variant }}" >> $GITHUB_OUTPUT
         id: image_tag
@@ -378,8 +382,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set image tag
         run: echo "IMAGE_TAG=${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.version }}-${{ matrix.variant }}" >> $GITHUB_OUTPUT
         id: image_tag
@@ -446,8 +450,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set image tag
         run: echo "IMAGE_TAG=${{ inputs.registry }}/${{ inputs.image }}:${{ matrix.version }}-${{ matrix.variant }}" >> $GITHUB_OUTPUT
         id: image_tag

diff --git a/php/Dockerfile.apache b/php/Dockerfile.apache
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PHP_VERSION
-FROM adeliom/php:${PHP_VERSION}-fpm
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-fpm
 
 # ensure www-data user exists
 #RUN set -x \

diff --git a/php/Dockerfile.apache-wkhtmltopdf b/php/Dockerfile.apache-wkhtmltopdf
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PHP_VERSION
-FROM adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf
 
 # ensure www-data user exists
 #RUN set -x \

diff --git a/php/Dockerfile.caddy b/php/Dockerfile.caddy
@@ -3,7 +3,7 @@ ARG PHP_VERSION
 ARG CADDY_VERSION="2.8.4"
 FROM caddy:${CADDY_VERSION}-alpine AS caddy-builder
 
-FROM adeliom/php:${PHP_VERSION}-fpm
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-fpm
 
 RUN set -eux; \
 	mkdir -p \

diff --git a/php/Dockerfile.caddy-wkhtmltopdf b/php/Dockerfile.caddy-wkhtmltopdf
@@ -3,7 +3,7 @@ ARG PHP_VERSION
 ARG CADDY_VERSION="2.8.4"
 FROM caddy:${CADDY_VERSION}-alpine AS caddy-builder
 
-FROM adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf
 
 RUN set -eux; \
 	mkdir -p \

diff --git a/php/Dockerfile.cli-wkhtmltopdf b/php/Dockerfile.cli-wkhtmltopdf
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PHP_VERSION
-FROM adeliom/php:${PHP_VERSION}-cli
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-cli
 
 RUN apk add --update --no-cache \
    libgcc libstdc++ libx11 glib libxrender libxext libintl \

diff --git a/php/Dockerfile.fpm-wkhtmltopdf b/php/Dockerfile.fpm-wkhtmltopdf
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PHP_VERSION
-FROM adeliom/php:${PHP_VERSION}-fpm
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-fpm
 
 RUN apk add --update --no-cache \
    libgcc libstdc++ libx11 glib libxrender libxext libintl \

diff --git a/php/Dockerfile.frankenphp-wkhtmltopdf b/php/Dockerfile.frankenphp-wkhtmltopdf
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PHP_VERSION
-FROM adeliom/php:${PHP_VERSION}-frankenphp
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-frankenphp
 
 RUN set -x \
     && apt-get update \

diff --git a/php/Dockerfile.nginx b/php/Dockerfile.nginx
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PHP_VERSION
-FROM adeliom/php:${PHP_VERSION}-fpm
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-fpm
 
 RUN apk --update add --no-cache \
     supervisor \

diff --git a/php/Dockerfile.nginx-wkhtmltopdf b/php/Dockerfile.nginx-wkhtmltopdf
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PHP_VERSION
-FROM adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf
+FROM ghcr.io/agence-adeliom/php:${PHP_VERSION}-fpm-wkhtmltopdf
 
 RUN apk --update add --no-cache \
     supervisor \

diff --git a/php/README.md b/php/README.md
@@ -154,7 +154,7 @@ This list can be outdated, you can verify by executing : `docker run --rm -it  a
 ### Compiling extensions in the custom image with [mlocati/docker-php-extension-installer](https://github.com/mlocati/docker-php-extension-installer)
 
 ```Dockerfile
-FROM adeliom/php:8.1-apache
+FROM ghcr.io/agence-adeliom/php:8.1-apache
 
 # Install tidy extension
 RUN install-php-extensions tidy