diff --git a/backend/.dockerignore b/backend/.dockerignore index 31f5b28f3..25a941824 100644 --- a/backend/.dockerignore +++ b/backend/.dockerignore @@ -15,7 +15,7 @@ node_modules/ scripts/ dist/ -db-migration-worker/ +maintenance-worker/ neo4j/ public/uploads/* diff --git a/backend/db-migration-worker/.ssh/known_hosts b/backend/db-migration-worker/.ssh/known_hosts deleted file mode 100644 index 947840cb2..000000000 --- a/backend/db-migration-worker/.ssh/known_hosts +++ /dev/null @@ -1,3 +0,0 @@ -|1|GuOYlVEhTowidPs18zj9p5F2j3o=|sDHJYLz9Ftv11oXeGEjs7SpVyg0= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBM5N29bI5CeKu1/RBPyM2fwyf7fuajOO+tyhKe1+CC2sZ1XNB5Ff6t6MtCLNRv2mUuvzTbW/HkisDiA5tuXUHOk= -|1|2KP9NV+Q5g2MrtjAeFSVcs8YeOI=|nf3h4wWVwC4xbBS1kzgzE2tBldk= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNhRK6BeIEUxXlS0z/pOfkUkSPfn33g4J1U3L+MyUQYHm+7agT08799ANJhnvELKE1tt4Vx80I9UR81oxzZcy3E= -|1|HonYIRNhKyroUHPKU1HSZw0+Qzs=|5T1btfwFBz2vNSldhqAIfTbfIgQ= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNhRK6BeIEUxXlS0z/pOfkUkSPfn33g4J1U3L+MyUQYHm+7agT08799ANJhnvELKE1tt4Vx80I9UR81oxzZcy3E= diff --git a/backend/docker-compose.db-migration.yml b/backend/docker-compose.maintenance.yml similarity index 82% rename from backend/docker-compose.db-migration.yml rename to backend/docker-compose.maintenance.yml index 02f054d1b..943540351 100644 --- a/backend/docker-compose.db-migration.yml +++ b/backend/docker-compose.maintenance.yml @@ -9,14 +9,14 @@ services: - mongo-export:/mongo-export environment: - NEO4J_apoc_import_file_enabled=true - db-migration-worker: + maintenance-worker: build: - context: db-migration-worker + context: maintenance-worker volumes: - mongo-export:/mongo-export - uploads:/uploads - - ./db-migration-worker/migration/:/migration - - ./db-migration-worker/.ssh/:/root/.ssh/ + - ./maintenance-worker/migration/:/migration + - ./maintenance-worker/.ssh/:/root/.ssh/ networks: - hc-network depends_on: diff --git a/backend/db-migration-worker/.dockerignore b/backend/maintenance-worker/.dockerignore similarity index 100% rename from backend/db-migration-worker/.dockerignore rename to backend/maintenance-worker/.dockerignore diff --git a/backend/db-migration-worker/.gitignore b/backend/maintenance-worker/.gitignore similarity index 100% rename from backend/db-migration-worker/.gitignore rename to backend/maintenance-worker/.gitignore diff --git a/backend/db-migration-worker/Dockerfile b/backend/maintenance-worker/Dockerfile similarity index 100% rename from backend/db-migration-worker/Dockerfile rename to backend/maintenance-worker/Dockerfile diff --git a/backend/db-migration-worker/README.md b/backend/maintenance-worker/README.md similarity index 96% rename from backend/db-migration-worker/README.md rename to backend/maintenance-worker/README.md index 3d0f86edd..4b93686ac 100644 --- a/backend/db-migration-worker/README.md +++ b/backend/maintenance-worker/README.md @@ -29,7 +29,7 @@ SSH_USERNAME=username SSH_HOST=some.server.com MONGODB_USERNAME='hc-api' MONGODB Download the remote mongo database: ```bash -docker-compose exec db-migration-worker ./import.sh +docker-compose exec maintenance-worker ./import.sh ``` Import the local download into Neo4J: diff --git a/backend/db-migration-worker/migrate.sh b/backend/maintenance-worker/migrate.sh similarity index 100% rename from backend/db-migration-worker/migrate.sh rename to backend/maintenance-worker/migrate.sh diff --git a/backend/db-migration-worker/migration/mongo/import.sh b/backend/maintenance-worker/migration/mongo/import.sh similarity index 100% rename from backend/db-migration-worker/migration/mongo/import.sh rename to backend/maintenance-worker/migration/mongo/import.sh diff --git a/backend/db-migration-worker/migration/neo4j/badges.cql b/backend/maintenance-worker/migration/neo4j/badges.cql similarity index 100% rename from backend/db-migration-worker/migration/neo4j/badges.cql rename to backend/maintenance-worker/migration/neo4j/badges.cql diff --git a/backend/db-migration-worker/migration/neo4j/categories.cql b/backend/maintenance-worker/migration/neo4j/categories.cql similarity index 100% rename from backend/db-migration-worker/migration/neo4j/categories.cql rename to backend/maintenance-worker/migration/neo4j/categories.cql diff --git a/backend/db-migration-worker/migration/neo4j/comments.cql b/backend/maintenance-worker/migration/neo4j/comments.cql similarity index 100% rename from backend/db-migration-worker/migration/neo4j/comments.cql rename to backend/maintenance-worker/migration/neo4j/comments.cql diff --git a/backend/db-migration-worker/migration/neo4j/contributions.cql b/backend/maintenance-worker/migration/neo4j/contributions.cql similarity index 100% rename from backend/db-migration-worker/migration/neo4j/contributions.cql rename to backend/maintenance-worker/migration/neo4j/contributions.cql diff --git a/backend/db-migration-worker/migration/neo4j/follows.cql b/backend/maintenance-worker/migration/neo4j/follows.cql similarity index 100% rename from backend/db-migration-worker/migration/neo4j/follows.cql rename to backend/maintenance-worker/migration/neo4j/follows.cql diff --git a/backend/db-migration-worker/migration/neo4j/import.sh b/backend/maintenance-worker/migration/neo4j/import.sh similarity index 100% rename from backend/db-migration-worker/migration/neo4j/import.sh rename to backend/maintenance-worker/migration/neo4j/import.sh diff --git a/backend/db-migration-worker/migration/neo4j/shouts.cql b/backend/maintenance-worker/migration/neo4j/shouts.cql similarity index 100% rename from backend/db-migration-worker/migration/neo4j/shouts.cql rename to backend/maintenance-worker/migration/neo4j/shouts.cql diff --git a/backend/db-migration-worker/migration/neo4j/users.cql b/backend/maintenance-worker/migration/neo4j/users.cql similarity index 100% rename from backend/db-migration-worker/migration/neo4j/users.cql rename to backend/maintenance-worker/migration/neo4j/users.cql diff --git a/backend/db-migration-worker/sync_uploads.sh b/backend/maintenance-worker/sync_uploads.sh similarity index 100% rename from backend/db-migration-worker/sync_uploads.sh rename to backend/maintenance-worker/sync_uploads.sh diff --git a/deployment/db-migration-worker.yaml b/deployment/db-migration-worker.yaml index 55743e360..8ee86f11c 100644 --- a/deployment/db-migration-worker.yaml +++ b/deployment/db-migration-worker.yaml @@ -2,7 +2,7 @@ kind: Pod apiVersion: v1 metadata: - name: nitro-db-migration-worker + name: nitro-maintenance-worker namespace: human-connection spec: volumes: @@ -14,11 +14,11 @@ persistentVolumeClaim: claimName: mongo-export-claim containers: - - name: nitro-db-migration-worker - image: humanconnection/db-migration-worker:latest + - name: nitro-maintenance-worker + image: humanconnection/maintenance-worker:latest envFrom: - configMapRef: - name: db-migration-worker + name: maintenance-worker volumeMounts: - name: secret-volume readOnly: false diff --git a/deployment/legacy-migration/deployment-backend.yaml b/deployment/legacy-migration/deployment-backend.yaml index 1adeb0665..1bcb380aa 100644 --- a/deployment/legacy-migration/deployment-backend.yaml +++ b/deployment/legacy-migration/deployment-backend.yaml @@ -8,12 +8,12 @@ template: spec: containers: - - name: nitro-db-migration-worker - image: humanconnection/db-migration-worker:latest + - name: nitro-maintenance-worker + image: humanconnection/maintenance-worker:latest imagePullPolicy: Always envFrom: - configMapRef: - name: db-migration-worker + name: maintenance-worker volumeMounts: - name: secret-volume readOnly: false diff --git a/deployment/legacy-migration/deployment-neo4j.yaml b/deployment/legacy-migration/deployment-neo4j.yaml index 2852b90cb..0f3252984 100644 --- a/deployment/legacy-migration/deployment-neo4j.yaml +++ b/deployment/legacy-migration/deployment-neo4j.yaml @@ -8,12 +8,12 @@ template: spec: containers: - - name: nitro-db-migration-worker - image: humanconnection/db-migration-worker:latest + - name: nitro-maintenance-worker + image: humanconnection/maintenance-worker:latest imagePullPolicy: Always envFrom: - configMapRef: - name: db-migration-worker + name: maintenance-worker env: - name: COMMIT value: