Refactor vitess/lite Dockerfiles. (#5592)

Signed-off-by: Anthony Yeh <[email protected]>

Makefile

@@ -22,7 +22,7 @@ export GODEBUG=tls13=0
 # Since we are not using this Makefile for compilation, limiting parallelism will not increase build time.
 .NOTPARALLEL:
 
-.PHONY: all build build_web test clean unit_test unit_test_cover unit_test_race integration_test proto proto_banner site_test site_integration_test docker_bootstrap docker_test docker_unit_test java_test reshard_tests e2e_test e2e_test_race minimaltools tools
+.PHONY: all build build_web install test clean unit_test unit_test_cover unit_test_race integration_test proto proto_banner site_test site_integration_test docker_bootstrap docker_test docker_unit_test java_test reshard_tests e2e_test e2e_test_race minimaltools tools
 
 all: build
 
@@ -49,6 +49,20 @@ endif
 	bash ./build.env
 	go install $(EXTRA_BUILD_FLAGS) $(VT_GO_PARALLEL) -ldflags "$(shell tools/build_version_flags.sh)" ./go/...
 
+# install copies the files needed to run Vitess into the given directory tree.
+# Usage: make install PREFIX=/path/to/install/root
+install: build
+	# binaries
+	mkdir -p "$${PREFIX}/bin"
+	cp "$${VTROOT}/bin/"{mysqlctld,vtctld,vtctlclient,vtgate,vttablet,vtworker,vtbackup} "$${PREFIX}/bin/"
+	# config files
+	cp -R config "$${PREFIX}/"
+	# vtctld web UI files
+	mkdir -p "$${PREFIX}/src/vitess.io/vitess/web"
+	cp -R web/vtctld "$${PREFIX}/src/vitess.io/vitess/web/"
+	mkdir -p "$${PREFIX}/src/vitess.io/vitess/web/vtctld2"
+	cp -R web/vtctld2/app "$${PREFIX}/src/vitess.io/vitess/web/vtctld2/"
+
 parser:
 	make -C go/vt/sqlparser
 
@@ -199,38 +213,45 @@ docker_base_percona80:
 	chmod -R o=g *
 	docker build -f docker/base/Dockerfile.percona80 -t vitess/base:percona80 .
 
-# Run "make docker_lite PROMPT_NOTICE=false" to avoid that the script
-# prompts you to press ENTER and confirm that the vitess/base image is not
-# rebuild by this target as well.
 docker_lite:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE)
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile -t vitess/lite .
 
 docker_lite_mysql56:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) mysql56
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.mysql56 -t vitess/lite:mysql56 .
 
 docker_lite_mysql57:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) mysql57
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.mysql57 -t vitess/lite:mysql57 .
 
 docker_lite_mysql80:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) mysql80
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.mysql80 -t vitess/lite:mysql80 .
 
 docker_lite_mariadb:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) mariadb
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.mariadb -t vitess/lite:mariadb .
 
 docker_lite_mariadb103:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) mariadb103
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.mariadb103 -t vitess/lite:mariadb103 .
 
 docker_lite_percona:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) percona
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.percona -t vitess/lite:percona .
 
 docker_lite_percona57:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) percona57
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.percona57 -t vitess/lite:percona57 .
 
 docker_lite_percona80:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) percona80
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.percona80 -t vitess/lite:percona80 .
 
 docker_lite_alpine:
-	cd docker/lite && ./build.sh --prompt=$(PROMPT_NOTICE) alpine
+	chmod -R o=g *
+	docker build -f docker/lite/Dockerfile.alpine -t vitess/lite:alpine .
 
 docker_guestbook:
 	cd examples/kubernetes/guestbook && ./build.sh

docker/lite/Dockerfile

@@ -0,0 +1 @@
+Dockerfile.mysql57

docker/lite/Dockerfile.alpine

@@ -1,33 +1,54 @@
-# This image is only meant to be built from within the build.sh script.
-FROM vitess/base AS builder
-FROM alpine:3.8 AS staging
-
-RUN mkdir -p /vt/vtdataroot/ && mkdir -p /vt/bin && mkdir -p /vt/src/vitess.io/vitess/web/vtctld2
-
-COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld /vt/src/vitess.io/vitess/web/vtctld
-COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld2/app /vt/src/vitess.io/vitess/web/vtctld2/app
-COPY --from=builder /vt/src/vitess.io/vitess/config /vt/config
-COPY --from=builder /vt/bin/mysqlctld /vt/bin/
-COPY --from=builder /vt/bin/vtctld /vt/bin/
-COPY --from=builder /vt/bin/vtctlclient /vt/bin/
-COPY --from=builder /vt/bin/vtgate /vt/bin/
-COPY --from=builder /vt/bin/vttablet /vt/bin/
-COPY --from=builder /vt/bin/vtworker /vt/bin/
-COPY --from=builder /vt/bin/vtbackup /vt/bin/
+# Copyright 2019 The Vitess Authors.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
+# NOTE: We have to build the Vitess binaries from scratch instead of sharing
+#       a base image because Docker Hub dropped the feature we relied upon to
+#       ensure images contain the right binaries.
+
+# Use a temporary layer for the build stage.
+FROM vitess/bootstrap:mariadb103 AS builder
+
+# Allows some docker builds to disable CGO
+ARG CGO_ENABLED=0
+
+# Re-copy sources from working tree.
+COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
+
+# Build and install Vitess in a temporary output directory.
+USER vitess
+RUN make install PREFIX=/vt/install
+
+# Start over and build the final image.
 FROM alpine:3.8 
 
 # Install dependencies
 RUN echo '@edge http://nl.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories && \
     apk add --no-cache mariadb@edge mariadb-client@edge bzip2 bash
 
+# Set up Vitess user and directory tree.
+RUN addgroup -S vitess && adduser -S -G vitess vitess
+RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt
+
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTROOT /vt/src/vitess.io/vitess
 ENV VTDATAROOT /vt/vtdataroot
 ENV PATH $VTROOT/bin:$PATH
 ENV MYSQL_FLAVOR MariaDB103
 
-# Create vitess user
-RUN addgroup -S vitess && adduser -S -G vitess vitess && mkdir -p /vt
-COPY --from=staging /vt/ /vt/
+# Copy artifacts from builder layer.
+COPY --from=builder --chown=vitess:vitess /vt/install /vt
+
+# Create mount point for actual data (e.g. MySQL data dir)
+VOLUME /vt/vtdataroot
 USER vitess

docker/lite/Dockerfile.mariadb

@@ -1,45 +1,53 @@
-FROM vitess/base AS builder
-FROM debian:stretch-slim AS staging
-
-RUN mkdir -p /vt/vtdataroot/ \
-    && mkdir -p /vt/bin \
-    && mkdir -p /vt/src/vitess.io/vitess/web/vtctld2 \
-    && groupadd -r vitess && useradd -r -g vitess vitess
-
-COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld /vt/src/vitess.io/vitess/web/vtctld
-COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld2/app /vt/src/vitess.io/vitess/web/vtctld2/app
-COPY --from=builder /vt/src/vitess.io/vitess/config /vt/config
-COPY --from=builder /vt/bin/mysqlctld /vt/bin/
-COPY --from=builder /vt/bin/vtctld /vt/bin/
-COPY --from=builder /vt/bin/vtctlclient /vt/bin/
-COPY --from=builder /vt/bin/vtgate /vt/bin/
-COPY --from=builder /vt/bin/vttablet /vt/bin/
-COPY --from=builder /vt/bin/vtworker /vt/bin/
-COPY --from=builder /vt/bin/vtbackup /vt/bin/
-
-RUN chown -R vitess:vitess /vt
+# Copyright 2019 The Vitess Authors.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE: We have to build the Vitess binaries from scratch instead of sharing
+#       a base image because Docker Hub dropped the feature we relied upon to
+#       ensure images contain the right binaries.
+
+# Use a temporary layer for the build stage.
+FROM vitess/bootstrap:mariadb AS builder
+
+# Allows some docker builds to disable CGO
+ARG CGO_ENABLED=0
+
+# Re-copy sources from working tree.
+COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
+
+# Build and install Vitess in a temporary output directory.
+USER vitess
+RUN make install PREFIX=/vt/install
 
+# Start over and build the final image.
 FROM debian:stretch-slim
 
 # Install dependencies
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates \
- && for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 && break; done \
- && echo 'deb http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.2/debian stretch main' > /etc/apt/sources.list.d/mariadb.list \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-      bzip2 \
-      mariadb-server \
- && rm -rf /var/lib/apt/lists/* \
- && groupadd -r vitess && useradd -r -g vitess vitess
+COPY docker/lite/install_dependencies.sh /vt/dist/install_dependencies.sh
+RUN /vt/dist/install_dependencies.sh mariadb
+
+# Set up Vitess user and directory tree.
+RUN groupadd -r vitess && useradd -r -g vitess vitess
+RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt
 
 # Set up Vitess environment (just enough to run pre-built Go binaries)
 ENV VTROOT /vt/src/vitess.io/vitess
 ENV VTDATAROOT /vt/vtdataroot
 ENV PATH $VTROOT/bin:$PATH
 ENV MYSQL_FLAVOR MariaDB
 
-# Copy binaries (placed by build.sh)
-COPY --from=staging /vt/ /vt/
+# Copy artifacts from builder layer.
+COPY --from=builder --chown=vitess:vitess /vt/install /vt
 
 # Create mount point for actual data (e.g. MySQL data dir)
 VOLUME /vt/vtdataroot