diff --git a/bastion/Dockerfile b/bastion/Dockerfile index 6ec38da..95a7725 100644 --- a/bastion/Dockerfile +++ b/bastion/Dockerfile @@ -24,7 +24,6 @@ RUN addgroup -S -g ${GID} ${GROUP} \ && echo -e "\nLogin Successful! \n\nHowever, interactive sessions not allowed. Use \"-N\" with ssh tunnel command instead: \n" > /etc/motd \ && echo -e "\tssh -N -L 5432:CONTAINER-NAME:5432 bastion@PUBLIC-IP-OR-DNS -p 22222\n" >> /etc/motd \ && chmod +x /usr/sbin/bastion \ - && chmod +x /usr/sbin/get_keys.sh \ && mkdir -p ${HOST_KEYS_PATH} \ && mkdir /etc/ssh/auth_principals \ && echo "bastion" > /etc/ssh/auth_principals/bastion diff --git a/package.json b/package.json index cd0f41c..b6abead 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "postinstall": "cd couch2pg && npm ci", "test:e2e": "npm run test:e2e-data && npm run test:e2e-containers && mocha tests/**/*.spec.js --timeout 50000; npm run test:e2e-stop-containers ", "lint": "eslint --color --cache .", - "test:e2e-stop-containers": "docker compose --env-file ./tests/.e2e-env -f docker-compose.yml -f docker-compose.couchdb.yml -f docker-compose.postgres.yml -f docker-compose.pgadmin.yml down -v", - "test:e2e-containers": "docker compose --env-file ./tests/.e2e-env -f docker-compose.yml -f docker-compose.couchdb.yml -f docker-compose.postgres.yml -f tests/dbt/docker-compose.yml -f docker-compose.pgadmin.yml up -d --build --force-recreate", + "test:e2e-stop-containers": "docker compose --env-file ./tests/.e2e-env -f docker-compose.yml -f docker-compose.couchdb.yml -f docker-compose.postgres.yml -f tests/dbt/docker-compose.yml -f docker-compose.bastion.yml down -v", + "test:e2e-containers": "docker compose --env-file ./tests/.e2e-env -f docker-compose.yml -f docker-compose.couchdb.yml -f docker-compose.postgres.yml -f tests/dbt/docker-compose.yml -f docker-compose.bastion.yml up -d --build --force-recreate", "test:e2e-data": "cd tests/data && rm -rf ./json_docs && cht csv-to-docs", "test": "cd couch2pg && npm run test" }, diff --git a/tests/utils/private-bastion-ssh-key b/tests/utils/bastion-ssh-key-private similarity index 100% rename from tests/utils/private-bastion-ssh-key rename to tests/utils/bastion-ssh-key-private