From 29d5dc2ef328b7aea1f897590d85bbe161952fb0 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 19 Oct 2023 13:07:41 -0600 Subject: [PATCH 1/2] Add vtexplain and vtbackup to base docker build Signed-off-by: Florent Poinsard --- .github/workflows/docker_build_base.yml | 38 ++++++++++++++----------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docker_build_base.yml b/.github/workflows/docker_build_base.yml index af459215099..1d7590bdc7b 100644 --- a/.github/workflows/docker_build_base.yml +++ b/.github/workflows/docker_build_base.yml @@ -15,8 +15,9 @@ permissions: read-all jobs: build_and_push_base: name: Build and push vitess/base Docker images - runs-on: gh-hosted-runners-16cores-1 - if: github.repository == 'vitessio/vitess' + runs-on: ubuntu-latest +# runs-on: gh-hosted-runners-16cores-1 +# if: github.repository == 'vitessio/vitess' strategy: fail-fast: true @@ -48,7 +49,7 @@ jobs: context: . file: ${{ env.DOCKERFILE }} push: true - tags: vitess/base:${{ matrix.branch }} + tags: frouioui/base:${{ matrix.branch }} ###### # All code below only applies to new tags @@ -62,7 +63,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') && matrix.branch == 'latest' run: | if [[ "${{ matrix.branch }}" == "latest" ]]; then - echo "DOCKER_TAG=vitess/base:${TAG_NAME}" >> $GITHUB_ENV + echo "DOCKER_TAG=frouioui/base:${TAG_NAME}" >> $GITHUB_ENV fi - name: Build and push on tags @@ -77,8 +78,9 @@ jobs: build_and_push_k8s: needs: build_and_push_base name: Build and push vitess/k8s image - runs-on: gh-hosted-runners-16cores-1 - if: github.repository == 'vitessio/vitess' + runs-on: ubuntu-latest +# runs-on: gh-hosted-runners-16cores-1 +# if: github.repository == 'vitessio/vitess' strategy: fail-fast: true @@ -105,7 +107,7 @@ jobs: with: context: ${{ env.DOCKER_CTX }} push: true - tags: vitess/k8s:latest + tags: frouioui/k8s:latest build-args: | VT_BASE_VER=latest DEBIAN_VER=${{ matrix.debian }}-slim @@ -116,7 +118,7 @@ jobs: with: context: ${{ env.DOCKER_CTX }} push: true - tags: vitess/k8s:latest-${{ matrix.debian }} + tags: frouioui/k8s:latest-${{ matrix.debian }} build-args: | VT_BASE_VER=latest DEBIAN_VER=${{ matrix.debian }}-slim @@ -138,8 +140,8 @@ jobs: - name: Set Docker tag name if: startsWith(github.ref, 'refs/tags/') run: | - echo "DOCKER_TAG_DEFAULT_DEBIAN=vitess/k8s:${TAG_NAME}" >> $GITHUB_ENV - echo "DOCKER_TAG=vitess/k8s:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV + echo "DOCKER_TAG_DEFAULT_DEBIAN=frouioui/k8s:${TAG_NAME}" >> $GITHUB_ENV + echo "DOCKER_TAG=frouioui/k8s:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV # Build and Push component image to DOCKER_TAG, applies to both debian version - name: Build and push on tags using Debian extension @@ -170,14 +172,16 @@ jobs: build_and_push_components: needs: build_and_push_k8s name: Build and push vitess components Docker images - runs-on: gh-hosted-runners-16cores-1 - if: github.repository == 'vitessio/vitess' + runs-on: ubuntu-latest +# runs-on: gh-hosted-runners-16cores-1 +# if: github.repository == 'vitessio/vitess' strategy: fail-fast: true matrix: debian: [ bullseye, bookworm ] - component: [ vtadmin, vtorc, vtgate, vttablet, mysqlctld, mysqlctl, vtctl, vtctlclient, vtctld, logrotate, logtail ] + component: [ vtbackup, vtexplain ] +# component: [ vtadmin, vtorc, vtgate, vttablet, mysqlctld, mysqlctl, vtctl, vtctlclient, vtctld, logrotate, logtail, vtbackup, vtexplain ] steps: - name: Check out code @@ -199,7 +203,7 @@ jobs: with: context: ${{ env.DOCKER_CTX }} push: true - tags: vitess/${{ matrix.component }}:latest + tags: frouioui/${{ matrix.component }}:latest build-args: | VT_BASE_VER=latest DEBIAN_VER=${{ matrix.debian }}-slim @@ -210,7 +214,7 @@ jobs: with: context: ${{ env.DOCKER_CTX }} push: true - tags: vitess/${{ matrix.component }}:latest-${{ matrix.debian }} + tags: frouioui/${{ matrix.component }}:latest-${{ matrix.debian }} build-args: | VT_BASE_VER=latest DEBIAN_VER=${{ matrix.debian }}-slim @@ -232,8 +236,8 @@ jobs: - name: Set Docker tag name if: startsWith(github.ref, 'refs/tags/') run: | - echo "DOCKER_TAG_DEFAULT_DEBIAN=vitess/${{ matrix.component }}:${TAG_NAME}" >> $GITHUB_ENV - echo "DOCKER_TAG=vitess/${{ matrix.component }}:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV + echo "DOCKER_TAG_DEFAULT_DEBIAN=frouioui/${{ matrix.component }}:${TAG_NAME}" >> $GITHUB_ENV + echo "DOCKER_TAG=frouioui/${{ matrix.component }}:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV # Build and Push component image to DOCKER_TAG, applies to both debian version - name: Build and push on tags using Debian extension From e95015b911efb477d1759d9a92df120258bb9c07 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 19 Oct 2023 13:33:15 -0600 Subject: [PATCH 2/2] remove testing code Signed-off-by: Florent Poinsard --- .github/workflows/docker_build_base.yml | 38 +++++++++++-------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docker_build_base.yml b/.github/workflows/docker_build_base.yml index 1d7590bdc7b..00848e2518e 100644 --- a/.github/workflows/docker_build_base.yml +++ b/.github/workflows/docker_build_base.yml @@ -15,9 +15,8 @@ permissions: read-all jobs: build_and_push_base: name: Build and push vitess/base Docker images - runs-on: ubuntu-latest -# runs-on: gh-hosted-runners-16cores-1 -# if: github.repository == 'vitessio/vitess' + runs-on: gh-hosted-runners-16cores-1 + if: github.repository == 'vitessio/vitess' strategy: fail-fast: true @@ -49,7 +48,7 @@ jobs: context: . file: ${{ env.DOCKERFILE }} push: true - tags: frouioui/base:${{ matrix.branch }} + tags: vitess/base:${{ matrix.branch }} ###### # All code below only applies to new tags @@ -63,7 +62,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') && matrix.branch == 'latest' run: | if [[ "${{ matrix.branch }}" == "latest" ]]; then - echo "DOCKER_TAG=frouioui/base:${TAG_NAME}" >> $GITHUB_ENV + echo "DOCKER_TAG=vitess/base:${TAG_NAME}" >> $GITHUB_ENV fi - name: Build and push on tags @@ -78,9 +77,8 @@ jobs: build_and_push_k8s: needs: build_and_push_base name: Build and push vitess/k8s image - runs-on: ubuntu-latest -# runs-on: gh-hosted-runners-16cores-1 -# if: github.repository == 'vitessio/vitess' + runs-on: gh-hosted-runners-16cores-1 + if: github.repository == 'vitessio/vitess' strategy: fail-fast: true @@ -107,7 +105,7 @@ jobs: with: context: ${{ env.DOCKER_CTX }} push: true - tags: frouioui/k8s:latest + tags: vitess/k8s:latest build-args: | VT_BASE_VER=latest DEBIAN_VER=${{ matrix.debian }}-slim @@ -118,7 +116,7 @@ jobs: with: context: ${{ env.DOCKER_CTX }} push: true - tags: frouioui/k8s:latest-${{ matrix.debian }} + tags: vitess/k8s:latest-${{ matrix.debian }} build-args: | VT_BASE_VER=latest DEBIAN_VER=${{ matrix.debian }}-slim @@ -140,8 +138,8 @@ jobs: - name: Set Docker tag name if: startsWith(github.ref, 'refs/tags/') run: | - echo "DOCKER_TAG_DEFAULT_DEBIAN=frouioui/k8s:${TAG_NAME}" >> $GITHUB_ENV - echo "DOCKER_TAG=frouioui/k8s:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV + echo "DOCKER_TAG_DEFAULT_DEBIAN=vitess/k8s:${TAG_NAME}" >> $GITHUB_ENV + echo "DOCKER_TAG=vitess/k8s:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV # Build and Push component image to DOCKER_TAG, applies to both debian version - name: Build and push on tags using Debian extension @@ -172,16 +170,14 @@ jobs: build_and_push_components: needs: build_and_push_k8s name: Build and push vitess components Docker images - runs-on: ubuntu-latest -# runs-on: gh-hosted-runners-16cores-1 -# if: github.repository == 'vitessio/vitess' + runs-on: gh-hosted-runners-16cores-1 + if: github.repository == 'vitessio/vitess' strategy: fail-fast: true matrix: debian: [ bullseye, bookworm ] - component: [ vtbackup, vtexplain ] -# component: [ vtadmin, vtorc, vtgate, vttablet, mysqlctld, mysqlctl, vtctl, vtctlclient, vtctld, logrotate, logtail, vtbackup, vtexplain ] + component: [ vtadmin, vtorc, vtgate, vttablet, mysqlctld, mysqlctl, vtctl, vtctlclient, vtctld, logrotate, logtail, vtbackup, vtexplain ] steps: - name: Check out code @@ -203,7 +199,7 @@ jobs: with: context: ${{ env.DOCKER_CTX }} push: true - tags: frouioui/${{ matrix.component }}:latest + tags: vitess/${{ matrix.component }}:latest build-args: | VT_BASE_VER=latest DEBIAN_VER=${{ matrix.debian }}-slim @@ -214,7 +210,7 @@ jobs: with: context: ${{ env.DOCKER_CTX }} push: true - tags: frouioui/${{ matrix.component }}:latest-${{ matrix.debian }} + tags: vitess/${{ matrix.component }}:latest-${{ matrix.debian }} build-args: | VT_BASE_VER=latest DEBIAN_VER=${{ matrix.debian }}-slim @@ -236,8 +232,8 @@ jobs: - name: Set Docker tag name if: startsWith(github.ref, 'refs/tags/') run: | - echo "DOCKER_TAG_DEFAULT_DEBIAN=frouioui/${{ matrix.component }}:${TAG_NAME}" >> $GITHUB_ENV - echo "DOCKER_TAG=frouioui/${{ matrix.component }}:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV + echo "DOCKER_TAG_DEFAULT_DEBIAN=vitess/${{ matrix.component }}:${TAG_NAME}" >> $GITHUB_ENV + echo "DOCKER_TAG=vitess/${{ matrix.component }}:${TAG_NAME}-${{ matrix.debian }}" >> $GITHUB_ENV # Build and Push component image to DOCKER_TAG, applies to both debian version - name: Build and push on tags using Debian extension