From 381af0d8ccc42a2619d6c8b733571164d01d17d4 Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Fri, 23 Dec 2022 14:45:41 -0500 Subject: [PATCH 1/2] ci: Update Docker build workflows (#59) Signed-off-by: Thane Thomson Signed-off-by: Thane Thomson (cherry picked from commit ddd01178cb68c7b6564a34f588706d3574f822f3) # Conflicts: # .github/workflows/tendermint-docker.yml --- .github/workflows/tendermint-docker.yml | 8 +++++++- .github/workflows/testapp-docker.yml | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tendermint-docker.yml b/.github/workflows/tendermint-docker.yml index 7610ecedd1b..83a9704e8e9 100644 --- a/.github/workflows/tendermint-docker.yml +++ b/.github/workflows/tendermint-docker.yml @@ -1,6 +1,12 @@ +<<<<<<< HEAD name: Build & Push # Build & Push rebuilds the tendermint docker image on every push to master and creation of tags # and pushes the image to https://hub.docker.com/r/interchainio/simapp/tags +======= +name: Docker +# Build & Push rebuilds the Tendermint docker image on every push to main and creation of tags +# and pushes the image to https://hub.docker.com/r/cometbft/tendermint +>>>>>>> ddd01178c (ci: Update Docker build workflows (#59)) on: pull_request: push: @@ -18,7 +24,7 @@ jobs: - name: Prepare id: prep run: | - DOCKER_IMAGE=tendermint/tendermint + DOCKER_IMAGE=cometbft/tendermint VERSION=noop if [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} diff --git a/.github/workflows/testapp-docker.yml b/.github/workflows/testapp-docker.yml index 310e80e382f..c562f6efe4b 100644 --- a/.github/workflows/testapp-docker.yml +++ b/.github/workflows/testapp-docker.yml @@ -1,6 +1,6 @@ name: Docker E2E Node # Build & Push rebuilds the e2e Testapp docker image on every push to main and creation of tags -# and pushes the image to https://hub.docker.com/r/tendermint/e2e-node +# and pushes the image to https://hub.docker.com/r/cometbft/e2e-node on: push: branches: @@ -19,7 +19,7 @@ jobs: - name: Prepare id: prep run: | - DOCKER_IMAGE=tendermint/e2e-node + DOCKER_IMAGE=cometbft/e2e-node VERSION=noop if [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} From 84be7144590a7adad742e650ae15b22827fd1c25 Mon Sep 17 00:00:00 2001 From: Thane Thomson Date: Wed, 4 Jan 2023 08:23:25 -0500 Subject: [PATCH 2/2] Resolve conflicts Signed-off-by: Thane Thomson --- .github/workflows/tendermint-docker.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tendermint-docker.yml b/.github/workflows/tendermint-docker.yml index 83a9704e8e9..1f65d8bf2bf 100644 --- a/.github/workflows/tendermint-docker.yml +++ b/.github/workflows/tendermint-docker.yml @@ -1,20 +1,15 @@ -<<<<<<< HEAD -name: Build & Push -# Build & Push rebuilds the tendermint docker image on every push to master and creation of tags -# and pushes the image to https://hub.docker.com/r/interchainio/simapp/tags -======= name: Docker # Build & Push rebuilds the Tendermint docker image on every push to main and creation of tags # and pushes the image to https://hub.docker.com/r/cometbft/tendermint ->>>>>>> ddd01178c (ci: Update Docker build workflows (#59)) on: - pull_request: push: branches: - - master + - main tags: - - "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10 - - "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5 + - "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10 + - "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+" # e.g. v0.37.0-alpha.1, v0.38.0-alpha.10 + - "v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+" # e.g. v0.37.0-beta.1, v0.38.0-beta.10 + - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" # e.g. v0.37.0-rc1, v0.38.0-rc10 jobs: build: @@ -38,25 +33,25 @@ jobs: if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then TAGS="$TAGS,${DOCKER_IMAGE}:${VERSION}" fi - echo ::set-output name=tags::${TAGS} + echo "tags=${TAGS}" >> $GITHUB_OUTPUT - name: Set up QEMU uses: docker/setup-qemu-action@master with: platforms: all - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + - name: Set up Docker Build + uses: docker/setup-buildx-action@v2.2.1 - name: Login to DockerHub if: ${{ github.event_name != 'pull_request' }} - uses: docker/login-action@v2 + uses: docker/login-action@v2.1.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Publish to Docker Hub - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v3.2.0 with: context: . file: ./DOCKER/Dockerfile