Skip to content

Commit f2706da

Browse files
unixornunixorn
authored
Merge pull request #7 from unixorn/3.117-update
3.117 update
2 parents c6e4dcb + 4230150 commit f2706da

8 files changed

+58
-32
lines changed

‎Dockerfile.cgiserver

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# FROM debian:11-slim
2-
FROM ubuntu:22.04
1+
FROM debian:12-slim
32

43
ARG application_version
54
LABEL maintainer="Joe Block <[email protected]>"
65
LABEL version=${application_version}
76

8-
RUN apt-get update
9-
RUN apt-get install -y apt-utils ca-certificates --no-install-recommends
7+
RUN apt-get update && \
8+
apt-get install -y apt-utils ca-certificates --no-install-recommends
109
RUN update-ca-certificates
1110

1211
RUN apt-get install -y moosefs-cgiserv

‎Dockerfile.chunkserver

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# FROM debian:11-slim
2-
FROM ubuntu:22.04
1+
FROM debian:12-slim
32

43
ARG application_version
54
LABEL maintainer="Joe Block <[email protected]>"
65
LABEL version=${application_version}
76

8-
RUN apt-get update
9-
RUN apt-get install -y apt-utils ca-certificates --no-install-recommends
7+
RUN apt-get update && \
8+
apt-get install -y apt-utils ca-certificates --no-install-recommends
109
RUN update-ca-certificates
1110

1211
RUN apt-get install -y moosefs-chunkserver

‎Dockerfile.cli

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM debian:12-slim
2+
3+
ARG application_version
4+
LABEL maintainer="Joe Block <[email protected]>"
5+
LABEL description="moosefs-cli image"
6+
LABEL version=${application_version}
7+
8+
RUN apt-get update && \
9+
apt-get install -y apt-utils ca-certificates --no-install-recommends
10+
RUN update-ca-certificates
11+
12+
RUN apt-get install -y moosefs-cli
13+
14+
CMD ["bash", "-l"]

‎Dockerfile.master

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# FROM debian:11-slim
2-
FROM ubuntu:22.04
1+
FROM debian:12-slim
32

43
ARG application_version
54
LABEL maintainer="Joe Block <[email protected]>"
65
LABEL version=${application_version}
76

8-
RUN apt-get update
9-
RUN apt-get install -y apt-utils ca-certificates --no-install-recommends
7+
RUN apt-get update && \
8+
apt-get install -y apt-utils ca-certificates --no-install-recommends
109
RUN update-ca-certificates
1110

1211
RUN apt-get install -y moosefs-master

‎Dockerfile.metalogger

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
# FROM debian:11-slim
2-
FROM ubuntu:22.04
1+
FROM debian:12-slim
32

43
ARG application_version
54
LABEL maintainer="Joe Block <[email protected]>"
65
LABEL version=${application_version}
76

8-
RUN apt-get update
9-
RUN apt-get install -y apt-utils ca-certificates --no-install-recommends
7+
RUN apt-get update && \
8+
apt-get install -y apt-utils ca-certificates --no-install-recommends
109
RUN update-ca-certificates
1110

1211
RUN apt-get install -y moosefs-metalogger
1312

1413
LABEL description="moosefs-metalogger image"
15-
CMD ["/usr/sbin/mfsmetalogger", "start"]
14+
CMD ["/usr/sbin/mfsmetalogger", "start"]

‎Dockerfile.netdump

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
# FROM debian:11-slim
2-
FROM ubuntu:22.04
1+
FROM debian:12-slim
32

43
ARG application_version
54
LABEL maintainer="Joe Block <[email protected]>"
6-
LABEL description="moosefs-master image"
5+
LABEL description="moosefs-netdump image"
76
LABEL version=${application_version}
87

9-
RUN apt-get update
10-
RUN apt-get install -y apt-utils ca-certificates --no-install-recommends && \
11-
update-ca-certificates
8+
RUN apt-get update && \
9+
apt-get install -y apt-utils ca-certificates --no-install-recommends
10+
RUN update-ca-certificates
1211

13-
RUN apt-get install -y moosefs-master && \
12+
RUN apt-get install -y moosefs-netdump
1413

1514
CMD ["bash", "-l"]

‎Makefile

100644100755
+22-7
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@ help:
1717
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
1818

1919
HUB_USER=unixorn
20-
MOOSEFS_VERSION=3.116
20+
MOOSEFS_VERSION=3.117
2121
PLATFORMS=linux/arm64,linux/amd64,linux/arm/v7
2222

23-
# If this pukes trying to import paho, try running 'poetry install'
24-
# MOOSEFS_VERSION=$(shell poetry run python3 -c 'from ha_mqtt_discoverable import __version__;print(__version__)' )
25-
2623
install_hooks: ## Install the git hooks
2724
poetry run pre-commit install
2825

@@ -34,7 +31,6 @@ multiarch_cgiserver: ## Makes a moosefs-cgiserver multi-architecture docker imag
3431
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-cgiserver:latest -f Dockerfile.cgiserver .
3532
docker pull ${HUB_USER}/moosefs-cgiserver:latest
3633

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

@@ -43,6 +39,13 @@ multiarch_chunkserver: ## Makes a moosefs-chunkserver multi-architecture docker
4339
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-chunkserver:latest -f Dockerfile.chunkserver .
4440
docker pull ${HUB_USER}/moosefs-chunkserver:latest
4541

42+
local_cli: ## Makes a moosefs-cli docker image for only the architecture we're running on. Does not push to dockerhub.
43+
docker buildx build --pull --load -t ${HUB_USER}/moosefs-cli -f Dockerfile.cli .
44+
45+
multiarch_cli: ## Makes a moosefs-cli multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
46+
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-cli:$(MOOSEFS_VERSION) -f Dockerfile.cli .
47+
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-cli:latest -f Dockerfile.cli .
48+
docker pull ${HUB_USER}/moosefs-cli:latest
4649

4750
local_master: ## Makes a moosefs-master docker image for only the architecture we're running on. Does not push to dockerhub.
4851
docker buildx build --pull --load -t ${HUB_USER}/moosefs-master -f Dockerfile.master .
@@ -60,13 +63,25 @@ multiarch_metalogger: ## Makes a moosefs-metalogger multi-architecture docker im
6063
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-metalogger:latest -f Dockerfile.metalogger .
6164
docker pull ${HUB_USER}/moosefs-metalogger:latest
6265

66+
local_netdump: ## Makes a moosefs-netdump docker image for only the architecture we're running on. Does not push to dockerhub.
67+
docker buildx build --pull --load -t ${HUB_USER}/moosefs-netdump -f Dockerfile.netdump .
68+
69+
multiarch_netdump: ## Makes a moosefs-netdump multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
70+
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-netdump:$(MOOSEFS_VERSION) -f Dockerfile.netdump .
71+
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-netdump:latest -f Dockerfile.netdump .
72+
docker pull ${HUB_USER}/moosefs-netdump:latest
73+
6374
local: local_cgiserver \ ## Make images for whatever architecture you're running on, but does not push to docker hub
6475
local_chunkserver \
76+
local_cli \
6577
local_master \
66-
local_metalogger
78+
local_metalogger \
79+
local_netdump
6780

6881
multiarch_images: multiarch ## Builds multi-architecture docker images for all the services and pushes them to docker hub
6982
multiarch: multiarch_cgiserver \
7083
multiarch_chunkserver \
84+
multiarch_cli \
7185
multiarch_master \
72-
multiarch_metalogger
86+
multiarch_metalogger \
87+
multiarch_netdump

‎Readme.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ The following multi-architecture (`arm64`, `armh/v7`, `amd64`) images are availa
1515

1616
- unixorn/moosefs-cgiserver
1717
- unixorn/moosefs-chunkserver
18+
- unixorn/moosefs-cli
1819
- unixorn/moosefs-master
1920
- unixorn/moosefs-metalogger
21+
- unixorn/moosefs-netdump
2022

2123
## Building
2224

2325
You can make the images yourself with `make multiarch_images`.
2426

2527
If you need to support a platform other than `arm64`, `armh/v7` or `amd64`, the easiest thing to do is to edit the Makefile and change `HUB_USER` to your docker hub username and update `PLATFORMS` to include whatever other architectures you need, then run `make multiarch_images` to build new images.
2628

27-
This allows you to use just `your-hub-username/imagename` in your docker-compose files or kubernetes deployments and not have different image names for different architectures.
29+
This allows you to use `your-hub-username/imagename` in your docker-compose files or kubernetes deployments and not have to use different image names for different architectures.

0 commit comments

Comments
 (0)