From 50e83c841263960c7395d92556820686f180b38c Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 15 Oct 2024 11:04:31 -0600 Subject: [PATCH 1/5] Add documentation on how to build and push vttestserver manually Signed-off-by: Florent Poinsard --- docker/vttestserver/README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 docker/vttestserver/README.md diff --git a/docker/vttestserver/README.md b/docker/vttestserver/README.md new file mode 100644 index 00000000000..1f1d071bb56 --- /dev/null +++ b/docker/vttestserver/README.md @@ -0,0 +1,16 @@ +## vttestserver docker image + +### How to build manually during a release + +If for whatever reason the automatic build did not happen for `vttestserver` during a release, or if it has failed, +there is a way of building it by hand. Here is how it goes: + +```bash +docker login + +# we assume in this example that we are releasing v21.0.0-rc1, but replace this by any other tag +git checkout v21.0.0-rc1 + +docker build -f docker/vtttestserver/Dockerfile.mysql80 -t vitess/vttestserver:v21.0.0-rc1-mysql80 . +docker push vitess/vttestserver:v21.0.0-rc1-mysql80 +``` \ No newline at end of file From 654e41d97dc47bdd5d9480ed61deae163b6508ed Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 15 Oct 2024 11:56:44 -0600 Subject: [PATCH 2/5] Add vttestserver docker build to gha and send slack notification on build Signed-off-by: Florent Poinsard --- .github/workflows/docker_build_images.yml | 137 ++++++++++++++++++---- 1 file changed, 116 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docker_build_images.yml b/.github/workflows/docker_build_images.yml index 6d5e12119b3..9cce7294b30 100644 --- a/.github/workflows/docker_build_images.yml +++ b/.github/workflows/docker_build_images.yml @@ -1,4 +1,4 @@ -name: Docker Build Images +name: Build Docker Images on: push: branches: @@ -8,14 +8,82 @@ on: workflow_dispatch: concurrency: - group: format('{0}-{1}', ${{ github.ref }}, 'Docker Build Images (v20+)') + group: format('{0}-{1}', ${{ github.ref }}, 'Build Docker Images') cancel-in-progress: true permissions: read-all jobs: + build_and_push_vttestserver: + name: Build and push vttestserver + runs-on: gh-hosted-runners-16cores-1 + if: github.repository == 'vitessio/vitess' + + strategy: + fail-fast: true + matrix: + branch: [ mysql80 ] + + steps: + - name: Check out code + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + + - name: Login to Docker Hub + if: needs.push.outputs.push == 'true' + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Set Dockerfile path + run: | + echo "DOCKERFILE=./docker/vttestserver/Dockerfile.${{ matrix.branch }}" >> $GITHUB_ENV + + - name: Build and push on main + if: startsWith(github.ref, 'refs/tags/') == false + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 + with: + context: . + file: ${{ env.DOCKERFILE }} + push: true + tags: vitess/vttestserver:${{ matrix.branch }} + + ###### + # All code below only applies to new tags + ###### + - name: Get the Git tag + if: startsWith(github.ref, 'refs/tags/') + run: echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + + - name: Set Docker tag name + if: startsWith(github.ref, 'refs/tags/') + run: | + echo "DOCKER_TAG=vitess/vttestserver:${TAG_NAME}-${{ matrix.branch }}" >> $GITHUB_ENV + + - name: Build and push on tags + if: startsWith(github.ref, 'refs/tags/') + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 + with: + context: . + file: ${{ env.DOCKERFILE }} + push: true + tags: ${{ env.DOCKER_TAG }} + + ##### + # Slack notification if vttestserver build fails + ##### + - name: Slack Workflow Notification + if: startsWith(github.ref, 'refs/tags/') == false && failure() + uses: Gamesight/slack-workflow-status@68bf00d0dbdbcb206c278399aa1ef6c14f74347a # v1.3.0 + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + channel: '#docker-build-notifications' + name: 'Docker Build Notification' + + build_and_push_lite: - name: Build and push vitess/lite Docker images + name: Build and push lite runs-on: ubuntu-latest if: github.repository == 'vitessio/vitess' @@ -26,10 +94,11 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Login to Docker Hub - uses: docker/login-action@v3 + if: needs.push.outputs.push == 'true' + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -43,8 +112,8 @@ jobs: fi - name: Build and push on main - if: github.ref == 'refs/heads/main' - uses: docker/build-push-action@v5 + if: startsWith(github.ref, 'refs/tags/') == false + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: . file: ${{ env.DOCKERFILE }} @@ -69,31 +138,45 @@ jobs: - name: Build and push on tags if: startsWith(github.ref, 'refs/tags/') - uses: docker/build-push-action@v5 + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: . file: ${{ env.DOCKERFILE }} push: true tags: ${{ env.DOCKER_TAG }} + ##### + # Slack notification if lite build fails + ##### + - name: Slack Workflow Notification + if: failure() + uses: Gamesight/slack-workflow-status@68bf00d0dbdbcb206c278399aa1ef6c14f74347a # v1.3.0 + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + channel: '#docker-build-notifications' + name: 'Docker Build Notification' + build_and_push_components: - name: Build and push vitess components Docker images - needs: build_and_push_lite + name: Build and push runs-on: gh-hosted-runners-16cores-1 - if: github.repository == 'vitessio/vitess' + if: github.repository == 'vitessio/vitess' && needs.build_and_push_lite.result == 'success' + needs: + - build_and_push_lite strategy: fail-fast: true matrix: debian: [ bullseye, bookworm ] - component: [ vtadmin, vtorc, vtgate, vttablet, mysqlctld, mysqlctl, vtctl, vtctlclient, vtctld, logrotate, logtail, vtbackup, vtexplain ] + component: [ vtadmin, vtorc, vtgate, vttablet, mysqlctld, mysqlctl, vtctl, vtctlclient, vtctld, vtctldclient, logrotate, logtail, vtbackup, vtexplain ] steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Login to Docker Hub - uses: docker/login-action@v3 + if: needs.push.outputs.push == 'true' + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -103,8 +186,8 @@ jobs: echo "DOCKER_CTX=./docker/binaries/${{ matrix.component }}" >> $GITHUB_ENV - name: Build and push on main latest tag - if: github.ref == 'refs/heads/main' && matrix.debian == 'bookworm' - uses: docker/build-push-action@v5 + if: startsWith(github.ref, 'refs/tags/') == false && matrix.debian == 'bookworm' + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} push: true @@ -114,8 +197,8 @@ jobs: DEBIAN_VER=${{ matrix.debian }}-slim - name: Build and push on main debian specific tag - if: github.ref == 'refs/heads/main' - uses: docker/build-push-action@v5 + if: startsWith(github.ref, 'refs/tags/') == false + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} push: true @@ -147,7 +230,7 @@ jobs: # Build and Push component image to DOCKER_TAG, applies to both debian version - name: Build and push on tags using Debian extension if: startsWith(github.ref, 'refs/tags/') - uses: docker/build-push-action@v5 + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} push: true @@ -160,11 +243,23 @@ jobs: # It is fine to build a second time here when "matrix.debian == 'bookworm'" as we have cached the first build already - name: Build and push on tags without Debian extension if: startsWith(github.ref, 'refs/tags/') && matrix.debian == 'bookworm' - uses: docker/build-push-action@v5 + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} push: true tags: ${{ env.DOCKER_TAG_DEFAULT_DEBIAN }} build-args: | VT_BASE_VER=${{ env.TAG_NAME }} - DEBIAN_VER=${{ matrix.debian }}-slim \ No newline at end of file + DEBIAN_VER=${{ matrix.debian }}-slim + + ##### + # Slack notification if component build fails + ##### + - name: Slack Workflow Notification + if: failure() + uses: Gamesight/slack-workflow-status@68bf00d0dbdbcb206c278399aa1ef6c14f74347a # v1.3.0 + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + channel: '#docker-build-notifications' + name: 'Docker Build Notification' \ No newline at end of file From 1c14d4436d0727278afbba9c915990b22f8114a1 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 15 Oct 2024 12:00:18 -0600 Subject: [PATCH 3/5] wip - test slack notification Signed-off-by: Florent Poinsard --- .github/workflows/docker_build_images.yml | 103 +++++++++------------- docker/binaries/vtbackup/Dockerfile | 2 + docker/lite/Dockerfile | 2 + docker/vttestserver/Dockerfile.mysql80 | 2 + 4 files changed, 47 insertions(+), 62 deletions(-) diff --git a/.github/workflows/docker_build_images.yml b/.github/workflows/docker_build_images.yml index 9cce7294b30..d0d99965e16 100644 --- a/.github/workflows/docker_build_images.yml +++ b/.github/workflows/docker_build_images.yml @@ -1,5 +1,6 @@ name: Build Docker Images on: + pull_request: push: branches: - main @@ -28,12 +29,11 @@ jobs: - name: Check out code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Login to Docker Hub - if: needs.push.outputs.push == 'true' - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} +# - name: Login to Docker Hub +# uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set Dockerfile path run: | @@ -45,7 +45,7 @@ jobs: with: context: . file: ${{ env.DOCKERFILE }} - push: true + push: false tags: vitess/vttestserver:${{ matrix.branch }} ###### @@ -66,22 +66,9 @@ jobs: with: context: . file: ${{ env.DOCKERFILE }} - push: true + push: false tags: ${{ env.DOCKER_TAG }} - ##### - # Slack notification if vttestserver build fails - ##### - - name: Slack Workflow Notification - if: startsWith(github.ref, 'refs/tags/') == false && failure() - uses: Gamesight/slack-workflow-status@68bf00d0dbdbcb206c278399aa1ef6c14f74347a # v1.3.0 - with: - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - channel: '#docker-build-notifications' - name: 'Docker Build Notification' - - build_and_push_lite: name: Build and push lite runs-on: ubuntu-latest @@ -96,12 +83,11 @@ jobs: - name: Check out code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Login to Docker Hub - if: needs.push.outputs.push == 'true' - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} +# - name: Login to Docker Hub +# uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set Dockerfile path run: | @@ -117,7 +103,7 @@ jobs: with: context: . file: ${{ env.DOCKERFILE }} - push: true + push: false tags: vitess/lite:${{ matrix.branch }} ###### @@ -142,21 +128,9 @@ jobs: with: context: . file: ${{ env.DOCKERFILE }} - push: true + push: false tags: ${{ env.DOCKER_TAG }} - ##### - # Slack notification if lite build fails - ##### - - name: Slack Workflow Notification - if: failure() - uses: Gamesight/slack-workflow-status@68bf00d0dbdbcb206c278399aa1ef6c14f74347a # v1.3.0 - with: - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - channel: '#docker-build-notifications' - name: 'Docker Build Notification' - build_and_push_components: name: Build and push runs-on: gh-hosted-runners-16cores-1 @@ -174,12 +148,11 @@ jobs: - name: Check out code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Login to Docker Hub - if: needs.push.outputs.push == 'true' - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} +# - name: Login to Docker Hub +# uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set Docker context path run: | @@ -190,7 +163,7 @@ jobs: uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} - push: true + push: false tags: vitess/${{ matrix.component }}:latest build-args: | VT_BASE_VER=latest @@ -201,7 +174,7 @@ jobs: uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} - push: true + push: false tags: vitess/${{ matrix.component }}:latest-${{ matrix.debian }} build-args: | VT_BASE_VER=latest @@ -233,7 +206,7 @@ jobs: uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} - push: true + push: false tags: ${{ env.DOCKER_TAG }} build-args: | VT_BASE_VER=${{ env.TAG_NAME }} @@ -246,20 +219,26 @@ jobs: uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} - push: true + push: false tags: ${{ env.DOCKER_TAG_DEFAULT_DEBIAN }} build-args: | VT_BASE_VER=${{ env.TAG_NAME }} DEBIAN_VER=${{ matrix.debian }}-slim - ##### - # Slack notification if component build fails - ##### - - name: Slack Workflow Notification - if: failure() - uses: Gamesight/slack-workflow-status@68bf00d0dbdbcb206c278399aa1ef6c14f74347a # v1.3.0 - with: - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - channel: '#docker-build-notifications' - name: 'Docker Build Notification' \ No newline at end of file + slack_notification: + name: Slack Notification if failed + runs-on: ubuntu-latest + needs: + - build_and_push_vttestserver + - build_and_push_lite + - build_and_push_components + if: ${{ failure() }} + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@68bf00d0dbdbcb206c278399aa1ef6c14f74347a # v1.3.0 + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + channel: '#docker-build-notifications' + name: 'Docker Build Notification' + icon_url: https://avatars.githubusercontent.com/u/33043890?s=96&v=4 \ No newline at end of file diff --git a/docker/binaries/vtbackup/Dockerfile b/docker/binaries/vtbackup/Dockerfile index 3b429928cb4..c8f53b7caad 100644 --- a/docker/binaries/vtbackup/Dockerfile +++ b/docker/binaries/vtbackup/Dockerfile @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +TEST WIP, this will fail the build + ARG VT_BASE_VER=latest ARG DEBIAN_VER=stable-slim diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile index 77235b09c27..5b361f0cf76 100644 --- a/docker/lite/Dockerfile +++ b/docker/lite/Dockerfile @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +TEST WIP, this will fail the build + FROM --platform=linux/amd64 golang:1.23.2-bullseye AS builder # Allows docker builds to set the BUILD_NUMBER diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80 index 5e885be3422..639821bb211 100644 --- a/docker/vttestserver/Dockerfile.mysql80 +++ b/docker/vttestserver/Dockerfile.mysql80 @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +TEST WIP, this will fail the build + FROM --platform=linux/amd64 golang:1.23.2-bullseye AS builder # Allows docker builds to set the BUILD_NUMBER From e25cbd35a38382cc4242c6ce3fde609bc1ef19fd Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 15 Oct 2024 12:45:45 -0600 Subject: [PATCH 4/5] Remove WIP and fix Slack notification Signed-off-by: Florent Poinsard --- .github/workflows/docker_build_images.yml | 47 +++++++++++------------ docker/binaries/vtbackup/Dockerfile | 2 - docker/lite/Dockerfile | 2 - docker/vttestserver/Dockerfile.mysql80 | 2 - 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/.github/workflows/docker_build_images.yml b/.github/workflows/docker_build_images.yml index d0d99965e16..827946a43dc 100644 --- a/.github/workflows/docker_build_images.yml +++ b/.github/workflows/docker_build_images.yml @@ -1,6 +1,5 @@ name: Build Docker Images on: - pull_request: push: branches: - main @@ -29,11 +28,11 @@ jobs: - name: Check out code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 -# - name: Login to Docker Hub -# uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set Dockerfile path run: | @@ -45,7 +44,7 @@ jobs: with: context: . file: ${{ env.DOCKERFILE }} - push: false + push: true tags: vitess/vttestserver:${{ matrix.branch }} ###### @@ -66,7 +65,7 @@ jobs: with: context: . file: ${{ env.DOCKERFILE }} - push: false + push: true tags: ${{ env.DOCKER_TAG }} build_and_push_lite: @@ -83,11 +82,11 @@ jobs: - name: Check out code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 -# - name: Login to Docker Hub -# uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set Dockerfile path run: | @@ -103,7 +102,7 @@ jobs: with: context: . file: ${{ env.DOCKERFILE }} - push: false + push: true tags: vitess/lite:${{ matrix.branch }} ###### @@ -128,7 +127,7 @@ jobs: with: context: . file: ${{ env.DOCKERFILE }} - push: false + push: true tags: ${{ env.DOCKER_TAG }} build_and_push_components: @@ -148,11 +147,11 @@ jobs: - name: Check out code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 -# - name: Login to Docker Hub -# uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set Docker context path run: | @@ -163,7 +162,7 @@ jobs: uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} - push: false + push: true tags: vitess/${{ matrix.component }}:latest build-args: | VT_BASE_VER=latest @@ -174,7 +173,7 @@ jobs: uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} - push: false + push: true tags: vitess/${{ matrix.component }}:latest-${{ matrix.debian }} build-args: | VT_BASE_VER=latest @@ -206,7 +205,7 @@ jobs: uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} - push: false + push: true tags: ${{ env.DOCKER_TAG }} build-args: | VT_BASE_VER=${{ env.TAG_NAME }} @@ -219,7 +218,7 @@ jobs: uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0 with: context: ${{ env.DOCKER_CTX }} - push: false + push: true tags: ${{ env.DOCKER_TAG_DEFAULT_DEBIAN }} build-args: | VT_BASE_VER=${{ env.TAG_NAME }} diff --git a/docker/binaries/vtbackup/Dockerfile b/docker/binaries/vtbackup/Dockerfile index c8f53b7caad..3b429928cb4 100644 --- a/docker/binaries/vtbackup/Dockerfile +++ b/docker/binaries/vtbackup/Dockerfile @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -TEST WIP, this will fail the build - ARG VT_BASE_VER=latest ARG DEBIAN_VER=stable-slim diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile index 5b361f0cf76..77235b09c27 100644 --- a/docker/lite/Dockerfile +++ b/docker/lite/Dockerfile @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -TEST WIP, this will fail the build - FROM --platform=linux/amd64 golang:1.23.2-bullseye AS builder # Allows docker builds to set the BUILD_NUMBER diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80 index 639821bb211..5e885be3422 100644 --- a/docker/vttestserver/Dockerfile.mysql80 +++ b/docker/vttestserver/Dockerfile.mysql80 @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -TEST WIP, this will fail the build - FROM --platform=linux/amd64 golang:1.23.2-bullseye AS builder # Allows docker builds to set the BUILD_NUMBER From 1e950a0c3a3cdca9475e0d9ddd0598c5fdc1e7c2 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Tue, 15 Oct 2024 12:51:25 -0600 Subject: [PATCH 5/5] Make docs more clear Signed-off-by: Florent Poinsard --- docker/vttestserver/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/vttestserver/README.md b/docker/vttestserver/README.md index 1f1d071bb56..1567cf30340 100644 --- a/docker/vttestserver/README.md +++ b/docker/vttestserver/README.md @@ -8,6 +8,7 @@ there is a way of building it by hand. Here is how it goes: ```bash docker login +# we first checkout to the git tag of the release we want to build # we assume in this example that we are releasing v21.0.0-rc1, but replace this by any other tag git checkout v21.0.0-rc1