Merge branch 'update-action'

WolleTD · Jan 30, 2024 · 6e991fa · 6e991fa
2 parents ef87cee + 29db860
commit 6e991fa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -5,21 +5,29 @@ on:
     branches: [ master ]
   workflow_dispatch:
 
-env:
-  DOCKER_BUILDKIT: 1
-
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
       - name: Pull repository
-        uses: actions/checkout@v3
-      - name: Build the image
-        run: docker build . --tag wolletd/wg-setup:latest
+        uses: actions/checkout@v4
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Push the image
-        run: docker push wolletd/wg-setup:latest
+      - name: Login to ghcr.io
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push the image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          provenance: false
+          tags: |
+            docker.io/wolletd/wg-setup:latest
+            ghcr.io/wolletd/wg-setup:latest
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,15 +6,15 @@ jobs:
   unit-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Run tests
       working-directory: ${{github.workspace}}/tests
       run: ./run_tests.sh
 
   docker-setup:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: sudo modprobe wireguard
     - name: Run docker test
       working-directory: ${{github.workspace}}/tests