diff --git a/deployment/human-connection/maintenance/Dockerfile b/deployment/human-connection/maintenance/Dockerfile deleted file mode 100644 index 4681356ab..000000000 --- a/deployment/human-connection/maintenance/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:alpine -COPY ./onourjourney.svg /usr/share/nginx/html/ -COPY ./maintenance.html /usr/share/nginx/html/index.html diff --git a/deployment/human-connection/maintenance/maintenance.html b/deployment/human-connection/maintenance/maintenance.html deleted file mode 100644 index 906286342..000000000 --- a/deployment/human-connection/maintenance/maintenance.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - -
-

- At the moment we are doing some scheduled maintenance, please try again - later. -

- Maintenance mode image -

- Any Questions or concerns, send an email to
- -

-
- diff --git a/deployment/human-connection/maintenance/onourjourney.svg b/deployment/human-connection/maintenance/onourjourney.svg deleted file mode 100644 index 0950b7532..000000000 --- a/deployment/human-connection/maintenance/onourjourney.svg +++ /dev/null @@ -1,360 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml index c029ffb6b..52168c221 100644 --- a/docker-compose.maintenance.yml +++ b/docker-compose.maintenance.yml @@ -1,7 +1,7 @@ version: "3.4" services: - maintenance: + maintenance-worker: image: humanconnection/maintenance-worker:latest build: context: deployment/legacy-migration/maintenance-worker diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d4b06fc7a..5ef013656 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -64,6 +64,15 @@ services: - 7474:7474 volumes: - neo4j-data:/data + maintenance: + image: humanconnection/maintenance:latest + build: + context: webapp + dockerfile: Dockerfile.maintenance + networks: + - hc-network + ports: + - 3503:80 volumes: webapp_node_modules: diff --git a/docker-compose.yml b/docker-compose.yml index 45e2cdfdf..e782adcfa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,6 @@ services: target: production ports: - 3000:3000 - - 8080:8080 networks: - hc-network environment: @@ -40,14 +39,6 @@ services: context: neo4j networks: - hc-network - maintenance: - image: humanconnection/maintenance:latest - build: - context: deployment/human-connection/maintenance - networks: - - hc-network - ports: - - 80:80 networks: hc-network: diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index fe644c52a..1677b0d3c 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -4,7 +4,7 @@ docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t huma docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web:latest $TRAVIS_BUILD_DIR/webapp docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/neo4j:latest $TRAVIS_BUILD_DIR/neo4j docker build -t humanconnection/maintenance-worker:latest $TRAVIS_BUILD_DIR/deployment/legacy-migration/maintenance-worker -docker build -t humanconnection/maintenance:latest $TRAVIS_BUILD_DIR/deployment/human-connection/maintenance +docker build -t humanconnection/maintenance:latest $TRAVIS_BUILD_DIR/webapp/ -f $TRAVIS_BUILD_DIR/webapp/Dockerfile.maintenance docker push humanconnection/nitro-backend:latest docker push humanconnection/nitro-web:latest docker push humanconnection/neo4j:latest diff --git a/webapp/maintenance/nginx/custom.conf b/webapp/maintenance/nginx/custom.conf index 7e5626f7f..c27f272f9 100644 --- a/webapp/maintenance/nginx/custom.conf +++ b/webapp/maintenance/nginx/custom.conf @@ -5,10 +5,6 @@ server { root /usr/share/nginx/html; index index.html; - # location / { - # try_files $uri $uri/ /index.html; - # } - location ~* \.(?:css|js|map|jpe?g|gif|png|svg|woff|ico)$ { } location / {