"curl" is already installed (#42)

* Move executable in bin Signed-off-by: Jean-Yves <[email protected]> * Update Dockerfile Signed-off-by: Jean-Yves <[email protected]> * Update shellcheck.yml Signed-off-by: Jean-Yves <[email protected]> --------- Signed-off-by: Jean-Yves <[email protected]>
docjyJ · Dec 8, 2024 · 81b6d2e · 81b6d2e
1 parent b36f933
commit 81b6d2e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -4,11 +4,13 @@ on:
   pull_request:
     paths:
       - '**.sh'
+      - '/bin/*'
   push:
     branches:
       - main
     paths:
       - '**.sh'
+      - '/bin/*'
 
 jobs:
   shellcheck:

diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,12 @@
 # From https://github.com/stalwartlabs/mail-server/blob/main/Dockerfile
 FROM stalwartlabs/mail-server:v0.10.6
 
-COPY --chmod=775 entrypoint.sh /entrypoint.sh
-COPY --chmod=775 healthcheck.sh /healthcheck.sh
-COPY --chmod=775 webadmin.sh /webadmin.sh
-
-RUN apt-get install  --no-install-recommends -y curl=7.88.1-10+deb12u7
+COPY --chmod=775 bin/* /usr/local/bin/
 
 EXPOSE 10003
 
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s \
-  CMD bash /healthcheck.sh
+  CMD bash /usr/local/bin/healthcheck
 
-ENTRYPOINT [ "/entrypoint.sh" ]
+ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
 CMD ["/usr/local/bin/stalwart-mail", "--config", "/opt/stalwart-mail/etc/config.toml"]
diff --git a/entrypoint.sh → bin/entrypoint b/entrypoint.sh → bin/entrypoint
diff --git a/healthcheck.sh → bin/healthcheck b/healthcheck.sh → bin/healthcheck
diff --git a/webadmin.sh → bin/update-webadmin b/webadmin.sh → bin/update-webadmin