Skip to content

Commit f04a9d0

Browse files
authored
Merge pull request #5 from unixorn/initial-code-drop
Initial code drop
2 parents f29a41f + 2b399d6 commit f04a9d0

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

.github/workflows/awesomebot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
fetch-depth: 0
2121
- uses: docker://dkhamsing/awesome_bot:latest
2222
with:
23-
args: /github/workspace/README.md --allow-ssl --allow 500,501,502,503,504,509,521 --allow-dupe --allow-redirect --request-delay 1 --white-list https://github,https://img.shields.io
23+
args: /github/workspace/Readme.md --allow-ssl --allow 500,501,502,503,504,509,521 --allow-dupe --allow-redirect --request-delay 1 --white-list https://github,https://img.shields.io

Dockerfile.cgiserver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ RUN update-ca-certificates
1212
RUN apt-get install -y moosefs-cgiserv
1313
LABEL description="moosefs-cgiserv image"
1414

15-
CMD ["bash", "-l"]
15+
CMD ["/usr/sbin/mfscgiserv", "start"]

Dockerfile.chunkserver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ RUN update-ca-certificates
1212
RUN apt-get install -y moosefs-chunkserver
1313
LABEL description="moosefs-chunkserver image"
1414

15-
CMD ["bash", "-l"]
15+
CMD ["/usr/sbin/mfschunkserver", "start"]

Dockerfile.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ RUN update-ca-certificates
1212
RUN apt-get install -y moosefs-master
1313
LABEL description="moosefs-master image"
1414

15-
CMD ["bash", "-l"]
15+
CMD ["/usr/sbin/mfsmaster", "start"]

Dockerfile.metalogger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ RUN update-ca-certificates
1212
RUN apt-get install -y moosefs-metalogger
1313

1414
LABEL description="moosefs-metalogger image"
15-
CMD ["bash", "-l"]
15+
CMD ["/usr/sbin/mfsmetalogger", "start"]

Makefile

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,43 +27,45 @@ install_hooks: ## Install the git hooks
2727
poetry run pre-commit install
2828

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

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

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

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

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

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

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

5658
multiarch_metalogger: ## Makes a moosefs-metalogger multi-architecture docker image for linux/arm64, linux/amd64 and linux/arm/v7 and pushes it to dockerhub
57-
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-metalogger:$(MOOSEFS_VERSION) -f Dockerfile.metalogger .
58-
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --push -t ${HUB_USER}/moosefs-metalogger:latest -f Dockerfile.metalogger .
59-
make local_metalogger
59+
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-metalogger:$(MOOSEFS_VERSION) -f Dockerfile.metalogger .
60+
docker buildx build --build-arg application_version=${MOOSEFS_VERSION} --platform ${PLATFORMS} --pull --push -t ${HUB_USER}/moosefs-metalogger:latest -f Dockerfile.metalogger .
61+
docker pull ${HUB_USER}/moosefs-metalogger:latest
6062

6163
local: local_cgiserver \ ## Make images for whatever architecture you're running on, but does not push to docker hub
6264
local_chunkserver \
6365
local_master \
6466
local_metalogger
6567

66-
multiarch_images: ## Builds multi-architecture docker images for all the services and pushes them to docker hub
68+
multiarch_images: multiarch ## Builds multi-architecture docker images for all the services and pushes them to docker hub
6769
multiarch: multiarch_cgiserver \
6870
multiarch_chunkserver \
6971
multiarch_master \

0 commit comments

Comments
 (0)