From 5e3c9e578825b7f9469c9d02c760c9bef1772774 Mon Sep 17 00:00:00 2001
From: Jamil Bou Kheir <jamil@elbii.com>
Date: Wed, 21 Jul 2021 17:27:27 -0700
Subject: [PATCH 1/2] Test simplified build scripts

---
 .ci/build_amazonlinux_2.base.sh               | 13 ---
 .ci/build_amazonlinux_2.sh                    |  4 -
 .ci/build_base.sh                             | 29 +++++++
 .ci/build_centos_7.base.sh                    | 13 ---
 .ci/build_centos_7.sh                         |  4 -
 .ci/build_centos_8.base.sh                    | 13 ---
 .ci/build_centos_8.sh                         |  4 -
 .ci/build_debian_10.base.sh                   | 13 ---
 .ci/build_debian_10.sh                        |  4 -
 .ci/build_fedora_33.base.sh                   | 13 ---
 .ci/build_fedora_33.sh                        |  4 -
 .ci/build_fedora_34.base.sh                   | 13 ---
 .ci/build_fedora_34.sh                        |  4 -
 .ci/build_fedora_35.base.sh                   | 13 ---
 .ci/build_fedora_35.sh                        |  4 -
 .ci/build_packages.sh                         | 76 +++++++++++++++++
 .ci/build_ubuntu_18.04.base.sh                | 13 ---
 .ci/build_ubuntu_18.04.sh                     |  4 -
 .ci/build_ubuntu_20.04.base.sh                | 13 ---
 .ci/build_ubuntu_20.04.sh                     |  4 -
 .github/workflows/build_base_images.yml       | 24 +++---
 .github/workflows/ci.yml                      | 84 +++++--------------
 pkg/Dockerfile.deb                            | 29 +------
 pkg/Dockerfile.release                        | 27 ++++++
 pkg/Dockerfile.rpm                            | 30 +------
 .../{build_and_push_base_images.sh => ci.sh}  | 29 +++++--
 26 files changed, 189 insertions(+), 292 deletions(-)
 delete mode 100755 .ci/build_amazonlinux_2.base.sh
 delete mode 100755 .ci/build_amazonlinux_2.sh
 create mode 100755 .ci/build_base.sh
 delete mode 100755 .ci/build_centos_7.base.sh
 delete mode 100755 .ci/build_centos_7.sh
 delete mode 100755 .ci/build_centos_8.base.sh
 delete mode 100755 .ci/build_centos_8.sh
 delete mode 100755 .ci/build_debian_10.base.sh
 delete mode 100755 .ci/build_debian_10.sh
 delete mode 100755 .ci/build_fedora_33.base.sh
 delete mode 100755 .ci/build_fedora_33.sh
 delete mode 100755 .ci/build_fedora_34.base.sh
 delete mode 100755 .ci/build_fedora_34.sh
 delete mode 100755 .ci/build_fedora_35.base.sh
 delete mode 100755 .ci/build_fedora_35.sh
 create mode 100755 .ci/build_packages.sh
 delete mode 100755 .ci/build_ubuntu_18.04.base.sh
 delete mode 100755 .ci/build_ubuntu_18.04.sh
 delete mode 100755 .ci/build_ubuntu_20.04.base.sh
 delete mode 100755 .ci/build_ubuntu_20.04.sh
 create mode 100644 pkg/Dockerfile.release
 rename scripts/{build_and_push_base_images.sh => ci.sh} (58%)

diff --git a/.ci/build_amazonlinux_2.base.sh b/.ci/build_amazonlinux_2.base.sh
deleted file mode 100755
index 9f1369e68..000000000
--- a/.ci/build_amazonlinux_2.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform $platform \
-  --tag ghcr.io/firezone/amazonlinux:2 \
-  --build-arg BASE_IMAGE="amazonlinux:2" \
-  --progress plain \
-  -f pkg/Dockerfile.base.rpm \
-  .
diff --git a/.ci/build_amazonlinux_2.sh b/.ci/build_amazonlinux_2.sh
deleted file mode 100755
index df25decfa..000000000
--- a/.ci/build_amazonlinux_2.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_rpm.sh amazonlinux_2 ghcr.io/firezone/amazonlinux:2
diff --git a/.ci/build_base.sh b/.ci/build_base.sh
new file mode 100755
index 000000000..13da9b3d6
--- /dev/null
+++ b/.ci/build_base.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -e
+
+case $MATRIX_IMAGE in
+  amazonlinux*)
+    format="rpm"
+    ;;
+  centos*)
+    format="rpm"
+    ;;
+  fedora*)
+    format="rpm"
+    ;;
+  debian*)
+    format="deb"
+    ;;
+  ubuntu*)
+    format="deb"
+    ;;
+esac
+
+docker buildx build \
+  --push \
+  --platform linux/amd64 \
+  --tag ghcr.io/firezone/$MATRIX_IMAGE \
+  --build-arg BASE_IMAGE=$MATRIX_IMAGE \
+  --progress plain \
+  -f pkg/Dockerfile.base.$format \
+  .
diff --git a/.ci/build_centos_7.base.sh b/.ci/build_centos_7.base.sh
deleted file mode 100755
index 8ae7d0331..000000000
--- a/.ci/build_centos_7.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64,linux/arm/v7"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform $platform \
-  --tag ghcr.io/firezone/centos:7 \
-  --build-arg BASE_IMAGE="centos:7" \
-  --progress plain \
-  -f pkg/Dockerfile.base.rpm \
-  .
diff --git a/.ci/build_centos_7.sh b/.ci/build_centos_7.sh
deleted file mode 100755
index 775597816..000000000
--- a/.ci/build_centos_7.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_rpm.sh centos_7 ghcr.io/firezone/centos:7
diff --git a/.ci/build_centos_8.base.sh b/.ci/build_centos_8.base.sh
deleted file mode 100755
index 55b2c5a22..000000000
--- a/.ci/build_centos_8.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64,linux/arm/v7"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform linux/arm64,linux/amd64 \
-  --tag ghcr.io/firezone/centos:8 \
-  --build-arg BASE_IMAGE="centos:8" \
-  --progress plain \
-  -f pkg/Dockerfile.base.rpm \
-  .
diff --git a/.ci/build_centos_8.sh b/.ci/build_centos_8.sh
deleted file mode 100755
index bb4c27590..000000000
--- a/.ci/build_centos_8.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_rpm.sh centos_8 ghcr.io/firezone/centos:8
diff --git a/.ci/build_debian_10.base.sh b/.ci/build_debian_10.base.sh
deleted file mode 100755
index 9affa052a..000000000
--- a/.ci/build_debian_10.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64,linux/arm/v5,linux/arm/v7"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform $platform \
-  --tag ghcr.io/firezone/debian:10 \
-  --build-arg BASE_IMAGE="debian:10" \
-  --progress plain \
-  -f pkg/Dockerfile.base.deb \
-  .
diff --git a/.ci/build_debian_10.sh b/.ci/build_debian_10.sh
deleted file mode 100755
index 95faf1f94..000000000
--- a/.ci/build_debian_10.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_deb.sh debian_10 ghcr.io/firezone/debian:10
diff --git a/.ci/build_fedora_33.base.sh b/.ci/build_fedora_33.base.sh
deleted file mode 100755
index db5754a8b..000000000
--- a/.ci/build_fedora_33.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64,linux/arm/v7"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform $platform \
-  --tag ghcr.io/firezone/fedora:33 \
-  --build-arg BASE_IMAGE="fedora:33" \
-  --progress plain \
-  -f pkg/Dockerfile.base.rpm \
-  .
diff --git a/.ci/build_fedora_33.sh b/.ci/build_fedora_33.sh
deleted file mode 100755
index 1184366d3..000000000
--- a/.ci/build_fedora_33.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_rpm.sh fedora_33 ghcr.io/firezone/fedora:33
diff --git a/.ci/build_fedora_34.base.sh b/.ci/build_fedora_34.base.sh
deleted file mode 100755
index d6a541464..000000000
--- a/.ci/build_fedora_34.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64,linux/arm/v7"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform $platform \
-  --tag ghcr.io/firezone/fedora:34 \
-  --build-arg BASE_IMAGE="fedora:34" \
-  --progress plain \
-  -f pkg/Dockerfile.base.rpm \
-  .
diff --git a/.ci/build_fedora_34.sh b/.ci/build_fedora_34.sh
deleted file mode 100755
index a6bb56d93..000000000
--- a/.ci/build_fedora_34.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_rpm.sh fedora_34 ghcr.io/firezone/fedora:34
diff --git a/.ci/build_fedora_35.base.sh b/.ci/build_fedora_35.base.sh
deleted file mode 100755
index a4dde2565..000000000
--- a/.ci/build_fedora_35.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64,linux/arm/v7"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform $platform \
-  --tag ghcr.io/firezone/fedora:35 \
-  --build-arg BASE_IMAGE="fedora:35" \
-  --progress plain \
-  -f pkg/Dockerfile.base.rpm \
-  .
diff --git a/.ci/build_fedora_35.sh b/.ci/build_fedora_35.sh
deleted file mode 100755
index 6b6d856f4..000000000
--- a/.ci/build_fedora_35.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_rpm.sh fedora_35 ghcr.io/firezone/fedora:35
diff --git a/.ci/build_packages.sh b/.ci/build_packages.sh
new file mode 100755
index 000000000..26e040a68
--- /dev/null
+++ b/.ci/build_packages.sh
@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+set -e
+
+base_image="ghcr.io/firezone/${MATRIX_IMAGE}"
+tag=release-${MATRIX_IMAGE}
+
+case $MATRIX_IMAGE in
+  amazonlinux*)
+    format="rpm"
+    ;;
+  centos*)
+    format="rpm"
+    ;;
+  fedora*)
+    format="rpm"
+    ;;
+  debian*)
+    format="deb"
+    ;;
+  ubuntu*)
+    format="deb"
+    ;;
+esac
+
+
+# Build intermediate release image
+docker buildx build \
+  -f pkg/Dockerfile.release \
+  -t $tag \
+  --platform linux/amd64 \
+  --build-arg BASE_IMAGE=$base_image \
+  --progress plain \
+  .
+
+
+
+case $format in
+  deb)
+    pkg_dir="${MATRIX_IMAGE/:/_}_amd64"
+    pkg_file="${pkg_dir}.deb"
+    image="${pkg_dir}:latest"
+
+    docker buildx build \
+      -t $image \
+      -f pkg/Dockerfile.deb \
+      --platform linux/amd64 \
+      --build-arg PKG_DIR=$pkg_dir \
+      --build-arg BASE_IMAGE=$tag \
+      --progress plain \
+      .
+
+    cid=$(docker create $image)
+    mkdir -p _build
+    docker cp $cid:/root/pkg/$pkg_file ./_build/firezone_$pkg_file
+    ;;
+
+  rpm)
+    version=0.2.0-1
+    pkg_dir="firezone-${version}.amd64"
+    pkg_file="${pkg_dir}.rpm"
+    image="${MATRIX_IMAGE/:/_}_amd64:latest"
+
+    docker buildx build \
+      -t $image \
+      -f pkg/Dockerfile.rpm \
+      --platform linux/amd64 \
+      --build-arg PKG_DIR=$pkg_dir \
+      --build-arg BASE_IMAGE=$tag \
+      --progress plain \
+      .
+
+    cid=$(docker create $image)
+    mkdir -p _build
+    docker cp $cid:/root/rpmbuild/RPMS/amd64/$pkg_file ./_build/$pkg_file
+    ;;
+esac
diff --git a/.ci/build_ubuntu_18.04.base.sh b/.ci/build_ubuntu_18.04.base.sh
deleted file mode 100755
index 125103d8d..000000000
--- a/.ci/build_ubuntu_18.04.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64,linux/arm/v7"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform $platform \
-  --tag ghcr.io/firezone/ubuntu:18.04 \
-  --build-arg BASE_IMAGE="ubuntu:18.04" \
-  --progress plain \
-  -f pkg/Dockerfile.base.deb \
-  .
diff --git a/.ci/build_ubuntu_18.04.sh b/.ci/build_ubuntu_18.04.sh
deleted file mode 100755
index 51dd07794..000000000
--- a/.ci/build_ubuntu_18.04.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_deb.sh ubuntu_18.04 ghcr.io/firezone/ubuntu:18.04
diff --git a/.ci/build_ubuntu_20.04.base.sh b/.ci/build_ubuntu_20.04.base.sh
deleted file mode 100755
index 6b2beaaad..000000000
--- a/.ci/build_ubuntu_20.04.base.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-platform="linux/arm64,linux/amd64,linux/arm/v7"
-docker buildx build \
-  --no-cache \
-  --push \
-  --platform $platform \
-  --tag ghcr.io/firezone/ubuntu:20.04 \
-  --build-arg BASE_IMAGE="ubuntu:20.04" \
-  --progress plain \
-  -f pkg/Dockerfile.base.deb \
-  .
diff --git a/.ci/build_ubuntu_20.04.sh b/.ci/build_ubuntu_20.04.sh
deleted file mode 100755
index 0a29096b2..000000000
--- a/.ci/build_ubuntu_20.04.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-.ci/build_deb.sh ubuntu_20.04 ghcr.io/firezone/ubuntu:20.04
diff --git a/.github/workflows/build_base_images.yml b/.github/workflows/build_base_images.yml
index e64cac59f..b947023ce 100644
--- a/.github/workflows/build_base_images.yml
+++ b/.github/workflows/build_base_images.yml
@@ -6,18 +6,20 @@ on:
 
 jobs:
   build-and-push:
+    env:
+      MATRIX_IMAGE: ${{ matrix.image }}
     strategy:
       matrix:
-        os:
-          - amazonlinux_2
-          - centos_7
-          - centos_8
-          - fedora_33
-          - fedora_34
-          - fedora_35
-          - debian_10
-          - ubuntu_18.04
-          - ubuntu_20.04
+        image:
+          - amazonlinux:2
+          - centos:7
+          - centos:8
+          - fedora:33
+          - fedora:34
+          - fedora:35
+          - debian:10
+          - ubuntu:18.04
+          - ubuntu:20.04
     runs-on: ubuntu-20.04
     steps:
       - uses: docker/login-action@v1
@@ -32,4 +34,4 @@ jobs:
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
           docker buildx create --name multiarch --driver docker-container --use
           docker buildx inspect --bootstrap
-          .ci/build_${{ matrix.os }}.base.sh
+          .ci/build_base.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f96dd5012..fa1ede36a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,6 @@ jobs:
       POSTGRES_HOST: localhost
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       MATRIX_OS: ubuntu-18.04
-      MATRIX_ARCH: amd64
     strategy:
       matrix:
         os:
@@ -72,25 +71,23 @@ jobs:
     runs-on: ubuntu-20.04
     name: Build
     env:
-      MATRIX_ARCH: ${{ matrix.arch }}
-      MATRIX_OS: ${{ matrix.os }}
+      MATRIX_IMAGE: ${{ matrix.image }}
+      MATRIX_PLATFORM: ${{ matrix.platform }}
       MIX_ENV: prod
     strategy:
       matrix:
-        os:
-          - amazonlinux_2
-          - centos_7
-          - centos_8
-          - debian_10
-          - fedora_33
-          - fedora_34
-          - fedora_35
-          - ubuntu_18.04
-          - ubuntu_20.04
-        include:
-          - arch: amd64
-          # XXX: This currently takes upwards of 10 minutes or more. Disabling for now
-          # - arch: arm64
+        platform:
+          - linux/amd64
+        image:
+          - amazonlinux:2
+          - centos:7
+          - centos:8
+          - debian:10
+          - fedora:33
+          - fedora:34
+          - fedora:35
+          - ubuntu:18.04
+          - ubuntu:20.04
     steps:
       - uses: docker/login-action@v1
         with:
@@ -98,43 +95,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v2
-
-      # amd64 build
-      - if: ${{ matrix.arch == 'amd64' }}
-        run: |
-          .ci/build_${{ matrix.os }}.sh
-
-      # arm64 build
-      - uses: uraimo/run-on-arch-action@v2.0.10
-        if: ${{ matrix.arch == 'arm64' }}
-        with:
-          arch: aarch64
-          install: |
-            # No obvious way to load a script file here, so needs inlining :-(
-            apt-get update -q -y
-            apt-get install -q -y gcc g++ make curl gdebi zstd
-
-            curl -O https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_24.0.2-1~ubuntu~bionic_arm64.deb
-            curl -O https://packages.erlang-solutions.com/erlang/debian/pool/elixir_1.12.0-1~ubuntu~bionic_all.deb
-            gdebi --non-interactive esl-erlang_24.0.2-1~ubuntu~bionic_arm64.deb
-            gdebi --non-interactive elixir_1.12.0-1~ubuntu~bionic_all.deb
-
-            curl -sL https://deb.nodesource.com/setup_14.x | bash -
-            apt-get install -y -q nodejs
-          dockerRunArgs: |
-            --volume "${PWD}:/app"
-          distro: ubuntu18.04
-          env: |
-            arch: arm64
-          githubToken: ${{ github.token }}
-          run: |
-            cd /app
-            bash -c '.ci/build_release.sh'
+      - run: |
+          .ci/build_packages.sh
 
       - uses: actions/upload-artifact@v2
         with:
-          name: firezone_${{ matrix.os }}_${{ matrix.arch }}.deb
-          path: _build/firezone_${{ matrix.os }}_${{ matrix.arch }}.deb
+          name: firezone_${{ matrix.os }}_${{ matrix.platform }}
+          path: _build/firezone_${{ matrix.os }}_*.*
 
   functional-test:
     needs: build
@@ -151,18 +118,14 @@ jobs:
           # - fedora_35
           # - ubuntu_18.04
           - ubuntu_20.04
-        include:
-          - arch: amd64
-          # - arch: arm64
     env:
       MATRIX_OS: ${{ matrix.os }}
-      MATRIX_ARCH: ${{ matrix.arch }}
       DEBIAN_FRONTEND: noninteractive
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
         with:
-          name: firezone_${{ matrix.os }}_${{ matrix.arch }}.deb
+          name: firezone_${{ matrix.os }}_amd64.deb
           path: ./
       - name: Test Install package
         run: .ci/functional_test.sh
@@ -182,9 +145,6 @@ jobs:
           - fedora_33
           - fedora_34
           - fedora_35
-        include:
-          - arch: amd64
-            # - arch: arm64
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     steps:
       - name: Create Release
@@ -199,7 +159,7 @@ jobs:
           prerelease: true
       - uses: actions/download-artifact@v2
         with:
-          name: firezone_${{ matrix.os }}_${{ matrix.arch }}
+          name: firezone_${{ matrix.os }}_amd64
           path: ./
       - name: Upload Release Asset
         id: upload-release-asset
@@ -208,6 +168,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./firezone_${{ matrix.os }}_${{ matrix.arch }}.deb
-          asset_name: ${{ matrix.os }}_${{ matrix.arch }}
+          asset_path: ./firezone_${{ matrix.os }}_amd64.deb
+          asset_name: ${{ matrix.os }}_amd64
           asset_content_type: application/vnd.debian.binary-package
diff --git a/pkg/Dockerfile.deb b/pkg/Dockerfile.deb
index 0560d6471..ce8661809 100644
--- a/pkg/Dockerfile.deb
+++ b/pkg/Dockerfile.deb
@@ -1,34 +1,7 @@
 ARG BASE_IMAGE
-ARG PLATFORM
-FROM --platform=${PLATFORM} ${BASE_IMAGE}
+FROM ${BASE_IMAGE}
 
 ARG PKG_DIR
-ENV MIX_ENV prod
-
-# Dockerfile-friendly build release
-RUN mix local.hex --force && \
-    mix local.rebar --force
-COPY mix.exs mix.lock ./
-COPY config config
-COPY apps/fz_http/mix.exs ./apps/fz_http/
-COPY apps/fz_wall/mix.exs ./apps/fz_wall/
-COPY apps/fz_vpn/mix.exs ./apps/fz_vpn/
-COPY apps/fz_common/mix.exs ./apps/fz_common/
-RUN mix do deps.get, deps.compile
-COPY apps/fz_http/assets/package.json apps/fz_http/assets/package-lock.json ./apps/fz_http/assets/
-RUN cd apps/fz_http/assets && npm ci --progress=false --no-audit --loglevel=error
-COPY apps/fz_http/priv apps/fz_http/priv
-COPY apps/fz_http/assets apps/fz_http/assets
-RUN npm run --prefix ./apps/fz_http/assets deploy && \
-    cd apps/fz_http && mix phx.digest
-# Copy remaining items for release
-COPY rel rel
-COPY deps deps
-COPY config config
-COPY apps apps
-RUN mix release
-
-# PACKAGING
 
 # Copy shared files
 COPY pkg pkg
diff --git a/pkg/Dockerfile.release b/pkg/Dockerfile.release
new file mode 100644
index 000000000..f9077193f
--- /dev/null
+++ b/pkg/Dockerfile.release
@@ -0,0 +1,27 @@
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
+
+ENV MIX_ENV prod
+
+# Dockerfile-friendly build release
+RUN mix local.hex --force && \
+    mix local.rebar --force
+COPY mix.exs mix.lock ./
+COPY config config
+COPY apps/fz_http/mix.exs ./apps/fz_http/
+COPY apps/fz_wall/mix.exs ./apps/fz_wall/
+COPY apps/fz_vpn/mix.exs ./apps/fz_vpn/
+COPY apps/fz_common/mix.exs ./apps/fz_common/
+RUN mix do deps.get, deps.compile
+COPY apps/fz_http/assets/package.json apps/fz_http/assets/package-lock.json ./apps/fz_http/assets/
+RUN cd apps/fz_http/assets && npm ci --progress=false --no-audit --loglevel=error
+COPY apps/fz_http/priv apps/fz_http/priv
+COPY apps/fz_http/assets apps/fz_http/assets
+RUN npm run --prefix ./apps/fz_http/assets deploy && \
+    cd apps/fz_http && mix phx.digest
+# Copy remaining items for release
+COPY rel rel
+COPY deps deps
+COPY config config
+COPY apps apps
+RUN mix release
diff --git a/pkg/Dockerfile.rpm b/pkg/Dockerfile.rpm
index 60d121524..59103bcef 100644
--- a/pkg/Dockerfile.rpm
+++ b/pkg/Dockerfile.rpm
@@ -1,37 +1,9 @@
 ARG BASE_IMAGE
-ARG PLATFORM
-FROM --platform=${PLATFORM} ${BASE_IMAGE}
+FROM ${BASE_IMAGE}
 
 ARG PKG_DIR
-ENV MIX_ENV prod
-
-# Dockerfile-friendly build release
-RUN mix local.hex --force && \
-    mix local.rebar --force
-COPY mix.exs mix.lock ./
-COPY config config
-COPY apps/fz_http/mix.exs ./apps/fz_http/
-COPY apps/fz_wall/mix.exs ./apps/fz_wall/
-COPY apps/fz_vpn/mix.exs ./apps/fz_vpn/
-COPY apps/fz_common/mix.exs ./apps/fz_common/
-RUN mix do deps.get, deps.compile
-COPY apps/fz_http/assets/package.json apps/fz_http/assets/package-lock.json ./apps/fz_http/assets/
-RUN cd apps/fz_http/assets && npm ci --progress=false --no-audit --loglevel=error
-COPY apps/fz_http/priv apps/fz_http/priv
-COPY apps/fz_http/assets apps/fz_http/assets
-RUN npm run --prefix ./apps/fz_http/assets deploy && \
-    cd apps/fz_http && mix phx.digest
-# Copy remaining items for release
-COPY rel rel
-COPY deps deps
-COPY config config
-COPY apps apps
-RUN mix release
-
-# Package into rpm
 
 # Copy shared files
-RUN echo $PKG_DIR
 COPY pkg/rpm_shared/rpmbuild rpmbuild
 COPY pkg/skel/ rpmbuild/BUILDROOT/$PKG_DIR/
 RUN rsync -az _build/prod/rel/firezone/* rpmbuild/BUILDROOT/$PKG_DIR/usr/lib/firezone/
diff --git a/scripts/build_and_push_base_images.sh b/scripts/ci.sh
similarity index 58%
rename from scripts/build_and_push_base_images.sh
rename to scripts/ci.sh
index 2cea8f2f3..edb7a3157 100755
--- a/scripts/build_and_push_base_images.sh
+++ b/scripts/ci.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+# Mimics CI build action to test locally on developer machines
+
 # Required due to a buildx bug.
 # See https://github.com/docker/buildx/issues/495#issuecomment-761562905
 if [ `uname -m` = "amd64" ]; then
@@ -11,12 +13,21 @@ if [ `uname -m` = "amd64" ]; then
 elif [ `uname -m` = "arm64" ]; then
   docker buildx create --use
 fi
-.ci/build_amazonlinux_2.base.sh
-.ci/build_centos_7.base.sh
-.ci/build_centos_8.base.sh
-.ci/build_fedora_33.base.sh
-.ci/build_fedora_34.base.sh
-.ci/build_fedora_35.base.sh
-.ci/build_debian_10.base.sh
-.ci/build_ubuntu_18.04.base.sh
-.ci/build_ubuntu_20.04.base.sh
+
+matrix_images=(
+  amazonlinux:2
+  centos:7
+  centos:8
+  fedora:33
+  fedora:34
+  fedora:35
+  debian:10
+  ubuntu:18.04
+  ubuntu:20.04
+)
+
+for image in $matrix_images; do
+  export MATRIX_IMAGE=$image
+  .ci/build_base.sh
+  .ci/build_packages.sh
+done

From 65e6fb45ea0aaf34625ab085f2272c70500d31ab Mon Sep 17 00:00:00 2001
From: Jamil Bou Kheir <jamil@elbii.com>
Date: Wed, 21 Jul 2021 17:55:38 -0700
Subject: [PATCH 2/2] Fix build base

---
 .github/workflows/build_base_images.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build_base_images.yml b/.github/workflows/build_base_images.yml
index b947023ce..fb1cb7e63 100644
--- a/.github/workflows/build_base_images.yml
+++ b/.github/workflows/build_base_images.yml
@@ -8,6 +8,7 @@ jobs:
   build-and-push:
     env:
       MATRIX_IMAGE: ${{ matrix.image }}
+      MATRIX_PLATFORM: ${{ matrix.platform }}
     strategy:
       matrix:
         image:
@@ -20,6 +21,8 @@ jobs:
           - debian:10
           - ubuntu:18.04
           - ubuntu:20.04
+        platform:
+          - linux/amd64
     runs-on: ubuntu-20.04
     steps:
       - uses: docker/login-action@v1