From 360f545fb70904e18d8477b1583fd6d133cc701a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 28 Oct 2020 10:36:14 +0100 Subject: [PATCH] Change docker account MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - humanconnection —> ocelotsocialnetwork --- deployment/helm/human-connection/values.yaml | 8 ++++---- deployment/human-connection/deployment-backend.yaml | 2 +- deployment/human-connection/deployment-neo4j.yaml | 2 +- deployment/human-connection/deployment-web.yaml | 2 +- .../maintenance/deployment-maintenance.yaml | 2 +- deployment/legacy-migration/maintenance-worker.yaml | 2 +- .../legacy-migration/maintenance-worker/Dockerfile | 2 +- docker-compose.build-and-test.yml | 4 ++-- docker-compose.maintenance.yml | 2 +- docker-compose.override.yml | 2 +- docker-compose.yml | 6 +++--- scripts/docker_push.sh | 12 ++++++------ 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/deployment/helm/human-connection/values.yaml b/deployment/helm/human-connection/values.yaml index f30704f89..3bf0313a0 100644 --- a/deployment/helm/human-connection/values.yaml +++ b/deployment/helm/human-connection/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: humanconnection/nitro-backend +backendImage: ocelotsocialnetwork/nitro-backend # maintenanceImage is the docker image for the maintenance deployment -maintenanceImage: humanconnection/maintenance +maintenanceImage: ocelotsocialnetwork/maintenance # neo4jImage is the docker image for the neo4j deployment -neo4jImage: humanconnection/neo4j +neo4jImage: ocelotsocialnetwork/neo4j # webappImage is the docker image for the webapp deployment -webappImage: humanconnection/nitro-web +webappImage: ocelotsocialnetwork/nitro-web # 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-backend.yaml b/deployment/human-connection/deployment-backend.yaml index 00aab9ffd..3a0c25166 100644 --- a/deployment/human-connection/deployment-backend.yaml +++ b/deployment/human-connection/deployment-backend.yaml @@ -36,7 +36,7 @@ spec: name: configmap - secretRef: name: human-connection - image: humanconnection/nitro-backend:latest + image: ocelotsocialnetwork/nitro-backend:latest imagePullPolicy: Always name: backend ports: diff --git a/deployment/human-connection/deployment-neo4j.yaml b/deployment/human-connection/deployment-neo4j.yaml index 5ff67b1a6..aefe07faa 100644 --- a/deployment/human-connection/deployment-neo4j.yaml +++ b/deployment/human-connection/deployment-neo4j.yaml @@ -31,7 +31,7 @@ spec: - envFrom: - configMapRef: name: configmap - image: humanconnection/neo4j:latest + image: ocelotsocialnetwork/neo4j:latest imagePullPolicy: Always name: neo4j ports: diff --git a/deployment/human-connection/deployment-web.yaml b/deployment/human-connection/deployment-web.yaml index db9c22a1f..38b281ac0 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: humanconnection/nitro-web:latest + image: ocelotsocialnetwork/nitro-web:latest imagePullPolicy: Always name: web ports: diff --git a/deployment/human-connection/maintenance/deployment-maintenance.yaml b/deployment/human-connection/maintenance/deployment-maintenance.yaml index fbbeec639..7602891a3 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: humanconnection/maintenance:latest + image: ocelotsocialnetwork/maintenance:latest ports: - containerPort: 80 imagePullPolicy: Always diff --git a/deployment/legacy-migration/maintenance-worker.yaml b/deployment/legacy-migration/maintenance-worker.yaml index 37c46ab45..8bcf7aa01 100644 --- a/deployment/legacy-migration/maintenance-worker.yaml +++ b/deployment/legacy-migration/maintenance-worker.yaml @@ -7,7 +7,7 @@ spec: containers: - name: nitro-maintenance-worker - image: humanconnection/maintenance-worker:latest + image: ocelotsocialnetwork/maintenance-worker:latest imagePullPolicy: Always resources: requests: diff --git a/deployment/legacy-migration/maintenance-worker/Dockerfile b/deployment/legacy-migration/maintenance-worker/Dockerfile index 4502d8d69..e4ce3eba4 100644 --- a/deployment/legacy-migration/maintenance-worker/Dockerfile +++ b/deployment/legacy-migration/maintenance-worker/Dockerfile @@ -1,4 +1,4 @@ -FROM humanconnection/neo4j:latest +FROM ocelotsocialnetwork/neo4j:latest ENV NODE_ENV=maintenance EXPOSE 7687 7474 diff --git a/docker-compose.build-and-test.yml b/docker-compose.build-and-test.yml index 27aa9fc6b..7748f78fd 100644 --- a/docker-compose.build-and-test.yml +++ b/docker-compose.build-and-test.yml @@ -4,14 +4,14 @@ services: webapp: environment: - "CI=${CI}" - image: humanconnection/nitro-web:build-and-test + image: ocelotsocialnetwork/nitro-web:build-and-test build: context: webapp target: build-and-test backend: environment: - "CI=${CI}" - image: humanconnection/nitro-backend:build-and-test + image: ocelotsocialnetwork/nitro-backend:build-and-test build: context: backend target: build-and-test diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml index b6a869c57..ebef3ad4e 100644 --- a/docker-compose.maintenance.yml +++ b/docker-compose.maintenance.yml @@ -2,7 +2,7 @@ version: "3.4" services: maintenance-worker: - image: humanconnection/maintenance-worker:latest + image: ocelotsocialnetwork/maintenance-worker:latest build: context: deployment/legacy-migration/maintenance-worker volumes: diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 56f13939e..d8e29abb5 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -31,7 +31,7 @@ services: - "DEBUG=${DEBUG}" - PUBLIC_REGISTRATION=false maintenance: - image: humanconnection/maintenance:latest + image: ocelotsocialnetwork/maintenance:latest build: context: webapp dockerfile: Dockerfile.maintenance diff --git a/docker-compose.yml b/docker-compose.yml index 7b0c00163..1b9631ee9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" services: webapp: - image: humanconnection/nitro-web:latest + image: ocelotsocialnetwork/nitro-web:latest build: context: webapp target: production @@ -22,7 +22,7 @@ services: - GRAPHQL_URI=http://backend:4000 - MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.bZ8KK9l70omjXbEkkbHGsQ" backend: - image: humanconnection/nitro-backend:latest + image: ocelotsocialnetwork/nitro-backend:latest build: context: backend target: production @@ -46,7 +46,7 @@ services: - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78 - "DEBUG=${DEBUG}" neo4j: - image: humanconnection/neo4j:latest + image: ocelotsocialnetwork/neo4j:latest build: context: neo4j args: diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 3c746af92..137af335b 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -8,22 +8,22 @@ apps=(nitro-web 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 humanconnection/nitro-backend:latest $ROOT_DIR/backend -# docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT --target production -t humanconnection/nitro-web:latest $ROOT_DIR/webapp -# docker build --build-arg BUILD_COMMIT=$BUILD_COMMIT -t humanconnection/neo4j:latest $ROOT_DIR/neo4j -docker build -t humanconnection/maintenance:latest $ROOT_DIR/webapp/ -f $ROOT_DIR/webapp/Dockerfile.maintenance +# 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 -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 for app in "${apps[@]}" do - SOURCE="humanconnection/${app}:latest" + SOURCE="ocelotsocialnetwork/${app}:latest" echo "docker push $SOURCE" docker push $SOURCE for tag in "${tags[@]}" do - TARGET="humanconnection/${app}:${tag}" + TARGET="ocelotsocialnetwork/${app}:${tag}" if DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect $TARGET >/dev/null; then echo "docker image ${TARGET} already present, skipping ..." else