Change docker repository to develop-webapp

- nitro-web  —>  develop-webapp
This commit is contained in:
Wolfgang Huß 2020-10-28 10:52:07 +01:00
parent 360f545fb7
commit b6c8acab36
11 changed files with 16 additions and 16 deletions

View File

@ -13,7 +13,7 @@ maintenanceImage: ocelotsocialnetwork/maintenance
# neo4jImage is the docker image for the neo4j deployment # neo4jImage is the docker image for the neo4j deployment
neo4jImage: ocelotsocialnetwork/neo4j neo4jImage: ocelotsocialnetwork/neo4j
# webappImage is the docker image for the webapp deployment # 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 configures pullPolicy related to the docker images
image: image:
# pullPolicy indicates when, if ever, pods pull a new image from docker hub. # pullPolicy indicates when, if ever, pods pull a new image from docker hub.

View File

@ -37,7 +37,7 @@ spec:
name: configmap name: configmap
- secretRef: - secretRef:
name: human-connection name: human-connection
image: ocelotsocialnetwork/nitro-web:latest image: ocelotsocialnetwork/develop-webapp:latest
imagePullPolicy: Always imagePullPolicy: Always
name: web name: web
ports: ports:

View File

@ -31,7 +31,7 @@ E.g. in file `deployment/digital-ocean/https/ingress.yaml` change the following:
paths: paths:
- path: / - path: /
backend: backend:
# serviceName: nitro-web # serviceName: develop-webapp
serviceName: maintenance serviceName: maintenance
# servicePort: 3000 # servicePort: 3000
servicePort: 80 servicePort: 80

View File

@ -45,7 +45,7 @@ $ kubectl --namespace=human-connection get deployments
NAME READY UP-TO-DATE AVAILABLE AGE NAME READY UP-TO-DATE AVAILABLE AGE
nitro-backend 1/1 1 1 3d11h nitro-backend 1/1 1 1 3d11h
nitro-neo4j 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 $ kubectl --namespace=human-connection delete deployment nitro-neo4j
deployment.extensions "nitro-neo4j" deleted deployment.extensions "nitro-neo4j" deleted
$ kubectl --namespace=human-connection delete deployment nitro-backend $ kubectl --namespace=human-connection delete deployment nitro-backend

View File

@ -18,7 +18,7 @@ minikube dashboard, expose the services you want on your host system.
For example: For example:
```text ```text
$ minikube service nitro-web --namespace=human-connection $ minikube service develop-webapp --namespace=human-connection
# optionally # optionally
$ minikube service nitro-backend --namespace=human-connection $ minikube service nitro-backend --namespace=human-connection
``` ```

View File

@ -4,7 +4,7 @@ services:
webapp: webapp:
environment: environment:
- "CI=${CI}" - "CI=${CI}"
image: ocelotsocialnetwork/nitro-web:build-and-test image: ocelotsocialnetwork/develop-webapp:build-and-test
build: build:
context: webapp context: webapp
target: build-and-test target: build-and-test

View File

@ -12,7 +12,7 @@ services:
context: webapp context: webapp
target: build-and-test target: build-and-test
volumes: volumes:
- ./webapp:/nitro-web - ./webapp:/develop-webapp
environment: environment:
- NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/` - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
- PUBLIC_REGISTRATION=false - PUBLIC_REGISTRATION=false

View File

@ -2,7 +2,7 @@ version: "3.4"
services: services:
webapp: webapp:
image: ocelotsocialnetwork/nitro-web:latest image: ocelotsocialnetwork/develop-webapp:latest
build: build:
context: webapp context: webapp
target: production target: production
@ -16,7 +16,7 @@ services:
depends_on: depends_on:
- backend - backend
volumes: volumes:
- webapp_node_modules:/nitro-web/node_modules - webapp_node_modules:/develop-webapp/node_modules
environment: environment:
- HOST=0.0.0.0 - HOST=0.0.0.0
- GRAPHQL_URI=http://backend:4000 - GRAPHQL_URI=http://backend:4000

View File

@ -4,12 +4,12 @@ ROOT_DIR=$(dirname "$0")/..
VERSION=$(jq -r '.version' $ROOT_DIR/package.json) VERSION=$(jq -r '.version' $ROOT_DIR/package.json)
IFS='.' read -r major minor patch <<< $VERSION 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) tags=($major $major.$minor $major.$minor.$patch)
# These three docker images have already been built by now: # 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-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 --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 docker build -t ocelotsocialnetwork/maintenance:latest $ROOT_DIR/webapp/ -f $ROOT_DIR/webapp/Dockerfile.maintenance

View File

@ -7,7 +7,7 @@ CMD ["yarn", "run", "start"]
# Expose the app port # Expose the app port
ARG BUILD_COMMIT ARG BUILD_COMMIT
ENV BUILD_COMMIT=$BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT
ARG WORKDIR=/nitro-web ARG WORKDIR=/develop-webapp
RUN mkdir -p $WORKDIR RUN mkdir -p $WORKDIR
WORKDIR $WORKDIR WORKDIR $WORKDIR
@ -25,7 +25,7 @@ RUN NODE_ENV=production yarn run build
FROM base as production FROM base as production
RUN yarn install --production=true --frozen-lockfile --non-interactive --no-cache 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 ./develop-webapp/.nuxt ./.nuxt
COPY --from=build-and-test ./nitro-web/static ./static COPY --from=build-and-test ./develop-webapp/static ./static
COPY nuxt.config.js . COPY nuxt.config.js .
COPY locales locales COPY locales locales

View File

@ -7,7 +7,7 @@ CMD ["yarn", "run", "start"]
# Expose the app port # Expose the app port
ARG BUILD_COMMIT ARG BUILD_COMMIT
ENV BUILD_COMMIT=$BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT
ARG WORKDIR=/nitro-web ARG WORKDIR=/develop-webapp
RUN mkdir -p $WORKDIR RUN mkdir -p $WORKDIR
WORKDIR $WORKDIR WORKDIR $WORKDIR
@ -35,6 +35,6 @@ RUN yarn run generate
FROM nginx:alpine 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 RUN rm /etc/nginx/conf.d/default.conf
COPY maintenance/nginx/custom.conf /etc/nginx/conf.d/ COPY maintenance/nginx/custom.conf /etc/nginx/conf.d/