Allow building for multiple distro images

We want to be able to run against our build in vitess-private as the
MySQL version but we don't run always Debian Bullseye there, a lot is
Ubuntu 20.04 right now.

This sets up a matrix so we can build with multiple Docker bases and
then release tarballs for each version to install in vitess-private CI.

Author: dbussink

.buildkite/pipeline.yml

@@ -19,6 +19,11 @@ steps:
     plugins:
       - docker-compose#v3.10.0:
           run: builder
+    env:
+      DISTRO: "{{matrix}}"
+    matrix:
+      - "debian:bullseye-slim"
+      - "ubuntu:focal"
 
   - wait
 

Dockerfile.build

@@ -1,8 +1,10 @@
-FROM debian:bullseye-slim
+ARG BASE_IMAGE=debian:bullseye-slim
+FROM $BASE_IMAGE
 
 RUN apt-get update && apt-get upgrade -y
 
 ENV DEBIAN_FRONTEND noninteractive
+ENV DISTRO $BASE_IMAGE
 
 ADD --chown=1234 . /src
 WORKDIR /src

Dockerfile.release

@@ -10,10 +10,10 @@ RUN apt-get update && \
     apt-get install -y \
       binutils
 
-COPY mysql-${MYSQL_VERSION}-linux-x86_64.tar.gz /dist/
+COPY mysql-${MYSQL_VERSION}-bullseye-linux-x86_64.tar.gz /dist/
 
 RUN mkdir /dist/usr && \
-    tar -xzvf /dist/mysql-${MYSQL_VERSION}-linux-x86_64.tar.gz -C /dist/usr --strip-components=1
+    tar -xzvf /dist/mysql-${MYSQL_VERSION}-bullseye-linux-x86_64.tar.gz -C /dist/usr --strip-components=1
 
 FROM debian:bullseye-slim
 

build.sh

@@ -50,3 +50,8 @@ make -j $(nproc)
 DISABLE_IPV6_TESTS=1 DISABLE_TMPFILE_TESTS=1 make test ARGS="-j $(nproc) -E ^routertest -VV"
 
 make -j $(nproc) package
+
+distro="$(lsb_release -c -s)"
+source ../MYSQL_VERSION
+
+mv "mysql-${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}-linux-$(uname -m).tar.gz" "mysql-${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}-${distro}-linux-$(uname -m).tar.gz"

docker-compose.yml

@@ -5,6 +5,8 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile.build
+      args:
+        - BASE_IMAGE=${DISTRO}
     volumes:
       - "./dist:/dist"