From 1731a786a3a4dff0687428bdd0a00ee0d8cabe4b Mon Sep 17 00:00:00 2001
From: Nathan Monteleone <nathan@simpli.fi>
Date: Wed, 23 Oct 2024 15:05:09 -0500
Subject: [PATCH] Revert elixir dockerfile, because I'm not going through with
 fixing it.  Fix gem versions that are missing.  Fix RPM source for install
 stage

---
 .github/workflows/sifi_erl.yaml   |  2 +-
 builders/elixir_centos.Dockerfile |  9 ---------
 builders/erlang_centos.Dockerfile | 14 ++++++++++++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/sifi_erl.yaml b/.github/workflows/sifi_erl.yaml
index 2ce049b..b85079f 100644
--- a/.github/workflows/sifi_erl.yaml
+++ b/.github/workflows/sifi_erl.yaml
@@ -32,7 +32,7 @@ jobs:
           GPG_PASS: ${{ secrets.GPG_PASS }}
         run: |
           echo "Building ..."
-          echo "Distro latest ${{ matrix.cfg.DISTRO }} ${{ matrix.cfg.OS_VERSION }}"
+          echo "Distro ${{ matrix.cfg.DISTRO }} ${{ matrix.cfg.OS_VERSION }}"
           echo "Platform ${{ matrix.cfg.PLATFORM }}"
           echo "${{secrets.GPG_P_KEY}}" | tr ';' '\n' > GPG-KEY-pmanager
           make "erlang_${{ env.ERLANG_VERSION }}_${{matrix.cfg.DISTRO}}_${{matrix.cfg.OS_VERSION}}_${{matrix.cfg.PLATFORM}}"
diff --git a/builders/elixir_centos.Dockerfile b/builders/elixir_centos.Dockerfile
index 4f9fa44..b2708a8 100644
--- a/builders/elixir_centos.Dockerfile
+++ b/builders/elixir_centos.Dockerfile
@@ -6,15 +6,6 @@ ARG os
 ARG os_version
 ADD yumdnf /usr/local/bin/
 
-# Fix centos 7 mirrors
-RUN --mount=type=cache,id=${os}_${os_version},target=/var/cache/dnf,sharing=private \
-  --mount=type=cache,id=${os}_${os_version},target=/var/cache/yum,sharing=private \
-  if [ "${os}:${os_version}" = "centos:7" ]; then \
-    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo \
-    && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo \
-    && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo; \
-  fi
-
 # Fix centos 8 mirrors
 RUN --mount=type=cache,id=${os}_${os_version},target=/var/cache/dnf,sharing=private \
   --mount=type=cache,id=${os}_${os_version},target=/var/cache/yum,sharing=private \
diff --git a/builders/erlang_centos.Dockerfile b/builders/erlang_centos.Dockerfile
index bde9351..36cfe8f 100644
--- a/builders/erlang_centos.Dockerfile
+++ b/builders/erlang_centos.Dockerfile
@@ -87,8 +87,9 @@ RUN --mount=type=cache,id=${os}_${os_version},target=/var/cache/dnf,sharing=priv
   # fpm 1.12 requires ruby 2.3.8
   rbenv install 2.3.8; \
   rbenv global 2.3.8; \
-  gem install bundler -v '~>2'; \
+  gem install bundler -v '< 2.3'; \
   gem install git --no-document --version 1.7.0; \
+  gem install dotenv --version 2.8.1; \
   gem install fpm --no-document --version 1.12.0; \
   else \
   # fpm 1.13 requires ruby 3.0.1.
@@ -189,7 +190,16 @@ WORKDIR /tmp/output
 COPY --from=builder /tmp/output .
 ADD yumdnf /usr/local/bin/
 
-# Fix centos 8 mirrors
+# Fix centos 7 mirrors
+RUN --mount=type=cache,id=${os}_${os_version},target=/var/cache/dnf,sharing=private \
+  --mount=type=cache,id=${os}_${os_version},target=/var/cache/yum,sharing=private \
+  if [ "${os}:${os_version}" = "centos:7" ]; then \
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo \
+    && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo \
+    && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo; \
+  fi
+
+  # Fix centos 8 mirrors
 RUN --mount=type=cache,id=${os}_${os_version},target=/var/cache/dnf,sharing=private \
   --mount=type=cache,id=${os}_${os_version},target=/var/cache/yum,sharing=private \
   if [ "${os}:${os_version}" = "centos:8" ]; then \