Rebase from master dex/idp

orange-cloudfoundry · Sep 4, 2023 · 0c3e1b7 · 0c3e1b7
2 parents 2ab9325 + 7dc978e
commit 0c3e1b7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -3,7 +3,12 @@ name: Create and publish a Docker image
 # Configures this workflow to run every time a change is pushed to the branch called `release`.
 on:
   push:
+<<<<<<< HEAD
     branches: ['release-orange-v2.37.0']
+=======
+    tags:
+      - "**"
+>>>>>>> 7dc978edaad48fd7046ebffa038aafe3df6cd28f
 
 # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
 env: