Fix indentation and add versioning

2023-12-08 10:37:18 -05:00
parent 46755db8f3
commit e7128093a1
4 changed files with 108 additions and 69 deletions
@@ -59,7 +59,7 @@ jobs:
        with:
          tag: v${{ steps.tag.outputs.version }}

-  container:
+  publish:
    name: Publish Container Image
    runs-on: ubuntu-latest

@@ -73,75 +73,61 @@ jobs:
          fetch-tags: true
          ref: main

-      - name: Build, Scan, and Publish Container Image
-        id: build-scan-publish
-        uses: usps/fast-track-container-image-action@v1.0.0
+      # Create the list of image tags that will be published. If a prerelease is
+      # being published (e.g. `1.2.3-alpha.4`), only the prerelease tag will be
+      # published (`v1.2.3-alpha.4`). Otherwise, the following tags will be
+      # published:
+      # - `latest`
+      # - `v1.2.3`
+      # - `v1.2`
+      # - `v1`
+      - name: Set Image Tags
+        id: tags
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const version = '${{ needs.release.outputs.version }}'
+
+            // Check if prerelease (e.g. 1.2.3-alpha.4)
+            if (version.includes('-')) {
+              // Only output the prerelease tag
+              core.setOutput('tags', `type=raw,value=v${version}`)
+            } else {
+              // Output all the tags
+              let tags = [
+                'type=raw,value=latest',
+                `type=raw,value=v${version}`,
+                `type=raw,value=v${version.split('.').slice(0, 2).join('.')}`,
+                `type=raw,value=v${version.split('.')[0]}`
+              ]
+              core.setOutput('tags', tags.join('\n'))
+            }
+
+      # Get metadata to apply to image
+      - name: Extract Metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.CONTAINER_REGISTRY }}/${{ github.repository }}
+          tags: ${{ steps.tags.outputs.tags }}
+
+      # Authenticate to the container registry
+      - name: Authenticate to Container Registry
+        id: login
+        uses: docker/login-action@v3
        with:
-          # Container registry details
          registry: ${{ env.CONTAINER_REGISTRY }}
          username: ${{ env.CONTAINER_REGISTRY_USERNAME }}
          password: ${{ env.CONTAINER_REGISTRY_PASSWORD }}

-          # Other inputs
-          checkout: true
-          manifest-path: ${{ env.MANIFEST_PATH }}
-          version: ${{ needs.release.outputs.version }}
-
-    # Create the list of image tags that will be published. If a prerelease is
-    # being published (e.g. `1.2.3-alpha.4`), only the prerelease tag will be
-    # published (`v1.2.3-alpha.4`). Otherwise, the following tags will be
-    # published:
-    # - `latest`
-    # - `v1.2.3`
-    # - `v1.2`
-    # - `v1`
-    - name: Set Image Tags
-      id: tags
-      uses: actions/github-script@v7
-      with:
-        script: |
-          const version = '${{ needs.release.outputs.version }}'
-
-          // Check if prerelease (e.g. 1.2.3-alpha.4)
-          if (version.includes('-')) {
-            // Only output the prerelease tag
-            core.setOutput('tags', `type=raw,value=v${version}`)
-          } else {
-            // Output all the tags
-            let tags = [
-              'type=raw,value=latest',
-              `type=raw,value=v${version}`,
-              `type=raw,value=v${version.split('.').slice(0, 2).join('.')}`,
-              `type=raw,value=v${version.split('.')[0]}`
-            ]
-            core.setOutput('tags', tags.join('\n'))
-          }
-
-    # Get metadata to apply to image
-    - name: Extract Metadata
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: ${{ env.CONTAINER_REGISTRY }}/${{ github.repository }}
-        tags: ${{ steps.tags.outputs.tags }}
-
-    # Authenticate to the container registry
-    - name: Authenticate to Container Registry
-      id: login
-      uses: docker/login-action@v3
-      with:
-        registry: ${{ env.CONTAINER_REGISTRY }}
-        username: ${{ env.CONTAINER_REGISTRY_USERNAME }}
-        password: ${{ env.CONTAINER_REGISTRY_PASSWORD }}
-
-    # Publish the container image
-    - name: Publish Container Image
-      id: publish
-      uses: docker/build-push-action@v5
-      env:
-        LABELS: ${{ steps.meta.outputs.labels }}
-        TAGS: ${{ steps.meta.outputs.tags }}
-      with:
-        labels: ${{ env.LABELS }}
-        push: true
-        tags: ${{ env.TAGS }}
+      # Publish the container image
+      - name: Publish Container Image
+        id: publish
+        uses: docker/build-push-action@v5
+        env:
+          LABELS: ${{ steps.meta.outputs.labels }}
+          TAGS: ${{ steps.meta.outputs.tags }}
+        with:
+          labels: ${{ env.LABELS }}
+          push: true
+          tags: ${{ env.TAGS }}