From b6c8acab36dc8952c24ad079c45699568e5d1ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 28 Oct 2020 10:52:07 +0100 Subject: [PATCH] Change docker repository to develop-webapp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - nitro-web —> develop-webapp --- deployment/helm/human-connection/values.yaml | 2 +- deployment/human-connection/deployment-web.yaml | 2 +- deployment/human-connection/maintenance/README.md | 2 +- deployment/legacy-migration/README.md | 2 +- deployment/minikube/README.md | 2 +- docker-compose.build-and-test.yml | 2 +- docker-compose.override.yml | 2 +- docker-compose.yml | 4 ++-- scripts/docker_push.sh | 4 ++-- webapp/Dockerfile | 6 +++--- webapp/Dockerfile.maintenance | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml index 3bf0313a0..4ffaa2a43 100644 --- a/deployment/helm/human-connection/values.yaml +++ b/deployment/helm/human-connection/values.yaml @@ -13,7 +13,7 @@ maintenanceImage: ocelotsocialnetwork/maintenance # neo4jImage is the docker image for the neo4j deployment neo4jImage: ocelotsocialnetwork/neo4j # webappImage is the docker image for the webapp deployment -webappImage: ocelotsocialnetwork/nitro-web +webappImage: ocelotsocialnetwork/develop-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/human-connection/deployment-web.yaml b/deployment/human-connection/deployment-web.yaml index 38b281ac0..242fa33d9 100644 --- a/deployment/human-connection/deployment-web.yaml +++ b/deployment/human-connection/deployment-web.yaml @@ -37,7 +37,7 @@ spec: name: configmap - secretRef: name: human-connection - image: ocelotsocialnetwork/nitro-web:latest + image: ocelotsocialnetwork/develop-webapp:latest imagePullPolicy: Always name: web ports: diff --git a/deployment/human-connection/maintenance/README.md b/deployment/human-connection/maintenance/README.md index 02bcb44e2..3680d5e09 100644 --- a/deployment/human-connection/maintenance/README.md +++ b/deployment/human-connection/maintenance/README.md @@ -31,7 +31,7 @@ E.g. in file `deployment/digital-ocean/https/ingress.yaml` change the following: paths: - path: / backend: - # serviceName: nitro-web + # serviceName: develop-webapp serviceName: maintenance # servicePort: 3000 servicePort: 80 diff --git a/deployment/legacy-migration/README.md b/deployment/legacy-migration/README.md index 7e8b6a205..7cd1489ff 100644 --- a/deployment/legacy-migration/README.md +++ b/deployment/legacy-migration/README.md @@ -45,7 +45,7 @@ $ kubectl --namespace=human-connection get deployments NAME READY UP-TO-DATE AVAILABLE AGE nitro-backend 1/1 1 1 3d11h nitro-neo4j 1/1 1 1 3d11h -nitro-web 2/2 2 2 73d +develop-webapp 2/2 2 2 73d $ kubectl --namespace=human-connection delete deployment nitro-neo4j deployment.extensions "nitro-neo4j" deleted $ kubectl --namespace=human-connection delete deployment nitro-backend diff --git a/deployment/minikube/README.md b/deployment/minikube/README.md index 342675b1b..d5103d66d 100644 --- a/deployment/minikube/README.md +++ b/deployment/minikube/README.md @@ -18,7 +18,7 @@ minikube dashboard, expose the services you want on your host system. For example: ```text -$ minikube service nitro-web --namespace=human-connection +$ minikube service develop-webapp --namespace=human-connection # optionally $ minikube service nitro-backend --namespace=human-connection ``` diff --git a/docker-compose.build-and-test.yml b/docker-compose.build-and-test.yml index 7748f78fd..8796940b7 100644 --- a/docker-compose.build-and-test.yml +++ b/docker-compose.build-and-test.yml @@ -4,7 +4,7 @@ services: webapp: environment: - "CI=${CI}" - image: ocelotsocialnetwork/nitro-web:build-and-test + image: ocelotsocialnetwork/develop-webapp:build-and-test build: context: webapp target: build-and-test diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d8e29abb5..31cd4da37 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -12,7 +12,7 @@ services: context: webapp target: build-and-test volumes: - - ./webapp:/nitro-web + - ./webapp:/develop-webapp environment: - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/` - PUBLIC_REGISTRATION=false diff --git a/docker-compose.yml b/docker-compose.yml index 1b9631ee9..228cf8be7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" services: webapp: - image: ocelotsocialnetwork/nitro-web:latest + image: ocelotsocialnetwork/develop-webapp:latest build: context: webapp target: production @@ -16,7 +16,7 @@ services: depends_on: - backend volumes: - - webapp_node_modules:/nitro-web/node_modules + - webapp_node_modules:/develop-webapp/node_modules environment: - HOST=0.0.0.0 - GRAPHQL_URI=http://backend:4000 diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 137af335b..b417b3a39 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -4,12 +4,12 @@ ROOT_DIR=$(dirname "$0")/.. VERSION=$(jq -r '.version' $ROOT_DIR/package.json) IFS='.' read -r major minor patch <<< $VERSION -apps=(nitro-web nitro-backend neo4j maintenance) +apps=(develop-webapp nitro-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/nitro-backend:latest $ROOT_DIR/backend -# docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT --target production -t ocelotsocialnetwork/nitro-web:latest $ROOT_DIR/webapp +# 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/neo4j:latest $ROOT_DIR/neo4j docker build -t ocelotsocialnetwork/maintenance:latest $ROOT_DIR/webapp/ -f $ROOT_DIR/webapp/Dockerfile.maintenance diff --git a/webapp/Dockerfile b/webapp/Dockerfile index c5025949b..aa64faae2 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -7,7 +7,7 @@ CMD ["yarn", "run", "start"] # Expose the app port ARG BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT -ARG WORKDIR=/nitro-web +ARG WORKDIR=/develop-webapp RUN mkdir -p $WORKDIR WORKDIR $WORKDIR @@ -25,7 +25,7 @@ RUN NODE_ENV=production yarn run build FROM base as production RUN yarn install --production=true --frozen-lockfile --non-interactive --no-cache -COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt -COPY --from=build-and-test ./nitro-web/static ./static +COPY --from=build-and-test ./develop-webapp/.nuxt ./.nuxt +COPY --from=build-and-test ./develop-webapp/static ./static COPY nuxt.config.js . COPY locales locales diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index ca4ba37bc..222d03945 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -7,7 +7,7 @@ CMD ["yarn", "run", "start"] # Expose the app port ARG BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT -ARG WORKDIR=/nitro-web +ARG WORKDIR=/develop-webapp RUN mkdir -p $WORKDIR WORKDIR $WORKDIR @@ -35,6 +35,6 @@ RUN yarn run generate FROM nginx:alpine -COPY --from=build ./nitro-web/dist/ /usr/share/nginx/html/ +COPY --from=build ./develop-webapp/dist/ /usr/share/nginx/html/ RUN rm /etc/nginx/conf.d/default.conf COPY maintenance/nginx/custom.conf /etc/nginx/conf.d/