Use from k8s in the vtexplain image and fix Makefile

Signed-off-by: Florent Poinsard <[email protected]>

Makefile

@@ -139,7 +139,7 @@ endif
 install: build
 	# binaries
 	mkdir -p "$${PREFIX}/bin"
-	cp "$${VTROOTBIN}/"{mysqlctl,mysqlctld,vtorc,vtadmin,vtctld,vtctlclient,vtctldclient,vtgate,vttablet,vtbackup} "$${PREFIX}/bin/"
+	cp "$${VTROOTBIN}/"{mysqlctl,mysqlctld,vtorc,vtadmin,vtctld,vtctlclient,vtctldclient,vtgate,vttablet,vtbackup,vtexplain} "$${PREFIX}/bin/"
 
 # Will only work inside the docker bootstrap for now
 cross-install: cross-build

docker/k8s/Dockerfile

@@ -44,6 +44,7 @@ COPY --from=lite /vt/bin/vttablet /vt/bin/
 COPY --from=lite /vt/bin/vtbackup /vt/bin/
 COPY --from=lite /vt/bin/vtadmin /vt/bin/
 COPY --from=lite /vt/bin/vtorc /vt/bin/
+COPY --from=lite /vt/bin/vtexplain /vt/bin/
 
 # copy web admin files
 COPY --from=lite $VTROOT/web /vt/web/

docker/k8s/vtexplain/Dockerfile

@@ -15,7 +15,7 @@
 ARG VT_BASE_VER=latest
 ARG DEBIAN_VER=stable-slim
 
-FROM vitess/lite:${VT_BASE_VER} AS lite
+FROM vitess/k8s:${VT_BASE_VER} AS k8s
 
 FROM debian:${DEBIAN_VER}
 
@@ -26,7 +26,7 @@ ENV VTROOT /vt
 RUN mkdir -p /vt/bin && mkdir -p /vtdataroot
 
 # Copy binaries
-COPY --from=lite /vt/bin/vtexplain /vt/bin/
+COPY --from=k8s /vt/bin/vtexplain /vt/bin/
 
 # add vitess user/group and add permissions
 RUN groupadd -r --gid 2000 vitess && \