Merge pull request #475 from bcgov/feat/php-8.2

Upgrading PHP-8.1 to PHP-8.2
bcgov · May 10, 2024 · a94622d · a94622d
2 parents e31ed8a + 96e5b91
commit a94622d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       run: |
         export DB_TYPE=mysql
         export DB_PORT=3306
-        git clone --branch 10.1.x-php8.1 https://github.com/drupalwxt/docker-scaffold.git docker
+        git clone --branch 10.2.x-php8.2 https://github.com/drupalwxt/docker-scaffold.git docker
         make build
         docker compose -f docker-compose.ci.yml up -d
         docker ps -a

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -24,7 +24,7 @@ jobs:
       run: |
         export DB_TYPE=mysql
         export DB_PORT=3306
-        git clone --branch 10.1.x-php8.1 https://github.com/drupalwxt/docker-scaffold.git docker
+        git clone --branch 10.2.x-php8.2 https://github.com/drupalwxt/docker-scaffold.git docker
         make build
         docker compose -f docker-compose.ci.yml up -d
         docker ps -a
@@ -53,7 +53,7 @@ jobs:
       run: echo "GITHUB_REFERENCE=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_ENV
 
     - name: Login to Container Registry 🐸
-      uses: docker/login-action@v2
+      uses: docker/login-action@v2    
       with:
         registry: ${{ env.CONTAINER_REGISTRY }}
         username: ${{ env.CONTAINER_REGISTRY_USERNAME }}
@@ -62,6 +62,7 @@ jobs:
     - name: Build and push PHP-FPM 🐳
       run: |
         docker tag mfin-data-catalogue-web:latest ${{ env.CONTAINER_REGISTRY }}/${{ env.CONTAINER_IMAGE_NAME }}:${{ env.GITHUB_REFERENCE }}
+        docker tag mfin-data-catalogue-web:latest ${{ env.CONTAINER_REGISTRY }}/${{ env.CONTAINER_IMAGE_NAME }}:
         docker push ${{ env.CONTAINER_REGISTRY }}/${{ env.CONTAINER_IMAGE_NAME }}:${{ env.GITHUB_REFERENCE }}
 
     - name: Build and push Nginx 🐳