Flatten image layers and slightly reduce image size

Author: dctrwatson

.buildkite/hooks/pre-command

@@ -1,3 +1,4 @@
+# vim: set ft=bash:
 set -eu
 
 TODAY=$(date +"%Y%m%d")
@@ -18,3 +19,5 @@ echo "Short SHA = \"${CONTAINER_SHORT_SHA}\""
 export CONTAINER_BRANCH_NAME=$(echo "$BUILDKITE_BRANCH" | sed -e 's/[\/:]/_/g')
 [ -n "$CONTAINER_BRANCH_NAME" ]
 echo "Safe branch name = \"${CONTAINER_BRANCH_NAME}\""
+
+mkdir -p dist/

.buildkite/pipeline.yml

@@ -1,10 +1,11 @@
+agents:
+  queue: private
+
 env:
   BUILDKIT_INLINE_CACHE: 1
   BUILDKIT_PROGRESS: plain
   COMPOSE_DOCKER_CLI_BUILD: 1
   DOCKER_BUILDKIT: 1
-
-env:
   IMAGE_NAME: "mysql-server"
   REGISTRY: "997601596833.dkr.ecr.us-east-1.amazonaws.com"
   MAIN_BRANCH: "8.0"
@@ -16,7 +17,7 @@ steps:
     artifact_paths:
       - "dist/*.tar.gz"
     plugins:
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: builder
 
   - wait
@@ -30,7 +31,7 @@ steps:
           login: true
       - artifacts#v1.5.0:
           download: "dist/mysql-*.tar.gz"
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: release
           push:
             - "release:${REGISTRY}/branch/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}-${CONTAINER_BRANCH_NAME}"
@@ -44,7 +45,7 @@ steps:
           login: true
       - artifacts#v1.5.0:
           download: "dist/mysql-*.tar.gz"
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: release
           push:
             - "release:${REGISTRY}/main/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}"

.gitignore

@@ -18,3 +18,5 @@ source_downloads
 
 # Configuration files for Visual Studio Code
 .vscode/
+
+dist/

Dockerfile.release

@@ -1,14 +1,38 @@
+# syntax = docker/dockerfile:1.2
+
+# Since we can't strip-components with ADD, we'll need to manually extract it
+FROM debian:bullseye-slim as mysql-dist
+ARG MYSQL_VERSION=mysql-8.0.28-linux-x86_64
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && \
+    apt-get install -y \
+      binutils
+
+COPY ${MYSQL_VERSION}.tar.gz /dist/
+
+RUN mkdir /dist/usr && \
+    tar -xzvf /dist/${MYSQL_VERSION}.tar.gz -C /dist/usr --strip-components=1 && \
+    rm -rf /dist/usr/mysql-test && \
+    strip /dist/usr/bin/mysql* || true
+
 FROM debian:bullseye-slim
 
-RUN apt-get update && apt-get upgrade -y
+RUN adduser --disabled-password --no-create-home --gecos '' vitess --uid 999 && \
+    mkdir /var/run/mysqld && \
+    chown vitess.vitess /var/run/mysqld
+
+# Do this before apt-get layer so that's never cached
+COPY --from=mysql-dist --chown=root:root /dist/usr /usr/
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get install -y \
+RUN apt-get update && apt-get upgrade -y && \
+    apt-get install -y --no-install-recommends \
       libaio1 \
       libnuma1 \
       libtcmalloc-minimal4 \
-      binutils \
       bzip2 \
       ca-certificates \
       dirmngr \
@@ -25,19 +49,7 @@ RUN apt-get install -y \
       sysstat \
       wget \
       curl \
-      percona-toolkit
-
-ADD dist/ /dist
-
-RUN tar -xzvf /dist/mysql-8.0.28-linux-x86_64.tar.gz -C /usr --strip-components=1
-RUN strip /usr/bin/mysql* || true
-RUN cd /usr ; chown root.root $(tar tzf /dist/mysql-8.0.28-linux-x86_64.tar.gz | cut -d/ -f2-)
-RUN rm -rf /dist/*.tar.gz
-RUN apt-get remove -y binutils && apt-get autoremove -y
-RUN rm -rf /usr/mysql-test
-
-RUN adduser --disabled-password --no-create-home --gecos '' vitess --uid 999
-RUN mkdir /var/run/mysqld
-RUN chown vitess.vitess /var/run/mysqld
+      percona-toolkit \
+    && rm -rf /var/lib/apt/lists/*
 
 USER vitess

docker-compose.yml

@@ -10,7 +10,7 @@ services:
 
   release:
     build:
-      context: ./
-      dockerfile: Dockerfile.release
+      context: ./dist
+      dockerfile: ../Dockerfile.release
     environment:
       - BUILDKITE_BRANCH=${BUILDKITE_BRANCH}