Make builders compatible with latest Cloudsmith action (#4778)

cloudposse · Jun 13, 2024 · c68ee5d · c68ee5d
1 parent 6563d55
commit c68ee5d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 export DOCKER_ORG ?= cloudposse
-export DOCKER_IMAGE ?= $(DOCKER_ORG)/packages
+export DOCKER_IMAGE ?= ghcr.io/$(DOCKER_ORG)/packages
 export DOCKER_TAG ?= latest
 export DOCKER_IMAGE_NAME ?= $(DOCKER_IMAGE):$(DOCKER_TAG)
 export DOCKER_BUILD_FLAGS =
@@ -58,28 +58,28 @@ docs/badges.md: docs/deps
 
 ## Build alpine packages for testing
 docker/build/apk:
-	docker build --load --platform=linux/amd64 -t cloudposse/apkbuild:$(ALPINE_VERSION) -f apk/Dockerfile-$(ALPINE_VERSION) .
+	docker build --load --platform=linux/amd64 -t $(DOCKER_IMAGE)-apkbuild:$(ALPINE_VERSION) -f apk/Dockerfile-$(ALPINE_VERSION) .
 	docker run \
 		--name apkbuild \
 		--rm \
 		-e APK_PACKAGES_PATH=/packages/artifacts/$(ALPINE_VERSION) \
-		-v $$(pwd):/packages cloudposse/apkbuild:$(ALPINE_VERSION) \
+		-v $$(pwd):/packages $(DOCKER_IMAGE)-apkbuild:$(ALPINE_VERSION) \
 		sh -c "make -C /packages/vendor build"
 
 docker/build/apk/all:
-	docker build --load --platform=linux/amd64 -t cloudposse/apkbuild:$(ALPINE_VERSION) -f apk/Dockerfile-$(ALPINE_VERSION) .
+	docker build --load --platform=linux/amd64 -t $(DOCKER_IMAGE)-apkbuild:$(ALPINE_VERSION) -f apk/Dockerfile-$(ALPINE_VERSION) .
 	docker run \
 		--name apkbuild \
 		--rm \
 		-e APK_PACKAGES_PATH=/packages/artifacts/$(ALPINE_VERSION) \
-		-v $$(pwd):/packages cloudposse/apkbuild:$(ALPINE_VERSION) \
+		-v $$(pwd):/packages $(DOCKER_IMAGE)-apkbuild:$(ALPINE_VERSION) \
 		sh -c "make -C /packages/vendor build"
 
 ## Run alpine builder interactively
 docker/build/apk/shell run/apk:
 	rm -rf tmp/*
 	[ -n "$(ls tmp/)" ] && sudo rm -rf tmp/* || true
-	docker build --load --platform=linux/amd64 -t cloudposse/apkbuild:$(ALPINE_VERSION) -f apk/Dockerfile-$(ALPINE_VERSION) .
+	docker build --load --platform=linux/amd64 -t $(DOCKER_IMAGE)-apkbuild:$(ALPINE_VERSION) -f apk/Dockerfile-$(ALPINE_VERSION) .
 	docker run \
 		--name apkbuild \
 		--rm \
@@ -92,7 +92,7 @@ docker/build/apk/shell run/apk:
 		-e APK_PACKAGES_PATH=/packages/artifacts/$(ALPINE_VERSION) \
 		--privileged \
 		-w /packages \
-		-v $$(pwd):/packages cloudposse/apkbuild:$(ALPINE_VERSION)
+		-v $$(pwd):/packages $(DOCKER_IMAGE)-apkbuild:$(ALPINE_VERSION)
 
 # MATRIX BUILD
 docker/build/deb/shell docker/build/deb/test run/deb : BUILDER_VERSION=stable-slim
@@ -101,28 +101,28 @@ docker/build/rpm/shell docker/build/rpm/test run/rpm : BUILDER_VERSION=ubi
 
 ## Build package as a test
 docker/build/%/test:
-	docker build -t cloudposse/packages-$*build:$(BUILDER_VERSION) -f $*/Dockerfile.$(BUILDER_VERSION) .
+	docker build -t $(DOCKER_IMAGE)-$*build:$(BUILDER_VERSION) -f $*/Dockerfile.$(BUILDER_VERSION) .
 	docker run \
 		--name $*build \
 		--rm \
 		-e TMP=/packages/tmp/$* \
 		-e PACKAGES_PATH=/packages/artifacts/$*/$(BUILDER_VERSION) \
-		-v $$(pwd):/packages cloudposse/packages-$*build:$(BUILDER_VERSION) \
+		-v $$(pwd):/packages $(DOCKER_IMAGE)-$*build:$(BUILDER_VERSION) \
 		sh -c "make -C /packages/vendor/github-commenter $*"
 
 ## Build package builder shell
 docker/build/%/shell run/%:
 	rm -rf tmp/*
 	[ -n "$(ls tmp/)" ] && sudo rm -rf tmp/* || true
 	mkdir -p tmp/$*
-	docker build -t cloudposse/packages-$*build:$(BUILDER_VERSION) -f $*/Dockerfile.$(BUILDER_VERSION) .
+	docker build -t $(DOCKER_IMAGE)-$*build:$(BUILDER_VERSION) -f $*/Dockerfile.$(BUILDER_VERSION) .
 	docker run \
 		-it \
 		--name $*build \
 		--rm \
 		-e TMP=/packages/tmp/$* \
 		-e PACKAGES_PATH=/packages/artifacts/$*/$(BUILDER_VERSION) \
-		-v $$(pwd):/packages cloudposse/packages-$*build:$(BUILDER_VERSION) \
+		-v $$(pwd):/packages $(DOCKER_IMAGE)-$*build:$(BUILDER_VERSION) \
 		bash
 
 

diff --git a/deb/Dockerfile.stable-slim b/deb/Dockerfile.stable-slim
@@ -1,5 +1,6 @@
 # Need to use version number so that it gets updated here and triggers a build
-ARG PYTHON_VERSION=3.12.3
+# Find the current version of Python at https://www.python.org/downloads/source/
+ARG PYTHON_VERSION=3.11.9
 ARG DEBIAN_CODENAME=bookworm
 
 FROM python:${PYTHON_VERSION}-slim-${DEBIAN_CODENAME}
@@ -8,7 +9,7 @@ ENV LC_ALL=C.UTF-8
 ENV PS1="(deb) \w \$ "
 
 RUN apt-get update && \
-    apt-get -y -q install bash ruby ruby-dev rubygems build-essential curl git zip bzip2 jq
+    apt-get -y -q install bash ruby ruby-dev rubygems build-essential curl git zip bzip2 jq wget sudo
 # https://github.com/jordansissel/fpm/issues/1663
 RUN gem install --no-document backports -v 3.15.0
 RUN gem install --no-document fpm

diff --git a/rpm/Dockerfile.ubi b/rpm/Dockerfile.ubi
@@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi9/ubi
 ENV LC_ALL=C.UTF-8
 ENV PS1="(rpm) \w \$ "
 
-RUN yum clean all && yum -y install ruby-devel gcc make rpm-build rubygems git zip bzip2 jq which
+RUN yum clean all && yum -y install ruby-devel gcc make rpm-build rubygems git zip bzip2 jq which wget
 # install sudo, needed by package sudosh, and protected, so it is nearly impossible to remove
 RUN yum -y install sudo