Merge pull request #22 from unixorn/update-to-trixie

Update docker images to debian trixie

Author: unixorn

Dockerfile.cgiserver

@@ -1,13 +1,9 @@
-FROM debian:13-slim
+FROM unixorn/moosefs-base
 
 ARG application_version
 LABEL maintainer="Joe Block <jpb@unixorn.net>"
 LABEL version=${application_version}
 
-RUN apt update && \
-    apt install -y apt-utils ca-certificates --no-install-recommends
-RUN update-ca-certificates
-
 RUN apt install -y moosefs-cgiserv
 LABEL description="moosefs-cgiserv image"
 

Dockerfile.chunkserver

@@ -1,13 +1,9 @@
-FROM debian:13-slim
+FROM unixorn/moosefs-base
 
 ARG application_version
 LABEL maintainer="Joe Block <jpb@unixorn.net>"
 LABEL version=${application_version}
 
-RUN apt update && \
-    apt install -y apt-utils ca-certificates --no-install-recommends
-RUN update-ca-certificates
-
 RUN apt install -y moosefs-chunkserver
 LABEL description="moosefs-chunkserver image"
 

Dockerfile.cli

@@ -1,14 +1,10 @@
-FROM debian:13-slim
+FROM unixorn/moosefs-base
 
 ARG application_version
 LABEL maintainer="Joe Block <jpb@unixorn.net>"
 LABEL description="moosefs-cli image"
 LABEL version=${application_version}
 
-RUN apt update && \
-    apt install -y apt-utils ca-certificates --no-install-recommends
-RUN update-ca-certificates
-
 RUN apt install -y moosefs-cli
 
 CMD ["bash", "-l"]

Dockerfile.master

@@ -1,13 +1,9 @@
-FROM debian:13-slim
+FROM unixorn/moosefs-base
 
 ARG application_version
 LABEL maintainer="Joe Block <jpb@unixorn.net>"
 LABEL version=${application_version}
 
-RUN apt update && \
-    apt install -y apt-utils ca-certificates --no-install-recommends
-RUN update-ca-certificates
-
 RUN apt install -y moosefs-master
 LABEL description="moosefs-master image"
 

Dockerfile.metalogger

@@ -1,13 +1,9 @@
-FROM debian:12-slim
+FROM unixorn/moosefs-base
 
 ARG application_version
 LABEL maintainer="Joe Block <jpb@unixorn.net>"
 LABEL version=${application_version}
 
-RUN apt-get update && \
-    apt-get install -y apt-utils ca-certificates --no-install-recommends
-RUN update-ca-certificates
-
 RUN apt-get install -y moosefs-metalogger
 
 LABEL description="moosefs-metalogger image"

Dockerfile.netdump

@@ -1,14 +1,10 @@
-FROM debian:12-slim
+FROM unixorn/moosefs-base
 
 ARG application_version
 LABEL maintainer="Joe Block <jpb@unixorn.net>"
 LABEL description="moosefs-netdump image"
 LABEL version=${application_version}
 
-RUN apt-get update && \
-    apt-get install -y apt-utils ca-certificates --no-install-recommends
-RUN update-ca-certificates
-
 RUN apt-get install -y moosefs-netdump
 
 CMD ["bash", "-l"]

Makefile

@@ -17,53 +17,62 @@ help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 HUB_USER=unixorn
-MOOSEFS_VERSION=3.117
+MOOSEFS_VERSION=4.57
 PLATFORMS=linux/arm64,linux/amd64,linux/arm/v7
 
 install_hooks: ## Install the git hooks
 	poetry run pre-commit install
 
-local_cgiserver: ## Makes a moosefs-cgiserver docker image for only the architecture we're running on. Does not push to dockerhub.
-	docker buildx build --pull --load -t ${HUB_USER}/moosefs-cgiserver -f Dockerfile.cgiserver .
+local_base: ## Makes a moosefs-base docker image for only the architecture we're running on. Does not push to dockerhub.
+	docker buildx build --pull --load -t ${HUB_USER}/moosefs-base -f Dockerfile.base .
+
+multiarch_base: ## Makes a moosefs-base docker image. Does not push to dockerhub.
+	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-base:$(MOOSEFS_VERSION) -f Dockerfile.base .
+	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-base:latest -f Dockerfile.base .
+	docker pull ${HUB_USER}/moosefs-base:latest
+
+local_cgiserver: local_base ## Makes a moosefs-cgiserver docker image for only the architecture we're running on. Does not push to dockerhub.
+	docker buildx build --load -t ${HUB_USER}/moosefs-cgiserver -f Dockerfile.cgiserver .
+# 	docker buildx build --pull --load -t ${HUB_USER}/moosefs-cgiserver -f Dockerfile.cgiserver .
 
 multiarch_cgiserver: ## Makes a moosefs-cgiserver multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-cgiserver:$(MOOSEFS_VERSION) -f Dockerfile.cgiserver .
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-cgiserver:latest -f Dockerfile.cgiserver .
 	docker pull ${HUB_USER}/moosefs-cgiserver:latest
 
-local_chunkserver: ## Makes a moosefs-chunkserver docker image for only the architecture we're running on. Does not push to dockerhub.
+local_chunkserver: local_base ## Makes a moosefs-chunkserver docker image for only the architecture we're running on. Does not push to dockerhub.
 	docker buildx build --pull --load -t ${HUB_USER}/moosefs-chunkserver -f Dockerfile.chunkserver .
 
 multiarch_chunkserver: ## Makes a moosefs-chunkserver multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-chunkserver:$(MOOSEFS_VERSION) -f Dockerfile.chunkserver .
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-chunkserver:latest -f Dockerfile.chunkserver .
 	docker pull ${HUB_USER}/moosefs-chunkserver:latest
 
-local_cli: ## Makes a moosefs-cli docker image for only the architecture we're running on. Does not push to dockerhub.
+local_cli: local_base ## Makes a moosefs-cli docker image for only the architecture we're running on. Does not push to dockerhub.
 	docker buildx build --pull --load -t ${HUB_USER}/moosefs-cli -f Dockerfile.cli .
 
 multiarch_cli: ## Makes a moosefs-cli multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-cli:$(MOOSEFS_VERSION) -f Dockerfile.cli .
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-cli:latest -f Dockerfile.cli .
 	docker pull ${HUB_USER}/moosefs-cli:latest
 
-local_master: ## Makes a moosefs-master docker image for only the architecture we're running on. Does not push to dockerhub.
+local_master: local_base ## Makes a moosefs-master docker image for only the architecture we're running on. Does not push to dockerhub.
 	docker buildx build --pull --load -t ${HUB_USER}/moosefs-master -f Dockerfile.master .
 
 multiarch_master: ## Makes a moosefs-master multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-master:$(MOOSEFS_VERSION) -f Dockerfile.master .
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-master:latest -f Dockerfile.master .
 	docker pull ${HUB_USER}/moosefs-master:latest
 
-local_metalogger: ## Makes a moosefs-metalogger docker image for only the architecture we're running on. Does not push to dockerhub.
+local_metalogger: local_base ## Makes a moosefs-metalogger docker image for only the architecture we're running on. Does not push to dockerhub.
 	docker buildx build --pull --load -t ${HUB_USER}/moosefs-metalogger -f Dockerfile.metalogger .
 
 multiarch_metalogger: ## Makes a moosefs-metalogger multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-metalogger:$(MOOSEFS_VERSION) -f Dockerfile.metalogger .
 	docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-metalogger:latest -f Dockerfile.metalogger .
 	docker pull ${HUB_USER}/moosefs-metalogger:latest
 
-local_netdump: ## Makes a moosefs-netdump docker image for only the architecture we're running on. Does not push to dockerhub.
+local_netdump: local_base ## Makes a moosefs-netdump docker image for only the architecture we're running on. Does not push to dockerhub.
 	docker buildx build --pull --load -t ${HUB_USER}/moosefs-netdump -f Dockerfile.netdump .
 
 multiarch_netdump: ## Makes a moosefs-netdump multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
@@ -72,7 +81,7 @@ multiarch_netdump: ## Makes a moosefs-netdump multi-architecture docker image fo
 	docker pull ${HUB_USER}/moosefs-netdump:latest
 
 local: local_all  ## Make images for whatever architecture you're running on, but does not push to docker hub
-local_all: local_cgiserver local_chunkserver local_cli local_master local_metalogger local_netdump
+local_all: local_cgiserver local_chunkserver local_cli local_master local_metalogger local_netdump local_base
 
 multiarch_images: multiarch ## Builds multi-architecture docker images for all the services and pushes them to docker hub
 multiarch: multiarch_cgiserver \