Update build OSes, pre-install Python

cloudposse · Jun 11, 2024 · 0121e40 · 0121e40
1 parent 451af61
commit 0121e40
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/rpmbuild.yml b/.github/workflows/rpmbuild.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         centos:
-        - 'centos8'
+        - 'ubi'
     steps:
     - name: "Checkout source code at current commit"
       uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -97,7 +97,7 @@ docker/build/apk/shell run/apk:
 # MATRIX BUILD
 docker/build/deb/shell docker/build/deb/test run/deb : BUILDER_VERSION=stable-slim
 
-docker/build/rpm/shell docker/build/rpm/test run/rpm : BUILDER_VERSION=centos8
+docker/build/rpm/shell docker/build/rpm/test run/rpm : BUILDER_VERSION=ubi
 
 ## Build package as a test
 docker/build/%/test:

diff --git a/apk/Dockerfile-alpine b/apk/Dockerfile-alpine
@@ -1,5 +1,5 @@
 # Need to use version number so that it gets updated here and triggers a build
-FROM alpine:3.17.3
+FROM alpine:3.19.1
 
 ENV LC_ALL=C.UTF-8
 ENV PS1="(apk) \w \$ "
@@ -16,6 +16,7 @@ RUN apk add --no-cache bash curl && \
 RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 
 RUN apk update && \
-    apk add make curl alpine-sdk shadow bash jq sudo go
+    apk add make curl alpine-sdk shadow bash jq sudo go  && \
+    apk add --update -U python3 python3-dev py3-pip libffi-dev gcc linux-headers musl-dev openssl-dev
 
 RUN echo "auth       sufficient   pam_shells.so" > /etc/pam.d/chsh
diff --git a/deb/Dockerfile.stable-slim b/deb/Dockerfile.stable-slim
@@ -1,5 +1,8 @@
 # Need to use version number so that it gets updated here and triggers a build
-FROM debian:11.5-slim
+ARG PYTHON_VERSION=3.12.3
+ARG DEBIAN_CODENAME=bookworm
+
+FROM python:${PYTHON_VERSION}-slim-${DEBIAN_CODENAME}
 
 ENV LC_ALL=C.UTF-8
 ENV PS1="(deb) \w \$ "

diff --git a/rpm/Dockerfile.centos8 → rpm/Dockerfile.ubi b/rpm/Dockerfile.centos8 → rpm/Dockerfile.ubi
@@ -1,4 +1,5 @@
-FROM registry.access.redhat.com/ubi8/ubi
+# UBI replaces Centos
+FROM registry.access.redhat.com/ubi9/ubi
 
 ENV LC_ALL=C.UTF-8
 ENV PS1="(rpm) \w \$ "
@@ -7,6 +8,8 @@ RUN yum clean all && yum -y install ruby-devel gcc make rpm-build rubygems git z
 # install sudo, needed by package sudosh, and protected, so it is nearly impossible to remove
 RUN yum -y install sudo
 
+RUN yum -y install python3.12 python3-pip
+
 # https://github.com/jordansissel/fpm/issues/1663
 #  # # RUN gem install  --no-document backports -v 3.15.0