Skip to content

Commit 154248a

Browse files
committed
standardize on latest instead of current
1 parent ba5c566 commit 154248a

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@ build_base:
6464
rm -rf base_image
6565
cp -pR image base_image
6666
ifeq ($(_build_amd64),1)
67-
docker rmi $(NAME)-base:current-amd64 || true
68-
docker buildx build --progress=plain --platform linux/amd64 $(EXTRA_BUILD_FLAGS) --build-arg ARCH=amd64 -t $(NAME)-base:current-amd64 -f image/Dockerfile.base base_image --no-cache --load
67+
docker rmi $(NAME)-base:latest-amd64 || true
68+
docker buildx build --progress=plain --platform linux/amd64 $(EXTRA_BUILD_FLAGS) --build-arg ARCH=amd64 -t $(NAME)-base:latest-amd64 -f image/Dockerfile.base base_image --no-cache --load
6969
endif
7070
ifeq ($(_build_arm64),1)
71-
docker rmi $(NAME)-base:current-arm64 || true
72-
docker buildx build --progress=plain --platform linux/arm64 $(EXTRA_BUILD_FLAGS) --build-arg ARCH=arm64 -t $(NAME)-base:current-arm64 -f image/Dockerfile.base base_image --no-cache --load
71+
docker rmi $(NAME)-base:latest-arm64 || true
72+
docker buildx build --progress=plain --platform linux/arm64 $(EXTRA_BUILD_FLAGS) --build-arg ARCH=arm64 -t $(NAME)-base:latest-arm64 -f image/Dockerfile.base base_image --no-cache --load
7373
endif
7474
rm -rf base_image
7575

7676
export_base:
7777
ifeq ($(_build_amd64),1)
78-
docker save $(NAME)-base:current-amd64 | gzip > passenger-base-amd64.tar.gz
78+
docker save $(NAME)-base:latest-amd64 | gzip > passenger-base-amd64.tar.gz
7979
endif
8080
ifeq ($(_build_arm64),1)
81-
docker save $(NAME)-base:current-arm64 | gzip > passenger-base-arm64.tar.gz
81+
docker save $(NAME)-base:latest-arm64 | gzip > passenger-base-arm64.tar.gz
8282
endif
8383

8484
build_%:
@@ -174,8 +174,8 @@ clean:
174174
rm -rf *_image
175175

176176
clean_images: $(foreach image, $(ALL_IMAGES), clean_image_${image}) FORCE
177-
docker rmi $(NAME)-base:current-amd64 phusion/passenger-base:current-amd64 || true
178-
docker rmi $(NAME)-base:current-arm64 phusion/passenger-base:current-arm64 || true
177+
docker rmi $(NAME)-base:latest-amd64 phusion/passenger-base:latest-amd64 || true
178+
docker rmi $(NAME)-base:latest-arm64 phusion/passenger-base:latest-arm64 || true
179179

180180
clean_image_%: FORCE
181181
docker rmi $(NAME)-$*:latest-amd64 $(NAME)-$*:$(VERSION)-amd64 || true

image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1.4
22
ARG ARCH
33
ARG NAME
4-
FROM $NAME-base:current-$ARCH
4+
FROM $NAME-base:latest-$ARCH
55
MAINTAINER Phusion <[email protected]>
66

77
ADD . /pd_build

0 commit comments

Comments
 (0)