From 279f15dc3faa16a3e9aeb1b8b218f95fa3414e48 Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Wed, 3 Apr 2024 11:06:41 -0400 Subject: [PATCH 1/7] Update release.yml --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c88e8307..07b565c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,12 +21,12 @@ jobs: python -m pip install --upgrade pip pip install tox - - name: Login to image registry - uses: docker/login-action@v1 - with: - registry: registry.redhat.io - username: ${{ secrets.RH_REG_ACCT }} - password: ${{ secrets.RH_REG_TOKEN }} +# - name: Login to image registry +# uses: docker/login-action@v1 +# with: +# registry: registry.redhat.io +# username: ${{ secrets.RH_REG_ACCT }} +# password: ${{ secrets.RH_REG_TOKEN }} - name: Build image env: From fec1c7284db80264fcc8327dd718cfc7ac2b3a5a Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Wed, 3 Apr 2024 11:09:27 -0400 Subject: [PATCH 2/7] Update tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index debfc5a0..bb85315a 100644 --- a/tox.ini +++ b/tox.ini @@ -4,8 +4,8 @@ skipsdist = True [testenv] basepython = python3 -install_command = pip install {opts} {packages} -deps = -r{toxinidir}/requirements.txt +#install_command = pip install {opts} {packages} +#deps = -r{toxinidir}/requirements.txt [testenv:podman] passenv = From 1f89fc62d04a3cabe441110049f5f7c5e3211f0c Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Wed, 3 Apr 2024 11:11:40 -0400 Subject: [PATCH 3/7] Update tox.ini --- tox.ini | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index bb85315a..3de5e413 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,9 @@ whitelist_external = commands = /bin/bash -c "podman rmi quay.io/purestorage/swagger:latest || true" docker build . -allowlist_externals = /bin/bash +allowlist_externals = + /bin/bash + docker [testenv:docker] passenv = @@ -24,4 +26,6 @@ whitelist_external = true commands = /bin/bash -c "podman rmi quay.io/purestorage/swagger:latest || true" -allowlist_externals = /bin/bash +allowlist_externals = + /bin/bash + docker From bb7326b0c73288d2347d99ecf20cd79ee0c6319a Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Wed, 3 Apr 2024 11:33:30 -0400 Subject: [PATCH 4/7] Update tox.ini --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index 3de5e413..bbca3b84 100644 --- a/tox.ini +++ b/tox.ini @@ -15,6 +15,9 @@ whitelist_external = commands = /bin/bash -c "podman rmi quay.io/purestorage/swagger:latest || true" docker build . + IMAGE=$(docker images | head -2 - | tail -1 - | awk '{ print $3 }') + docker tag $IMAGE swagger:{posargs} + docker tag $IMAGE swagger:latest allowlist_externals = /bin/bash docker From 1686f069b57e7f929198d18ae95ecee3ee1bf3e9 Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Wed, 3 Apr 2024 12:05:58 -0400 Subject: [PATCH 5/7] Update tox.ini --- tox.ini | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/tox.ini b/tox.ini index bbca3b84..b75248c1 100644 --- a/tox.ini +++ b/tox.ini @@ -14,21 +14,7 @@ whitelist_external = true commands = /bin/bash -c "podman rmi quay.io/purestorage/swagger:latest || true" - docker build . - IMAGE=$(docker images | head -2 - | tail -1 - | awk '{ print $3 }') - docker tag $IMAGE swagger:{posargs} - docker tag $IMAGE swagger:latest -allowlist_externals = - /bin/bash - docker - -[testenv:docker] -passenv = - HOME,DOCKER_BUILDKIT -whitelist_external = - true -commands = - /bin/bash -c "podman rmi quay.io/purestorage/swagger:latest || true" + docker build . -t swagger:{posargs} -t swagger:latest allowlist_externals = /bin/bash docker From c6051d6b566f39a862c368e6fd858485cf02520b Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Wed, 3 Apr 2024 12:07:01 -0400 Subject: [PATCH 6/7] Update release.yml --- .github/workflows/release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07b565c9..e310ab72 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,12 +32,8 @@ jobs: env: DOCKER_BUILDKIT: 1 run: | - tox -e podman -- --tag=swagger:${{ github.event.release.tag_name }} + tox -e podman -- ${{ github.event.release.tag_name }} - - name: Retag image - run: | - podman tag swagger:${{ github.event.release.tag_name }} swagger:latest - - name: Push swagger uses: redhat-actions/push-to-registry@v2.1.1 with: From 2a10ee4f715d0c15e41010894faf76e71b4fe020 Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Wed, 3 Apr 2024 12:14:06 -0400 Subject: [PATCH 7/7] Update release.yml --- .github/workflows/release.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e310ab72..9de15805 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,13 +21,6 @@ jobs: python -m pip install --upgrade pip pip install tox -# - name: Login to image registry -# uses: docker/login-action@v1 -# with: -# registry: registry.redhat.io -# username: ${{ secrets.RH_REG_ACCT }} -# password: ${{ secrets.RH_REG_TOKEN }} - - name: Build image env: DOCKER_BUILDKIT: 1