DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-23 11:43:47 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge pull request #15358 from r-xyz/rename-docker-startup
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details

Browse source 
Renamed  docker startup scripts coherently.
This commit is contained in:
snipe 2024-08-21 13:02:50 +01:00 committed by GitHub
parent 01c4fe6113 1ab29ec3a4
commit 6fdce3c536
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile.alpine
View file

@ -79,12 +79,12 @@ USER root
VOLUME ["/var/lib/snipeit"] VOLUME ["/var/lib/snipeit"]
# Entrypoints # Startup script
COPY docker/entrypoint_alpine.sh /entrypoint.sh COPY docker/startup_alpine.sh /startup.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /startup.sh
ENTRYPOINT ["/sbin/tini", "--"] ENTRYPOINT ["/sbin/tini", "--"]
CMD ["/entrypoint.sh"] CMD ["/startup.sh"]
EXPOSE 80 EXPOSE 80

6
Dockerfile.fpm-alpine
View file

@ -97,7 +97,7 @@ RUN set -eux; \
VOLUME [ "/var/lib/snipeit" ] VOLUME [ "/var/lib/snipeit" ]
COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env 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 COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ] ENTRYPOINT [ "/startup.sh" ]
CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ] CMD [ "/startup.sh", "php-fpm" ]

0
docker/entrypoint_alpine.sh → docker/startup_alpine.sh
View file

0
docker/docker-entrypoint.sh → docker/startup_alpine_fpm.sh
View file