From 62bd7f805fcda793f9fbbdbf139325abea3b465d Mon Sep 17 00:00:00 2001 From: Corey Caverly Date: Fri, 15 Dec 2023 10:15:46 -0800 Subject: [PATCH 1/3] Update docker-publish.yml Removing Dockerhub and just doing ghcr Signed-off-by: Corey Caverly --- .github/workflows/docker-publish.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b32297b..3b06a1d 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -24,11 +24,11 @@ jobs: - name: Check out the repo uses: actions/checkout@v4 - - name: Log in to Docker Hub - uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a - with: - username: ${{ secrets.DOCKERHUBUSER }} - password: ${{ secrets.DOCKERHUBPASSWORD }} + #- name: Log in to Docker Hub + # uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a + # with: + # username: ${{ secrets.DOCKERHUBUSER }} + # password: ${{ secrets.DOCKERHUBPASSWORD }} - name: Log in to the Container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 @@ -42,8 +42,9 @@ jobs: uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 with: images: | - argoprojlabs/gordian ghcr.io/${{ github.repository }} + # argoprojlabs/gordian + - name: Build and push Docker images uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 From 3f2fa72d17ac8d15f1cdbf073eeca544b771f04a Mon Sep 17 00:00:00 2001 From: Corey Caverly Date: Fri, 15 Dec 2023 12:14:10 -0800 Subject: [PATCH 2/3] Revving for release Signed-off-by: Corey Caverly --- CHANGELOG.md | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eafba89..4419d57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org). +## [3.7.1] - 2023-12-15 +### Fix +- Removed dockerhub publish ## [3.7.0] - 2023-10-18 ### Added diff --git a/setup.py b/setup.py index c2a592a..898935e 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup_reqs = ["pytest", "pytest-cov", "pytest-runner", "flake8"] setuptools.setup( name="gordian", - version="3.7.0", + version="3.7.1", author="Intuit", author_email="cg-sre@intuit.com", description="A tool to search and replace files in a Git repo", From 3671b07dad8e34b083aed04abee189ceca01ee8b Mon Sep 17 00:00:00 2001 From: Corey Caverly Date: Fri, 15 Dec 2023 12:17:59 -0800 Subject: [PATCH 3/3] Decided to remove and not just comment out Signed-off-by: Corey Caverly --- .github/workflows/docker-publish.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 3b06a1d..299d2e9 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -23,29 +23,21 @@ jobs: steps: - name: Check out the repo uses: actions/checkout@v4 - - #- name: Log in to Docker Hub - # uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a - # with: - # username: ${{ secrets.DOCKERHUBUSER }} - # password: ${{ secrets.DOCKERHUBPASSWORD }} - + - name: Log in to the Container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.CR_PAT }} - + - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 with: images: | ghcr.io/${{ github.repository }} - # argoprojlabs/gordian - - + - name: Build and push Docker images uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 with: