diff --git a/.deploy_dev.sh b/.deploy_dev.sh index 90ab9b3..8806c22 100644 --- a/.deploy_dev.sh +++ b/.deploy_dev.sh @@ -4,13 +4,13 @@ echo "Deploying to development." set -e set -x -#pushd deployment-frontend +pushd deployment-frontend docker-compose down docker pull "$1" docker-compose up -d -#popd +popd set +x set +e diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b82d713..b1ff2b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ deploy_dev: image: alpine:latest environment: name: dev - url: http://web.sik.party:8080 + url: http://web.sik.party:3000 only: - master before_script: diff --git a/Dockerfile b/Dockerfile index e2df8c1..5ecd426 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10 +FROM node:7 ENV IS_DOCKER 1 RUN env diff --git a/docker-compose.yml b/docker-compose.yml index 5bef79a..b823567 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,6 @@ services: image: git.sahkoinsinoorikilta.fi:4567/vtmk/web2.0-frontend # Before you run this file for the first time, make sure # you remove node_modules/ folders in your host machine - command: ["bash", "-c", "if test -d node_modules; then echo node_modules_exists; else cp -a /tmp/node_modules /code; fi && cd /code && npm install && npm run start-prod"] + command: ["bash", "-c", "if test -d node_modules; then echo node_modules_exists; else cp -a /tmp/node_modules /code; fi && cd /code && npm install && npm start"] ports: - - "8080:3000" + - "3000:3000"