Release v0.10.0 #minor

vultr · Sep 18, 2023 · ee60acd · ee60acd
1 parent 9297974
commit ee60acd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/releaser.yaml b/.github/workflows/releaser.yaml
@@ -44,34 +44,31 @@ jobs:
     runs-on: ubuntu-latest
     needs: create-tag
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      -
-        name: Set up Go
+      - name: Set up Go
         uses: actions/setup-go@v2
         with:
           go-version: "1.20"
-      -
-        name: Docker Login
+      - name: Docker Login
         env:
-          DOCKER_USERNAME: ${{ github.repository_owner }}
-          DOCKER_PASSWORD: ${{ secrets.CR_PAT }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: |
-          echo "${DOCKER_PASSWORD}" | docker login ghcr.io --username "${DOCKER_USERNAME}" --password-stdin
-      -
-        name: Run GoReleaser
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+      - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
           distribution: goreleaser
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.CR_PAT }}
-      -
-        name: Clear
+          GITHUB_TOKEN: ${{ secrets.VULTRBOT_TOKEN }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Clear
         if: always()
         run: |
           rm -f ${HOME}/.docker/config.json

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -35,11 +35,11 @@ checksum:
 dockers:
   - dockerfile: Dockerfile.goreleaser
     image_templates:
-      - "ghcr.io/vultr/vultr-cloud-controller-manager/vultr-cloud-controller-manager:release"
-      - "ghcr.io/vultr/vultr-cloud-controller-manager/vultr-cloud-controller-manager:{{ .Tag }}"
       - "vultr/vultr-cloud-controller-manager:release"
       - "vultr/vultr-cloud-controller-manager:latest"
       - "vultr/vultr-cloud-controller-manager:{{ .Tag }}"
+    extra_files:
+      - scripts/entrypoint.sh
 
 release:
   draft: false

diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+if [ -n "$DOCKER_USERNAME" ] && [ -n "$DOCKER_PASSWORD" ]; then
+    echo "Login to the docker..."
+    echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin $DOCKER_REGISTRY
+fi