Skip to content

Commit d2190fd

Browse files
committed
Add pull target
Add pull target, make all the image builds depend on it. Signed-off-by: Joe Block <jpb@unixorn.net>
1 parent e175c26 commit d2190fd

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,37 @@ PLATFORMS=linux/arm64,linux/amd64,linux/arm/v7
2626
install_hooks: ## Install the git hooks
2727
poetry run pre-commit install
2828

29-
local_cgiserver: ## Makes a moosefs-cgiserver docker image for only the architecture we're running on. Does not push to dockerhub.
29+
pull:
30+
docker pull ubuntu:22.04
31+
32+
local_cgiserver: pull ## Makes a moosefs-cgiserver docker image for only the architecture we're running on. Does not push to dockerhub.
3033
docker buildx build --load -t ${HUB_USER}/moosefs-cgiserver -f Dockerfile.cgiserver .
3134

32-
multiarch_cgiserver: ## Makes a moosefs-cgiserver multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
35+
multiarch_cgiserver: pull ## Makes a moosefs-cgiserver multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
3336
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-cgiserver:$(MOOSEFS_VERSION) -f Dockerfile.cgiserver .
3437
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-cgiserver:latest -f Dockerfile.cgiserver .
3538
make local_cgiserver
3639

37-
local_chunkserver: ## Makes a moosefs-chunkserver docker image for only the architecture we're running on. Does not push to dockerhub.
40+
local_chunkserver: pull ## Makes a moosefs-chunkserver docker image for only the architecture we're running on. Does not push to dockerhub.
3841
docker buildx build --load -t ${HUB_USER}/moosefs-chunkserver -f Dockerfile.chunkserver .
3942

40-
multiarch_chunkserver: ## Makes a moosefs-chunkserver multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
43+
multiarch_chunkserver: pull ## Makes a moosefs-chunkserver multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
4144
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-chunkserver:$(MOOSEFS_VERSION) -f Dockerfile.chunkserver .
4245
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-chunkserver:latest -f Dockerfile.chunkserver .
4346
make local_chunkserver
4447

45-
local_master: ## Makes a moosefs-master docker image for only the architecture we're running on. Does not push to dockerhub.
48+
local_master: pull ## Makes a moosefs-master docker image for only the architecture we're running on. Does not push to dockerhub.
4649
docker buildx build --load -t ${HUB_USER}/moosefs-master -f Dockerfile.master .
4750

48-
multiarch_master: ## Makes a moosefs-master multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
51+
multiarch_master: pull ## Makes a moosefs-master multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
4952
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-master:$(MOOSEFS_VERSION) -f Dockerfile.master .
5053
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-master:latest -f Dockerfile.master .
5154
make local_master
5255

53-
local_metalogger: ## Makes a moosefs-metalogger docker image for only the architecture we're running on. Does not push to dockerhub.
56+
local_metalogger: pull ## Makes a moosefs-metalogger docker image for only the architecture we're running on. Does not push to dockerhub.
5457
docker buildx build --load -t ${HUB_USER}/moosefs-metalogger -f Dockerfile.metalogger .
5558

56-
multiarch_metalogger: ## Makes a moosefs-metalogger multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
59+
multiarch_metalogger: pull ## Makes a moosefs-metalogger multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
5760
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-metalogger:$(MOOSEFS_VERSION) -f Dockerfile.metalogger .
5861
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-metalogger:latest -f Dockerfile.metalogger .
5962
make local_metalogger
@@ -63,7 +66,7 @@ local: local_cgiserver \ ## Make images for whatever architecture you're running
6366
local_master \
6467
local_metalogger
6568

66-
multiarch_images: ## Builds multi-architecture docker images for all the services and pushes them to docker hub
69+
multiarch_images: multiarch ## Builds multi-architecture docker images for all the services and pushes them to docker hub
6770
multiarch: multiarch_cgiserver \
6871
multiarch_chunkserver \
6972
multiarch_master \

0 commit comments

Comments
 (0)