Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating to ubuntu 24.04, latest versions of phusion base & passenger (SCP-5877) #33

Merged
merged 37 commits into from
Mar 13, 2025
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e166bd0
Updating to latest versions of all images
bistline Mar 12, 2025
6d3a241
Dealing with registry name issues
bistline Mar 12, 2025
f80c91b
debugging make/dockerfile contents
bistline Mar 12, 2025
bfacd6c
fixing sed command
bistline Mar 12, 2025
6266e42
debugging
bistline Mar 12, 2025
4ff4f61
more REGISTRY debugging
bistline Mar 12, 2025
dd543b6
more REGISTRY debugging
bistline Mar 12, 2025
ac5e073
more REGISTRY debugging
bistline Mar 12, 2025
934192f
REGISTRY debugging, using ubuntu 22.04 runner
bistline Mar 12, 2025
d59ba54
working on Dockerfile
bistline Mar 12, 2025
6e33d75
working on Dockerfiles
bistline Mar 12, 2025
2e404b8
debugging Dockerfile
bistline Mar 12, 2025
8d4d317
backdating to ruby 3.2 build
bistline Mar 12, 2025
0b7ddd6
fixing image tag to use latest-$ARCH
bistline Mar 12, 2025
a7c8fa0
specifying DOCKER_BUILDKIT=0 to get around docker context issue
bistline Mar 12, 2025
2b8501c
more buildx platform fixes
bistline Mar 12, 2025
93af893
trying default context
bistline Mar 12, 2025
5a56594
trying pull=false
bistline Mar 12, 2025
9cb74f3
trying pull=false
bistline Mar 12, 2025
772e634
trying anything at this point
bistline Mar 12, 2025
c54f0db
trying anything at this point
bistline Mar 12, 2025
af63bb7
trying removing syntax line, other env vars
bistline Mar 12, 2025
b6df6cd
backdating source image version, trying other things
bistline Mar 12, 2025
d937358
trying full build
bistline Mar 12, 2025
b6ba79c
checking Makefile
bistline Mar 12, 2025
2882b9c
fixing line no
bistline Mar 12, 2025
d602d9a
trying explicit build_base first
bistline Mar 12, 2025
4028caa
trying explicit buildx call
bistline Mar 12, 2025
3a45350
trying explicit buildx call with extra args removed
bistline Mar 12, 2025
bc275cf
PROGRESS!!! updating libaio1t64, trying intermediate make call
bistline Mar 12, 2025
8db2f22
fixing Docker image name/tag for intermediate image
bistline Mar 12, 2025
3c927fc
using correct intermediate base image name
bistline Mar 12, 2025
f4e4c77
adding missing namespace
bistline Mar 12, 2025
40738e8
fixing typos
bistline Mar 12, 2025
68a3026
trying docker.io name to avoid double build
bistline Mar 12, 2025
6e9ce38
reverting to explicit build_base, disable arm64 builds
bistline Mar 12, 2025
971f887
cleaning up variables/comments
bistline Mar 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
working on Dockerfile
bistline committed Mar 12, 2025
commit d59ba54f4b1c0340a2ec111e54bb7a557f55c8c3
7 changes: 2 additions & 5 deletions lib/bin/rebuild_phusion_passenger_image
Original file line number Diff line number Diff line change
@@ -26,17 +26,14 @@ export PATH="$BASE_DIR/lib/docker_shim:$PATH" # use a docker shim to filter out
# remove registry prepend from Makefile
MAKEFILE="Makefile"
echo "Removing REGISTRY from image name"
echo "BEFORE"
sed -n -e 1,9p $MAKEFILE
sed -i "s/NAME ?= \$(REGISTRY)\//NAME ?= /" $MAKEFILE
echo "AFTER"
sed -n -e 1,9p $MAKEFILE
ls -l
# fix Dockerfile.base and Dockerfile use correct images
BASE_DOCKER_FILE="./image/Dockerfile.base"
sed -i "s~^FROM[[:space:]].\{1,\}$~FROM $DOCKER_NAMESPACE/phusion_baseimage:$PHUSION_BASE_IMAGE_VERSION~" $BASE_DOCKER_FILE
DOCKER_FILE="./image/Dockerfile"
sed -i "s~^FROM[[:space:]].\{1,\}$~FROM $DOCKER_NAMESPACE/phusion_passenger-base\:current-\$ARCH~" $DOCKER_FILE
sed -n -e 1,9p $DOCKER_FILE
docker images
MAKE_TARGET=build_ruby34
MAKE_OUTPUT="$(make $MAKE_TARGET NAME="$IMAGE_FULLNAME")" || exit_with_error_message "make build FAILED" # build
# due to mismatch of version tag in Makefile vs. version.txt, we must manually tag built image with correct name