Auto-detect VT_MYSQL_ROOT, remove cruft

.github/workflows/cluster_endtoend.yml

@@ -32,7 +32,7 @@ jobs:
 
  - name: Build
  run: |
- GOBIN=$PWD/bin make build
+ VTROOT=$PWD VTTOP=$PWD make build
 
  - name: cluster_endtoend
  run: |

.github/workflows/e2e_race.yml

@@ -32,7 +32,7 @@ jobs:
 
  - name: Build
  run: |
- GOBIN=$PWD/bin make build
+ VTROOT=$PWD VTTOP=$PWD make build
 
  - name: e2e_race
  run: |

.github/workflows/endtoend.yml

@@ -32,7 +32,7 @@ jobs:
 
  - name: Build
  run: |
- GOBIN=$PWD/bin make build
+ VTROOT=$PWD VTTOP=$PWD make build
 
  - name: endtoend
  run: |

.github/workflows/local_example.yml

@@ -32,7 +32,7 @@ jobs:
 
  - name: Build
  run: |
- GOBIN=$PWD/bin make build
+ VTROOT=$PWD VTTOP=$PWD make build
 
  - name: local_example
  run: |

.github/workflows/unit.yml

@@ -30,7 +30,7 @@ jobs:
 
  - name: Build
  run: |
- GOBIN=$PWD/bin make build
+ VTROOT=$PWD VTTOP=$PWD make build
 
  - name: unit
  run: |

.github/workflows/unit_race.yml

@@ -10,7 +10,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v1
  with:
- go-version: 1.13
+ go-version: 1.12
 
  - name: Check out code
  uses: actions/checkout@v1
@@ -26,13 +26,11 @@ jobs:
 
  - name: Run bootstrap.sh
  run: |
- echo "Copying new bootstrap over location of legacy one."
- cp .github/bootstrap.sh .
- ./bootstrap.sh
+ VTTOP=$PWD VTROOT=$PWD BUILD_PYTHON=0 ./bootstrap.sh
 
  - name: Build
  run: |
- GOBIN=$PWD/bin make build
+ VTROOT=$PWD VTTOP=$PWD make build
 
  - name: unit_race
  run: |

Makefile

@@ -14,6 +14,12 @@
 
 MAKEFLAGS = -s
 
+# Soon this can be $PWD/bin, with no dependencies
+# Waiting on https://github.com/vitessio/vitess/issues/5378
+
+export GOBIN=$(VTROOT)/bin
+export GO111MODULE=on
+
 # Disabled parallel processing of target prerequisites to avoid that integration tests are racing each other (e.g. for ports) and may fail.
 # Since we are not using this Makefile for compilation, limiting parallelism will not increase build time.
 .NOTPARALLEL:
@@ -33,14 +39,6 @@ ifdef VT_EXTRA_BUILD_FLAGS
 export EXTRA_BUILD_FLAGS := $(VT_EXTRA_BUILD_FLAGS)
 endif
 
-# Link against the MySQL library in $VT_MYSQL_ROOT if it's specified.
-ifdef VT_MYSQL_ROOT
-# Clutter the env var only if it's a non-standard path.
- ifneq ($(VT_MYSQL_ROOT),/usr)
- CGO_LDFLAGS += -L$(VT_MYSQL_ROOT)/lib
- endif
-endif
-
 build_web:
  echo $$(date): Building web artifacts
  cd web/vtctld2 && ng build -prod
@@ -249,9 +247,6 @@ docker_lite_alpine:
 docker_guestbook:
  cd examples/kubernetes/guestbook && ./build.sh
 
-docker_publish_site:
- docker build -f docker/publish-site/Dockerfile -t vitess/publish-site .
-
 # This rule loads the working copy of the code into a bootstrap image,
 # and then runs the tests inside Docker.
 # Example: $ make docker_test flavor=mariadb

build.env

@@ -28,14 +28,5 @@ if ! source "${dir}/tools/shell_functions.inc"; then
  return 1
 fi
 
-VTTOP=$(pwd)
-export VTTOP
-VTROOT="${VTROOT:-${VTTOP/\/src\/vitess.io\/vitess/}}"
-export VTROOT
-# VTTOP sanity check
-if [[ "$VTTOP" == "${VTTOP/\/src\/vitess.io\/vitess/}" ]]; then
- echo "WARNING: VTTOP($VTTOP) does not contain src/vitess.io/vitess"
-fi
-
-export GOBIN="$VTROOT/bin"
-export GO111MODULE=on
+export VTTOP=$(pwd)
+export VTROOT="${VTROOT:-${VTTOP/\/src\/vitess.io\/vitess/}}"

dev.env

@@ -22,9 +22,6 @@
 
 source ./build.env
 
-export GOTOP=$VTTOP/go
-export PYTOP=$VTTOP/py
-
 export VTDATAROOT="${VTDATAROOT:-${VTROOT}/vtdataroot}"
 mkdir -p "$VTDATAROOT"
 
@@ -62,28 +59,8 @@ PATH=$(prepend_path "$PATH" "$VTROOT/dist/chromedriver")
 PATH=$(prepend_path "$PATH" "$VTROOT/dist/node/bin")
 export PATH
 
-# mysql install location. Please set based on your environment.
-# Build will not work if this is incorrect.
-
-if [[ "$VT_MYSQL_ROOT" == "" ]]; then
- if [[ "$(which mysql)" == "" ]]; then
- echo "WARNING: VT_MYSQL_ROOT unset because mysql not found. Did you install a client package?"
- else
- VT_MYSQL_ROOT=$(dirname "$(dirname "$(which mysql)")")
- export VT_MYSQL_ROOT
- fi
-fi
-
-PKG_CONFIG_PATH=$(prepend_path "$PKG_CONFIG_PATH" "$VTROOT/lib")
-export PKG_CONFIG_PATH
-
 # According to https://github.com/etcd-io/etcd/blob/a621d807f061e1dd635033a8d6bc261461429e27/Documentation/op-guide/supported-platform.md,
 # currently, etcd is unstable on arm64, so ETCD_UNSUPPORTED_ARCH should be set.
 if [ "$(uname -m)" == aarch64 ]; then
  export ETCD_UNSUPPORTED_ARCH=arm64
 fi
-
-# Useful aliases. Remove if inconvenient.
-alias gt='cd $GOTOP'
-alias pt='cd $PYTOP'
-alias vt='cd $VTTOP'

docker/bootstrap/Dockerfile.common

@@ -14,7 +14,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
  libtool \
  make \
  openjdk-8-jdk \
- pkg-config \
  python-crypto \
  python-dev \
  python-mysqldb \
@@ -40,17 +39,11 @@ RUN mkdir -p /vt/dist && \
 # Set up Vitess environment (equivalent to '. dev.env')
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
-ENV PYTOP $VTTOP/py
 ENV VTDATAROOT $VTROOT/vtdataroot
 ENV VTPORTSTART 15000
 ENV PYTHONPATH $VTROOT/dist/grpc/usr/local/lib/python2.7/site-packages:$VTROOT/dist/py-mock-1.0.1/lib/python2.7/site-packages:$VTROOT/py-vtdb:$VTROOT/dist/selenium/lib/python2.7/site-packages
-ENV GOBIN $VTROOT/bin
 ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$VTROOT/dist/chromedriver:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
 ENV USER vitess
-ENV GO111MODULE on
 
 # Copy files needed for bootstrap
 COPY bootstrap.sh dev.env build.env go.mod go.sum /vt/src/vitess.io/vitess/

docker/bootstrap/Dockerfile.mariadb

@@ -22,6 +22,5 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keys.gnupg.net --r
 # Bootstrap Vitess
 WORKDIR /vt/src/vitess.io/vitess
 
-ENV MYSQL_FLAVOR MariaDB
 USER vitess
 RUN ./bootstrap.sh

docker/bootstrap/Dockerfile.mariadb103

@@ -11,6 +11,5 @@ RUN apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24
 # Bootstrap Vitess
 WORKDIR /vt/src/vitess.io/vitess
 
-ENV MYSQL_FLAVOR MariaDB103
 USER vitess
 RUN ./bootstrap.sh

docker/bootstrap/Dockerfile.mysql56

@@ -17,6 +17,5 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver pool.s
 # Bootstrap Vitess
 WORKDIR /vt/src/vitess.io/vitess
 
-ENV MYSQL_FLAVOR MySQL56
 USER vitess
 RUN ./bootstrap.sh

docker/bootstrap/Dockerfile.mysql57

@@ -18,7 +18,5 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Bootstrap Vitess
 WORKDIR /vt/src/vitess.io/vitess
 
-
-ENV MYSQL_FLAVOR MySQL56
 USER vitess
 RUN ./bootstrap.sh

docker/bootstrap/Dockerfile.mysql80

@@ -17,7 +17,5 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver ha.poo
 # Bootstrap Vitess
 WORKDIR /vt/src/vitess.io/vitess
 
-
-ENV MYSQL_FLAVOR MySQL80
 USER vitess
 RUN ./bootstrap.sh

docker/bootstrap/Dockerfile.percona

@@ -16,6 +16,5 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keys.gnupg.net --r
 # Bootstrap Vitess
 WORKDIR /vt/src/vitess.io/vitess
 
-ENV MYSQL_FLAVOR MySQL56
 USER vitess
 RUN ./bootstrap.sh

docker/bootstrap/Dockerfile.percona57

@@ -17,6 +17,5 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keys.gnupg.net --r
 # Bootstrap Vitess
 WORKDIR /vt/src/vitess.io/vitess
 
-ENV MYSQL_FLAVOR MySQL56
 USER vitess
 RUN ./bootstrap.sh

docker/bootstrap/Dockerfile.percona80

@@ -32,6 +32,5 @@ RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keys.gnupg.net --r
 # Bootstrap Vitess
 WORKDIR /vt/src/vitess.io/vitess
 
-ENV MYSQL_FLAVOR MySQL80
 USER vitess
 RUN ./bootstrap.sh

docker/lite/Dockerfile

@@ -64,14 +64,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
 ENV VTDATAROOT $VTROOT/vtdataroot
-ENV GOBIN $VTROOT/bin
-ENV GOPATH $VTROOT
 ENV PATH $VTROOT/bin:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV MYSQL_FLAVOR MySQL56
 
 # Copy binaries (placed by build.sh)
 COPY --from=staging /vt/ /vt/

docker/lite/Dockerfile.alpine

@@ -24,14 +24,8 @@ RUN echo '@edge http://nl.alpinelinux.org/alpine/edge/main' >> /etc/apk/reposito
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
 ENV VTDATAROOT $VTROOT/vtdataroot
-ENV GOBIN $VTROOT/bin
-ENV GOPATH $VTROOT
 ENV PATH $VTROOT/bin:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV MYSQL_FLAVOR MariaDB103
 
 # Create vitess user
 RUN addgroup -S vitess && adduser -S -G vitess vitess && mkdir -p /vt

docker/lite/Dockerfile.mariadb

@@ -35,14 +35,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
 ENV VTDATAROOT $VTROOT/vtdataroot
-ENV GOBIN $VTROOT/bin
-ENV GOPATH $VTROOT
 ENV PATH $VTROOT/bin:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV MYSQL_FLAVOR MariaDB
 
 # Copy binaries (placed by build.sh)
 COPY --from=staging /vt/ /vt/

docker/lite/Dockerfile.mariadb103

@@ -34,14 +34,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
 ENV VTDATAROOT $VTROOT/vtdataroot
-ENV GOBIN $VTROOT/bin
-ENV GOPATH $VTROOT
 ENV PATH $VTROOT/bin:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV MYSQL_FLAVOR MariaDB103
 
 # Copy binaries (placed by build.sh)
 COPY --from=staging /vt/ /vt/

docker/lite/Dockerfile.mysql56

@@ -38,14 +38,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
 ENV VTDATAROOT $VTROOT/vtdataroot
-ENV GOBIN $VTROOT/bin
-ENV GOPATH $VTROOT
 ENV PATH $VTROOT/bin:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV MYSQL_FLAVOR MySQL56
 
 # Copy binaries (placed by build.sh)
 COPY --from=staging /vt/ /vt/

docker/lite/Dockerfile.mysql57

@@ -38,14 +38,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
 ENV VTDATAROOT $VTROOT/vtdataroot
-ENV GOBIN $VTROOT/bin
-ENV GOPATH $VTROOT
 ENV PATH $VTROOT/bin:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV MYSQL_FLAVOR MySQL56
 
 # Copy binaries (placed by build.sh)
 COPY --from=staging /vt/ /vt/

docker/lite/Dockerfile.mysql80

@@ -38,14 +38,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
 ENV VTDATAROOT $VTROOT/vtdataroot
-ENV GOBIN $VTROOT/bin
-ENV GOPATH $VTROOT
 ENV PATH $VTROOT/bin:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV MYSQL_FLAVOR MySQL56
 
 # Copy binaries (placed by build.sh)
 COPY --from=staging /vt/ /vt/

docker/lite/Dockerfile.percona

@@ -40,14 +40,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTTOP /vt/src/vitess.io/vitess
 ENV VTROOT /vt
-ENV GOTOP $VTTOP/go
 ENV VTDATAROOT $VTROOT/vtdataroot
-ENV GOBIN $VTROOT/bin
-ENV GOPATH $VTROOT
 ENV PATH $VTROOT/bin:$PATH
-ENV VT_MYSQL_ROOT /usr
-ENV PKG_CONFIG_PATH $VTROOT/lib
-ENV MYSQL_FLAVOR MySQL56
 
 # Copy binaries (placed by build.sh)
 COPY --from=staging /vt/ /vt/