add the -u and --strategy flags to config-shim

silinternational · Nov 21, 2024 · 140fa0d · 140fa0d
1 parent d3bb054
commit 140fa0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -55,10 +55,19 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
-      - name: Build and push Docker image
+      - name: Build and push Docker image to Docker Hub
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Build and push Docker image to GitHub Container Registry
+        uses: docker/build-push-action@v5
+        if: startsWith(github.ref, 'refs/tags')
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/${{ github.repository }}:${{ github.ref_name }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/dockerbuild/run.sh b/dockerbuild/run.sh
@@ -23,7 +23,7 @@ php -v | head -n 1
 if [[ -z "${APP_ID}" ]]; then
   apache2ctl -k start -D FOREGROUND
 else
-  config-shim --app $APP_ID --config $CONFIG_ID --env $ENV_ID apache2ctl -k start -D FOREGROUND
+  config-shim -u --strategy $STRATEGY_ID --app $APP_ID --config $CONFIG_ID --env $ENV_ID apache2ctl -k start -D FOREGROUND
 fi
 
 # endless loop with a wait is needed for the trap to work