diff --git a/.github/workflows/chart.yml b/.github/workflows/chart.yml index 33b5213..3df213d 100644 --- a/.github/workflows/chart.yml +++ b/.github/workflows/chart.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.7 + python-version: 3.8 - name: Set up chart-testing uses: helm/chart-testing-action@v2.7.0 - name: Run chart-testing (list-changed) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b4d3170..102454c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,15 +10,17 @@ permissions: read-all jobs: build-and-publish-images: runs-on: ubuntu-latest + permissions: + packages: write steps: - name: Checkout code uses: actions/checkout@v4 - - name: Login to AWS Public ECR + - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - registry: public.ecr.aws - username: ${{ secrets.AWS_ACCESS_KEY_ID }} - password: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Extract tag name id: extract_tag_name run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT @@ -26,17 +28,17 @@ jobs: run: | docker build \ -f database/migrations/Dockerfile \ - -t public.ecr.aws/g6m3a0y9/gitvote-dbmigrator:${{steps.extract_tag_name.outputs.tag}} \ - -t public.ecr.aws/g6m3a0y9/gitvote-dbmigrator:latest \ + -t ghcr.io/${{ github.repository }}/dbmigrator:${{steps.extract_tag_name.outputs.tag}} \ + -t ghcr.io/${{ github.repository }}/dbmigrator:latest \ . - docker push --all-tags public.ecr.aws/g6m3a0y9/gitvote-dbmigrator + docker push --all-tags ghcr.io/${{ github.repository }}/dbmigrator - name: Build and push gitvote image run: | docker build \ - -t public.ecr.aws/g6m3a0y9/gitvote:${{steps.extract_tag_name.outputs.tag}} \ - -t public.ecr.aws/g6m3a0y9/gitvote:latest \ + -t ghcr.io/${{ github.repository }}/server:${{steps.extract_tag_name.outputs.tag}} \ + -t ghcr.io/${{ github.repository }}/server:latest \ . - docker push --all-tags public.ecr.aws/g6m3a0y9/gitvote + docker push --all-tags ghcr.io/${{ github.repository }}/server package-and-publish-helm-chart: needs: diff --git a/charts/gitvote/Chart.yaml b/charts/gitvote/Chart.yaml index 8c281a8..ed92f73 100644 --- a/charts/gitvote/Chart.yaml +++ b/charts/gitvote/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: gitvote description: GitVote is a GitHub application that allows holding a vote on issues and pull requests type: application -version: 1.4.0 +version: 1.4.1 appVersion: 1.4.0 kubeVersion: ">= 1.19.0-0" home: https://gitvote.dev @@ -41,9 +41,9 @@ annotations: artifacthub.io/containsSecurityUpdates: "true" artifacthub.io/images: | - name: dbmigrator - image: public.ecr.aws/g6m3a0y9/gitvote-dbmigrator:v1.4.0 + image: ghcr.io/cncf/gitvote/dbmigrator:v1.4.1 - name: gitvote - image: public.ecr.aws/g6m3a0y9/gitvote:v1.4.0 + image: ghcr.io/cncf/gitvote/server:v1.4.1 artifacthub.io/links: | - name: source url: https://github.com/cncf/gitvote diff --git a/charts/gitvote/values.yaml b/charts/gitvote/values.yaml index 7943070..c1af33c 100644 --- a/charts/gitvote/values.yaml +++ b/charts/gitvote/values.yaml @@ -36,7 +36,7 @@ dbmigrator: job: image: # Database migrator image repository (without the tag) - repository: public.ecr.aws/g6m3a0y9/gitvote-dbmigrator + repository: ghcr.io/cncf/gitvote/dbmigrator # GitVote service configuration gitvote: @@ -74,7 +74,7 @@ gitvote: deploy: replicaCount: 1 image: - repository: public.ecr.aws/g6m3a0y9/gitvote + repository: ghcr.io/cncf/gitvote/server resources: {} # PostgreSQL configuration