diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml index c423104f6..792e22084 100644 --- a/deployment/helm/human-connection/values.yaml +++ b/deployment/helm/human-connection/values.yaml @@ -9,7 +9,7 @@ dbMigrations: "yarn prod:migrate up" # bakendImage is the docker image for the backend deployment backendImage: ocelotsocialnetwork/develop-backend # maintenanceImage is the docker image for the maintenance deployment -maintenanceImage: ocelotsocialnetwork/maintenance +maintenanceImage: ocelotsocialnetwork/develop-maintenance # neo4jImage is the docker image for the neo4j deployment neo4jImage: ocelotsocialnetwork/develop-neo4j # webappImage is the docker image for the webapp deployment diff --git a/deployment/human-connection/maintenance/README.md b/deployment/human-connection/maintenance/README.md index 3680d5e09..5cd61d5e9 100644 --- a/deployment/human-connection/maintenance/README.md +++ b/deployment/human-connection/maintenance/README.md @@ -10,9 +10,10 @@ bring the database into maintenance mode for manual database migrations. ## Deploy the service We prepared sample configuration, so you can simply run: + ```sh # in folder deployment/ -kubectl apply -f human-connection/maintenance +$ kubectl apply -f human-connection/maintenance ``` This will fire up a maintenance service. @@ -23,6 +24,7 @@ Now if you want to have a controlled downtime and you want to bring your application into maintenance mode, you can edit your global ingress server. E.g. in file `deployment/digital-ocean/https/ingress.yaml` change the following: + ```yaml ... @@ -32,12 +34,12 @@ E.g. in file `deployment/digital-ocean/https/ingress.yaml` change the following: - path: / backend: # serviceName: develop-webapp - serviceName: maintenance + serviceName: develop-maintenance # servicePort: 3000 servicePort: 80 ``` -Then run ` kubectl apply -f deployment/digital-ocean/https/ingress.yaml`. If you +Then run `$ kubectl apply -f deployment/digital-ocean/https/ingress.yaml`. If you want to deactivate the maintenance server, just undo the edit and apply the configuration again. diff --git a/deployment/human-connection/maintenance/deployment-maintenance.yaml b/deployment/human-connection/maintenance/deployment-maintenance.yaml index 7602891a3..f84d9bd77 100644 --- a/deployment/human-connection/maintenance/deployment-maintenance.yaml +++ b/deployment/human-connection/maintenance/deployment-maintenance.yaml @@ -19,7 +19,7 @@ spec: env: - name: HOST value: 0.0.0.0 - image: ocelotsocialnetwork/maintenance:latest + image: ocelotsocialnetwork/develop-maintenance:latest ports: - containerPort: 80 imagePullPolicy: Always diff --git a/docker-compose.override.yml b/docker-compose.override.yml index f2dec82dd..7ca6debeb 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -31,7 +31,7 @@ services: - "DEBUG=${DEBUG}" - PUBLIC_REGISTRATION=false maintenance: - image: ocelotsocialnetwork/maintenance:latest + image: ocelotsocialnetwork/develop-maintenance:latest build: context: webapp dockerfile: Dockerfile.maintenance diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index e478b171c..fcf762396 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -11,7 +11,7 @@ tags=($major $major.$minor $major.$minor.$patch) # docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT --target production -t ocelotsocialnetwork/develop-backend:latest $ROOT_DIR/backend # docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT --target production -t ocelotsocialnetwork/develop-webapp:latest $ROOT_DIR/webapp # docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT -t ocelotsocialnetwork/develop-neo4j:latest $ROOT_DIR/neo4j -docker build -t ocelotsocialnetwork/maintenance:latest $ROOT_DIR/webapp/ -f $ROOT_DIR/webapp/Dockerfile.maintenance +docker build -t ocelotsocialnetwork/develop-maintenance:latest $ROOT_DIR/webapp/ -f $ROOT_DIR/webapp/Dockerfile.maintenance echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin