From b6e14f91fe7105e251cbf653048b9990947b53cc Mon Sep 17 00:00:00 2001 From: frikky Date: Sat, 23 May 2020 10:59:51 +0200 Subject: [PATCH] Ready for new update --- .env | 1 + docker-compose.yml | 5 +++-- frontend/run.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 101e99be..7db22dd5 100644 --- a/.env +++ b/.env @@ -11,4 +11,5 @@ APP_DOWNLOAD_AUTH_PASSWORD="" BACKEND_HOSTNAME=shuffle-backend BACKEND_PORT=5010 FRONTEND_PORT=3001 +FRONTEND_PORT_HTTPS=3443 OUTER_HOSTNAME=shuffle-backend diff --git a/docker-compose.yml b/docker-compose.yml index d5089e24..e04cdbbe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,13 @@ version: '3' services: frontend: - build: ./frontend + #build: ./frontend image: frikky/shuffle:frontend container_name: shuffle-frontend hostname: shuffle-frontend ports: - "${FRONTEND_PORT}:80" - - "3002:443" + - "${FRONTEND_PORT_HTTPS}:443" networks: - shuffle restart: unless-stopped @@ -57,6 +57,7 @@ services: - ORG_ID=${ORG_ID} - ENVIRONMENT_NAME=${ENVIRONMENT_NAME} - BASE_URL=http://${OUTER_HOSTNAME}:${BACKEND_PORT} + - DOCKER_API_VERSION=1.40 restart: unless-stopped networks: shuffle: diff --git a/frontend/run.sh b/frontend/run.sh index 2e2737b5..c0253440 100755 --- a/frontend/run.sh +++ b/frontend/run.sh @@ -11,7 +11,7 @@ echo "Starting server" # Rerun build locally for it to update :) docker run -it \ -p 3001:80 \ - -p 3443:443 \ + -p 3002:443 \ -v $(pwd)/build:/usr/share/nginx/html:ro \ --rm \ nginx