Skip to content

Commit 1ab29ec

Browse files
committed
Rename docker startup scripts coherently.
1 parent d0acf5b commit 1ab29ec

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Dockerfile.alpine

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ USER root
7979

8080
VOLUME ["/var/lib/snipeit"]
8181

82-
# Entrypoints
83-
COPY docker/entrypoint_alpine.sh /entrypoint.sh
84-
RUN chmod +x /entrypoint.sh
82+
# Startup script
83+
COPY docker/startup_alpine.sh /startup.sh
84+
RUN chmod +x /startup.sh
8585

8686
ENTRYPOINT ["/sbin/tini", "--"]
8787

88-
CMD ["/entrypoint.sh"]
88+
CMD ["/startup.sh"]
8989

9090
EXPOSE 80

Dockerfile.fpm-alpine

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ RUN set -eux; \
9797
VOLUME [ "/var/lib/snipeit" ]
9898

9999
COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env
100-
COPY --chmod=655 docker/docker-entrypoint.sh /usr/local/bin/docker-snipeit-entrypoint
100+
COPY --chmod=655 docker/startup_alpine_fpm.sh /startup.sh
101101
COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
102-
ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ]
103-
CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]
102+
ENTRYPOINT [ "/startup.sh" ]
103+
CMD [ "/startup.sh", "php-fpm" ]
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)