diff --git a/.env.sample b/.env.sample index 06c117c..878bd29 100644 --- a/.env.sample +++ b/.env.sample @@ -1 +1,2 @@ -DOCKER_NODE_VERSION=15.13.0-alpine +DOCKER_NODE_VERSION=15.14.0-alpine +DOCKER_NGINX_VERSION=1.20.0-alpine diff --git a/README.md b/README.md index fb23ab8..0fb4b03 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ This repo aims to create a one-stop script which would allow the setup of a MERN - docker-compose - wget +Tested working with Ubuntu 20.04 + # Setup ```bash @@ -27,10 +29,12 @@ Note: Ignore `Git repo not initialized Error: Command failed: git --version` whe ## Production ```bash -$ docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d --build +$ docker-compose -f docker-compose.yml -f docker-compose.prod.yml -f docker-compose.http.yml up -d --build ``` -Add `-f docker-compose.ssl.yml` for SSL setup +Add `-f docker-compose.ssl.yml` for SSL setup and remove `-f docker-compose.http.yml`. + +_TIP_: Make a bash file that runs the above for you. This functionality will be added later. ## Development diff --git a/docker-compose.http.yml b/docker-compose.http.yml new file mode 100644 index 0000000..63c5b34 --- /dev/null +++ b/docker-compose.http.yml @@ -0,0 +1,5 @@ +version: "3.3" +services: + nginx: + ports: + - "80:80" diff --git a/nginx/Dockerfile b/nginx/Dockerfile index abb6ad2..9728533 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,5 +1,6 @@ -# Pull in the from the official nginx image. -FROM nginx +ARG DOCKER_NGINX_VERSION + +FROM nginx:$DOCKER_NGINX_VERSION EXPOSE 80