From 1ab29ec3a4c7ad902aa95cd35105105eb2ec567d Mon Sep 17 00:00:00 2001
From: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed, 21 Aug 2024 11:52:09 +0200
Subject: [PATCH] Rename  docker startup scripts coherently.

---
 Dockerfile.alpine                                      | 8 ++++----
 Dockerfile.fpm-alpine                                  | 6 +++---
 docker/{entrypoint_alpine.sh => startup_alpine.sh}     | 0
 docker/{docker-entrypoint.sh => startup_alpine_fpm.sh} | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename docker/{entrypoint_alpine.sh => startup_alpine.sh} (100%)
 rename docker/{docker-entrypoint.sh => startup_alpine_fpm.sh} (100%)

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index c08cbbd95c..2c83a1a119 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -79,12 +79,12 @@ USER root
 
 VOLUME ["/var/lib/snipeit"]
 
-# Entrypoints
-COPY docker/entrypoint_alpine.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+# Startup script
+COPY docker/startup_alpine.sh /startup.sh
+RUN chmod +x /startup.sh
 
 ENTRYPOINT ["/sbin/tini", "--"]
 
-CMD ["/entrypoint.sh"]
+CMD ["/startup.sh"]
 
 EXPOSE 80
diff --git a/Dockerfile.fpm-alpine b/Dockerfile.fpm-alpine
index 77302524d4..b7fb272985 100644
--- a/Dockerfile.fpm-alpine
+++ b/Dockerfile.fpm-alpine
@@ -97,7 +97,7 @@ RUN set -eux; \
 VOLUME [ "/var/lib/snipeit" ]
 
 COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env
-COPY --chmod=655 docker/docker-entrypoint.sh /usr/local/bin/docker-snipeit-entrypoint
+COPY --chmod=655 docker/startup_alpine_fpm.sh /startup.sh
 COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
-ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ]
-CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]
+ENTRYPOINT [ "/startup.sh" ]
+CMD [ "/startup.sh", "php-fpm" ]
diff --git a/docker/entrypoint_alpine.sh b/docker/startup_alpine.sh
similarity index 100%
rename from docker/entrypoint_alpine.sh
rename to docker/startup_alpine.sh
diff --git a/docker/docker-entrypoint.sh b/docker/startup_alpine_fpm.sh
similarity index 100%
rename from docker/docker-entrypoint.sh
rename to docker/startup_alpine_fpm.sh