Merge pull request #27 from Johnny-Knighten/fix/update-repo-names

Fix/update repo names
Johnny-Knighten · Nov 9, 2023 · ec5be0c · ec5be0c
2 parents 6361f66 + 6c3684d
commit ec5be0c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -23,24 +23,39 @@ jobs:
       with:
         dockerfile: "Dockerfile"
 
-    - name: Build Docker image
+    - name: Build Docker image (Push To Cache)
       uses: docker/build-push-action@v3
       with:
         context: .
         file: ./Dockerfile
         push: false
         load: true
-        tags: johnnyknighten/test:latest
-        cache-from: type=gha
+        tags: johnnyknighten/example-github-actions-for-container-release:latest
         cache-to: type=gha,mode=max
 
   test:
     runs-on: ubuntu-latest
     needs:
       - lint-and-build
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Build Docker image (From Cache)
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        file: ./Dockerfile
+        push: false
+        load: true
+        tags: johnnyknighten/example-github-actions-for-container-release:latest
+        cache-from: type=gha
+
     - name: Test the Docker image TEST_VAR equals content of text_content.text
-      run: docker run --rm johnnyknighten/test:latest -c "cat test_content.txt | grep -q \"Hello World\""
+      run: docker run --rm johnnyknighten/example-github-actions-for-container-release:latest -c "cat test_content.txt | grep -q \"Hello World\""
 
     - name: Check Nano is installed
-      run: docker run --rm johnnyknighten/test:latest -c "nano --version"
+      run: docker run --rm johnnyknighten/example-github-actions-for-container-release:latest -c "nano --version"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -88,7 +88,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            johnnyknighten/test
+            johnnyknighten/example-github-actions-for-container-release
           tags: |
             type=semver,pattern={{version}},value=${{ needs.github-release.outputs.new_version}}
 
@@ -98,7 +98,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            johnnyknighten/test
+            johnnyknighten/example-github-actions-for-container-release
           tags: |
             type=semver,pattern={{version}},value=${{ needs.github-release.outputs.new_version_dry_run }}
 
@@ -110,7 +110,6 @@ jobs:
           push: true
           tags:  ${{ steps.meta.outputs.tags }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
 
       - name: Push Image to Docker Hub (DRY RUN)
         if: ${{ env.ACT }}
@@ -125,6 +124,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          repository: johnnyknighten/test
+          repository: johnnyknighten/example-github-actions-for-container-release
           short-description: ${{ github.event.repository.description }}
           enable-url-completion: true
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "repository" : {
         "type": "git",
-        "url": "https://github.com/Johnny-Knighten/dockerhub-plus-semver-ci-test"
+        "url": "https://github.com/Johnny-Knighten/example-github-actions-for-container-release"
     },
     "dependencies": {
         "semantic-release": "22.0.5",