Skip to content

Commit

Permalink
revert bootstrap version update
Browse files Browse the repository at this point in the history
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
  • Loading branch information
maksimov committed Nov 30, 2023
1 parent dd4b11a commit bdec4d1
Show file tree
Hide file tree
Showing 27 changed files with 29 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
# This rule builds the bootstrap images for all flavors.
DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql56 mysql57 mysql80 percona percona57 percona80
DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
BOOTSTRAP_VERSION=3.2
BOOTSTRAP_VERSION=3.1
ensure_bootstrap_version:
find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go
Expand Down
5 changes: 3 additions & 2 deletions docker/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
# TODO(mberlin): Remove the symlink and this note once
# https://github.com/docker/hub-feedback/issues/292 is fixed.

ARG bootstrap_version=3.2
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
uses: actions/setup-go@v2
with:
go-version: '1.17.12'ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}"

Expand Down
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.mariadb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mariadb"

FROM "${image}"
Expand Down
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.mariadb103
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"

FROM "${image}"
Expand Down
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.mysql56
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql56"

FROM "${image}"
Expand Down
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.mysql80
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}"
Expand Down
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.percona
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-percona"

FROM "${image}"
Expand Down
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.percona57
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-percona57"

FROM "${image}"
Expand Down
2 changes: 1 addition & 1 deletion docker/base/Dockerfile.percona80
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-percona80"

FROM "${image}"
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.mariadb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mariadb"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.mariadb103
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.mysql56
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql56"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.mysql57
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.mysql80
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.percona
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-percona"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.percona57
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-percona57"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.percona80
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-percona80"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.testing
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.ubi7.mysql57
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.ubi7.mysql80
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.ubi7.percona57
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-percona57"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/lite/Dockerfile.ubi7.percona80
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-percona80"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/local/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-common"

FROM "${image}"
Expand Down
2 changes: 1 addition & 1 deletion docker/vttestserver/Dockerfile.mysql57
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion docker/vttestserver/Dockerfile.mysql80
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ensure images contain the right binaries.

# Use a temporary layer for the build stage.
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder
Expand Down
2 changes: 1 addition & 1 deletion test/templates/dockerfile.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG bootstrap_version=3.2
ARG bootstrap_version=3.1
ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}"

FROM "${image}"
Expand Down

0 comments on commit bdec4d1

Please sign in to comment.