From 289e62ddb49170a2a810927fbc5dc002abe3e6e1 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 22 Jan 2021 14:14:34 +0100 Subject: [PATCH] corrected image & service names --- deployment/helm/ocelot.social/values.yaml | 8 ++++---- deployment/legacy-migration/README.md | 14 +++++++------- deployment/minikube/README.md | 4 ++-- scripts/deploy.sh | 4 ++-- scripts/docker_push.sh | 10 +++++----- webapp/Dockerfile | 4 +--- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/deployment/helm/ocelot.social/values.yaml b/deployment/helm/ocelot.social/values.yaml index 42eed0c7b..4c15c99a7 100644 --- a/deployment/helm/ocelot.social/values.yaml +++ b/deployment/helm/ocelot.social/values.yaml @@ -7,13 +7,13 @@ dbInitializion: "yarn prod:migrate init" # dbMigrations runs the database migrations in a post-upgrade hook. dbMigrations: "yarn prod:migrate up" # bakendImage is the docker image for the backend deployment -backendImage: ocelotsocialnetwork/develop-backend +backendImage: ocelotsocialnetwork/backend # maintenanceImage is the docker image for the maintenance deployment -maintenanceImage: ocelotsocialnetwork/develop-maintenance +maintenanceImage: ocelotsocialnetwork/maintenance # neo4jImage is the docker image for the neo4j deployment -neo4jImage: ocelotsocialnetwork/develop-neo4j +neo4jImage: ocelotsocialnetwork/neo4j # webappImage is the docker image for the webapp deployment -webappImage: ocelotsocialnetwork/develop-webapp +webappImage: ocelotsocialnetwork/webapp # image configures pullPolicy related to the docker images image: # pullPolicy indicates when, if ever, pods pull a new image from docker hub. diff --git a/deployment/legacy-migration/README.md b/deployment/legacy-migration/README.md index b692305db..66100a3c8 100644 --- a/deployment/legacy-migration/README.md +++ b/deployment/legacy-migration/README.md @@ -43,13 +43,13 @@ Then temporarily delete backend and database deployments ```bash $ kubectl -n ocelot-social get deployments NAME READY UP-TO-DATE AVAILABLE AGE -develop-backend 1/1 1 1 3d11h -develop-neo4j 1/1 1 1 3d11h -develop-webapp 2/2 2 2 73d -$ kubectl -n ocelot-social delete deployment develop-neo4j -deployment.extensions "develop-neo4j" deleted -$ kubectl -n ocelot-social delete deployment develop-backend -deployment.extensions "develop-backend" deleted +backend 1/1 1 1 3d11h +neo4j 1/1 1 1 3d11h +webapp 2/2 2 2 73d +$ kubectl -n ocelot-social delete deployment neo4j +deployment.extensions "neo4j" deleted +$ kubectl -n ocelot-social delete deployment backend +deployment.extensions "backend" deleted ``` Deploy one-time develop-maintenance-worker pod: diff --git a/deployment/minikube/README.md b/deployment/minikube/README.md index cfa2c4a5c..014f9510c 100644 --- a/deployment/minikube/README.md +++ b/deployment/minikube/README.md @@ -18,8 +18,8 @@ minikube dashboard, expose the services you want on your host system. For example: ```text -$ minikube service develop-webapp --namespace=ocelotsocialnetwork +$ minikube service webapp --namespace=ocelotsocialnetwork # optionally -$ minikube service develop-backend --namespace=ocelotsocialnetwork +$ minikube service backend --namespace=ocelotsocialnetwork ``` diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 77b5501ca..c79223c69 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -2,5 +2,5 @@ sed -i "s//${TRAVIS_COMMIT}/g" $TRAVIS_BUILD_DIR/scripts/patches/patch-deployment.yaml sed -i "s//${TRAVIS_COMMIT}/g" $TRAVIS_BUILD_DIR/scripts/patches/patch-configmap.yaml kubectl -n ocelot-social patch configmap develop-configmap -p "$(cat $TRAVIS_BUILD_DIR/scripts/patches/patch-configmap.yaml)" -kubectl -n ocelot-social patch deployment develop-backend -p "$(cat $TRAVIS_BUILD_DIR/scripts/patches/patch-deployment.yaml)" -kubectl -n ocelot-social patch deployment develop-webapp -p "$(cat $TRAVIS_BUILD_DIR/scripts/patches/patch-deployment.yaml)" +kubectl -n ocelot-social patch deployment backend -p "$(cat $TRAVIS_BUILD_DIR/scripts/patches/patch-deployment.yaml)" +kubectl -n ocelot-social patch deployment webapp -p "$(cat $TRAVIS_BUILD_DIR/scripts/patches/patch-deployment.yaml)" diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index b1ae8fbc0..90e0fb8c1 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -4,14 +4,14 @@ ROOT_DIR=$(dirname "$0")/.. VERSION=$(jq -r '.version' $ROOT_DIR/package.json) IFS='.' read -r major minor patch <<< $VERSION -apps=(develop-webapp develop-backend develop-neo4j develop-maintenance) +apps=(webapp backend neo4j maintenance) tags=($major $major.$minor $major.$minor.$patch) # These three docker images have already been built by now: -# 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/develop-maintenance:latest $ROOT_DIR/webapp/ -f $ROOT_DIR/webapp/Dockerfile.maintenance +# docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT --target production -t ocelotsocialnetwork/backend:latest $ROOT_DIR/backend +# docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT --target production -t ocelotsocialnetwork/webapp:latest $ROOT_DIR/webapp +# docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT -t ocelotsocialnetwork/neo4j:latest $ROOT_DIR/neo4j +docker build -t ocelotsocialnetwork/maintenance:latest $ROOT_DIR/webapp/ -f $ROOT_DIR/webapp/Dockerfile.maintenance echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin diff --git a/webapp/Dockerfile b/webapp/Dockerfile index 84269c459..d6b186e1e 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -85,6 +85,4 @@ COPY --from=build ${DOCKER_WORKDIR}/locales ./locales RUN yarn install --production=true --frozen-lockfile --non-interactive --no-cache # Run command -CMD /bin/sh -c "yarn run start" - - +CMD /bin/sh -c "yarn run start" \ No newline at end of file