mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 05:04:07 -08:00
Merge pull request #10159 from AL4AL/specify_docker_images_version
Fixed #10158 Specify docker images versions
This commit is contained in:
commit
1457fda508
|
@ -1,5 +1,5 @@
|
|||
FROM ubuntu:focal
|
||||
LABEL maintainer Brady Wetherington <bwetherington@grokability.com>
|
||||
FROM ubuntu:20.04
|
||||
LABEL maintainer="Brady Wetherington <bwetherington@grokability.com>"
|
||||
|
||||
# No need to add `apt-get clean` here, reference:
|
||||
# - https://github.com/snipe/snipe-it/pull/9201
|
||||
|
@ -133,4 +133,4 @@ RUN chmod +x /startup.sh /usr/bin/supervisor-exit-event-listener
|
|||
CMD ["/startup.sh"]
|
||||
|
||||
EXPOSE 80
|
||||
EXPOSE 443
|
||||
EXPOSE 443
|
|
@ -1,4 +1,4 @@
|
|||
FROM alpine:3
|
||||
FROM alpine:3.14.2
|
||||
# Apache + PHP
|
||||
RUN apk add --no-cache \
|
||||
apache2 \
|
||||
|
@ -82,4 +82,4 @@ ENTRYPOINT ["/sbin/tini", "--"]
|
|||
|
||||
CMD ["/entrypoint.sh"]
|
||||
|
||||
EXPOSE 80
|
||||
EXPOSE 80
|
|
@ -7,7 +7,7 @@ services:
|
|||
dockerfile: Dockerfile.alpine
|
||||
container_name: snipeit
|
||||
ports:
|
||||
- 8000:80
|
||||
- "8000:80"
|
||||
volumes:
|
||||
- ./logs:/var/www/html/storage/logs
|
||||
depends_on:
|
||||
|
@ -19,7 +19,7 @@ services:
|
|||
- snipeit-backend
|
||||
|
||||
mariadb:
|
||||
image: mariadb:latest
|
||||
image: mariadb:10.6.4-focal
|
||||
volumes:
|
||||
- db:/var/lib/mysql
|
||||
env_file:
|
||||
|
@ -28,15 +28,15 @@ services:
|
|||
- snipeit-backend
|
||||
|
||||
redis:
|
||||
image: redis:latest
|
||||
image: redis:6.2.5-buster
|
||||
networks:
|
||||
- snipeit-backend
|
||||
|
||||
mailhog:
|
||||
image: mailhog/mailhog:latest
|
||||
image: mailhog/mailhog:v1.0.1
|
||||
ports:
|
||||
# - 1025:1025
|
||||
- 8025:8025
|
||||
- "8025:8025"
|
||||
networks:
|
||||
- snipeit-backend
|
||||
|
||||
|
|
Loading…
Reference in a new issue