From f036e2b2a30e4c528c826a80d9acbf6cfddd6494 Mon Sep 17 00:00:00 2001 From: Sajjad Date: Sun, 3 Oct 2021 11:12:53 +0330 Subject: [PATCH] Specify docker images versions Fix unquoted sentences --- Dockerfile | 6 +++--- Dockerfile.alpine | 4 ++-- docker-compose.yml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2acac57289..09e511ba80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM ubuntu:focal -LABEL maintainer Brady Wetherington +FROM ubuntu:20.04 +LABEL maintainer="Brady Wetherington " # 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 \ No newline at end of file diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 77cfe9a073..6adc780924 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -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 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 511dfd35d7..4007a94998 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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