bk: update plugins and push images to both clouds (mysql#50)

Author: dctrwatson

.buildkite/pipeline.yml

@@ -2,68 +2,93 @@ agents:
   queue: private
 
 env:
-  BUILDKIT_INLINE_CACHE: 1
+  AWS_REGISTRY: 997601596833.dkr.ecr.us-east-1.amazonaws.com
+  GCP_REGISTRY: us-docker.pkg.dev/planetscale-registry
+  IMAGE_NAME: mysql-server
   BUILDKIT_PROGRESS: plain
-  COMPOSE_DOCKER_CLI_BUILD: 1
-  DOCKER_BUILDKIT: 1
-  IMAGE_NAME: "mysql-server"
-  REGISTRY: "997601596833.dkr.ecr.us-east-1.amazonaws.com"
 
 steps:
-  - name: "Build mysql-server"
-    key: "build"
+  - name: Build mysql-server
+    key: build
     label: ":docker: Build and package"
     command: bash build.sh
     artifact_paths:
-      - "dist/mysql-*.tar.gz"
+      - dist/mysql-*.tar.gz
     plugins:
-      - docker-compose#v3.10.0:
+      - docker-compose#v4.12.0:
+          cli-version: "2" # Use 'docker compose' and BuildKit
           run: builder
     env:
       DISTRO: "{{matrix}}"
     matrix:
-      - "debian:bullseye-slim"
-      - "ubuntu:focal"
-      - "ubuntu:jammy"
+      - debian:bullseye-slim
+      - ubuntu:focal
+      - ubuntu:jammy
 
-  - name: "Integration tests on debug build"
+  - name: Integration tests on debug build
     label: ":docker: Build a debug binary and run integration tests"
     command: bash integration-tests.sh
     agents:
       queue: whopper
     plugins:
-      - docker-compose#v3.10.0:
+      - docker-compose#v4.12.0:
+          cli-version: "2" # Use 'docker compose' and BuildKit
           run: builder
     env:
-      DISTRO: "debian:bullseye-slim"
+      DISTRO: debian:bullseye-slim
 
-  - name: "Build runtime mysql-server container for branch"
-    depends_on: "build"
+  - name: Build runtime mysql-server container for branch
+    depends_on: build
     label: ":docker: Build runtime branch container"
-    command: "/usr/sbin/mysqld -V"
+    command: /usr/sbin/mysqld -V
     branches: "!${MAIN_BRANCH}"
     plugins:
-      - ecr#v2.3.0:
+      - planetscale/vault-oidc-auth#v1.0.0:
+          vault_addr: https://vault.silversurfer.planetscale.net
+      - planetscale/vault-aws-creds#v1.0.0:
+          vault_addr: https://vault.silversurfer.planetscale.net
+      - planetscale/vault-gcp-creds#v1.0.0:
+          vault_addr: https://vault.silversurfer.planetscale.net
+      - ecr#v2.7.0:
           login: true
+      - docker-login#v2.1.0:
+          username: oauth2accesstoken
+          password-env: CLOUDSDK_AUTH_ACCESS_TOKEN
+          server: https://us-docker.pkg.dev
       - artifacts#v1.5.0:
-          download: "dist/mysql-*.tar.gz"
-      - docker-compose#v3.10.0:
+          download: dist/mysql-*.tar.gz
+      - docker-compose#v4.12.0:
+          cli-version: "2" # Use 'docker compose' and BuildKit
           run: release
           push:
-            - "release:${REGISTRY}/branch/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}-${CONTAINER_BRANCH_NAME}"
+            - release:${AWS_REGISTRY}/branch/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}-${CONTAINER_BRANCH_NAME}
+            - release:${GCP_REGISTRY}/dev/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}-${CONTAINER_BRANCH_NAME}
 
-  - name: "Build runtime mysql-server container for main"
-    depends_on: "build"
+  - name: Build runtime mysql-server container for main
+    depends_on: build
     label: ":docker: Build runtime main container"
-    command: "/usr/sbin/mysqld -V"
+    command: /usr/sbin/mysqld -V
     branches: "${MAIN_BRANCH}"
     plugins:
-      - ecr#v2.3.0:
+      - planetscale/vault-oidc-auth#v1.0.0:
+          vault_addr: https://vault.silversurfer.planetscale.net
+      - planetscale/vault-aws-creds#v1.0.0:
+          vault_addr: https://vault.silversurfer.planetscale.net
+      - planetscale/vault-gcp-creds#v1.0.0:
+          vault_addr: https://vault.silversurfer.planetscale.net
+      - ecr#v2.7.0:
           login: true
+      - docker-login#v2.1.0:
+          username: oauth2accesstoken
+          password-env: CLOUDSDK_AUTH_ACCESS_TOKEN
+          server: https://us-docker.pkg.dev
       - artifacts#v1.5.0:
-          download: "dist/mysql-*.tar.gz"
-      - docker-compose#v3.10.0:
+          download: dist/mysql-*.tar.gz
+      - docker-compose#v4.12.0:
+          cli-version: "2" # Use 'docker compose' and BuildKit
           run: release
           push:
-            - "release:${REGISTRY}/main/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}"
-            - "release:${REGISTRY}/main/${IMAGE_NAME}:${MAIN_BRANCH}-latest"
+            - release:${AWS_REGISTRY}/main/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}
+            - release:${GCP_REGISTRY}/prod/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}
+            - release:${AWS_REGISTRY}/main/${IMAGE_NAME}:${MAIN_BRANCH}-latest
+            - release:${GCP_REGISTRY}/prod/${IMAGE_NAME}:${MAIN_BRANCH}-latest

docker-compose.yml

@@ -6,9 +6,10 @@ services:
       context: ./
       dockerfile: Dockerfile.build
       args:
-        - BASE_IMAGE=${DISTRO}
+        BUILDKIT_INLINE_CACHE: 1
+        BASE_IMAGE: ${DISTRO}
     volumes:
-      - "./dist:/dist"
+      - ./dist:/dist
     environment:
       - TARBALL_VERSION=${TARBALL_VERSION}
 
@@ -17,4 +18,5 @@ services:
       context: ./dist
       dockerfile: ../Dockerfile.release
       args:
-        - TARBALL_VERSION=${TARBALL_VERSION:?}
+        BUILDKIT_INLINE_CACHE: 1
+        TARBALL_VERSION: ${TARBALL_VERSION:?}