Merge branch 'main' into test_build

lagoon-examples · Aug 6, 2024 · 6a7ee3c · 6a7ee3c
2 parents 51307a8 + 9dc54b7
commit 6a7ee3c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 90 deletions.
diff --git a/.github/workflows/build-base-images.yaml b/.github/workflows/build-base-images.yaml
@@ -17,11 +17,12 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
-    # - name: Log in to Docker Hub
-    #   uses: docker/login-action@v2
-    #   with:
-    #     username: ${{ secrets.DOCKER_USERNAME }}
-    #     password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Log in to GitHub Container Registry
       uses: docker/login-action@v3
@@ -40,6 +41,12 @@ jobs:
           nginx.tags=ghcr.io/${{ github.repository_owner }}/drupal-base-image/nginx:latest
           php.tags=ghcr.io/${{ github.repository_owner }}/drupal-base-image/php:latest
 
+    - name: Tag Docker images
+      run: |
+        docker tag drupal-base-cli:latest uselagoon/drupal-base-image-cli:latest
+        docker tag drupal-base-php:latest uselagoon/drupal-base-image-php:latest
+        docker tag drupal-base-nginx:latest uselagoon/drupal-base-image-nginx:latest
+
     - name: List images
       run: docker image ls
 

diff --git a/.github/workflows/drupal-example.yaml b/.github/workflows/drupal-example.yaml
diff --git a/.github/workflows/merge-branch.yaml b/.github/workflows/merge-branch.yaml