From 5a2b2e491303ad125fb11e2f2fa1af811cba7f71 Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 22 Mar 2021 13:00:52 +0100 Subject: [PATCH] Fix variable name MONITORFISH-VERSION --- Makefile | 8 ++++---- infra/remote/data-pipeline/int/start-flows.sh | 2 +- infra/remote/data-pipeline/int/start-server.sh | 2 +- infra/remote/data-pipeline/prod/start-flows.sh | 2 +- infra/remote/data-pipeline/prod/start-server.sh | 2 +- infra/remote/data-pipeline/stop-server.sh | 2 +- infra/remote/docker-compose.yml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index af04bf1ad5..6d9e465458 100644 --- a/Makefile +++ b/Makefile @@ -49,16 +49,16 @@ restart-remote-app: run-local-app: cd infra/local && sudo docker-compose up -d run-pipeline-server-prod: - docker pull docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) + docker pull docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) infra/remote/data-pipeline/prod/start-server.sh run-pipeline-server-int: - docker pull docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) + docker pull docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) infra/remote/data-pipeline/int/start-server.sh run-pipeline-flows-prod: - docker pull docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) && \ + docker pull docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) && \ infra/remote/data-pipeline/start-flows.sh run-pipeline-flows-int: - docker pull docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) && \ + docker pull docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) && \ infra/remote/data-pipeline/start-flows.sh stop-pipeline-server: infra/remote/data-pipeline/stop-server.sh diff --git a/infra/remote/data-pipeline/int/start-flows.sh b/infra/remote/data-pipeline/int/start-flows.sh index 1e3f196a96..153f540fd9 100755 --- a/infra/remote/data-pipeline/int/start-flows.sh +++ b/infra/remote/data-pipeline/int/start-flows.sh @@ -4,5 +4,5 @@ docker run -t --rm --network=host --name monitorfish-pipeline-flows \ -v prefect_flows:/home/monitorfish-pipeline/.prefect \ -u monitorfish-pipeline:"$(getent group di_etlmf | cut -d: -f3)" \ --env-file datascience/.env \ - docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) \ + docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) \ python main.py \ No newline at end of file diff --git a/infra/remote/data-pipeline/int/start-server.sh b/infra/remote/data-pipeline/int/start-server.sh index 338f0306dd..2da4241a88 100755 --- a/infra/remote/data-pipeline/int/start-server.sh +++ b/infra/remote/data-pipeline/int/start-server.sh @@ -3,5 +3,5 @@ docker run -t --rm --network=host --name monitorfish-pipeline-server \ -u monitorfish-pipeline:$(getent group docker | cut --delimiter=":" -f3) \ -v "$(pwd)"/infra/configurations/prefect-server/int:/home/monitorfish-pipeline/.prefect \ - -v /var/run/docker.sock:/var/run/docker.sock docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) \ + -v /var/run/docker.sock:/var/run/docker.sock docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) \ prefect server start --use-volume --volume-path ~/.prefect/server/pg_data --postgres-port "5433" diff --git a/infra/remote/data-pipeline/prod/start-flows.sh b/infra/remote/data-pipeline/prod/start-flows.sh index 680173e86e..8b0ca2f121 100755 --- a/infra/remote/data-pipeline/prod/start-flows.sh +++ b/infra/remote/data-pipeline/prod/start-flows.sh @@ -4,5 +4,5 @@ docker run -t --rm --network=host --name monitorfish-pipeline-flows \ -v prefect_flows:/home/monitorfish-pipeline/.prefect \ -u monitorfish-pipeline:"$(getent group dp_etlmf | cut -d: -f3)" \ --env-file datascience/.env \ - docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) \ + docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) \ python main.py \ No newline at end of file diff --git a/infra/remote/data-pipeline/prod/start-server.sh b/infra/remote/data-pipeline/prod/start-server.sh index 1547832592..75b58ab5e7 100755 --- a/infra/remote/data-pipeline/prod/start-server.sh +++ b/infra/remote/data-pipeline/prod/start-server.sh @@ -3,5 +3,5 @@ docker run -t --rm --network=host --name monitorfish-pipeline-server \ -u monitorfish-pipeline:$(getent group docker | cut --delimiter=":" -f3) \ -v "$(pwd)"/infra/configurations/prefect-server/prod:/home/monitorfish-pipeline/.prefect \ - -v /var/run/docker.sock:/var/run/docker.sock docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) \ + -v /var/run/docker.sock:/var/run/docker.sock docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) \ prefect server start --use-volume --volume-path ~/.prefect/server/pg_data --postgres-port "5433" diff --git a/infra/remote/data-pipeline/stop-server.sh b/infra/remote/data-pipeline/stop-server.sh index 4a7259fa04..d67bd7f291 100755 --- a/infra/remote/data-pipeline/stop-server.sh +++ b/infra/remote/data-pipeline/stop-server.sh @@ -12,6 +12,6 @@ docker container rm monitorfish-pipeline-server; docker container rm monitorfish-pipeline-server; docker run -t --rm --network=host --name monitorfish-pipeline-server \ -u monitorfish-pipeline:$(getent group docker | cut --delimiter=":" -f3) \ - -v /var/run/docker.sock:/var/run/docker.sock docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH-VERSION) \ + -v /var/run/docker.sock:/var/run/docker.sock docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-pipeline:$(MONITORFISH_VERSION) \ prefect server stop; ) \ No newline at end of file diff --git a/infra/remote/docker-compose.yml b/infra/remote/docker-compose.yml index 3df715c392..ad2ff69aac 100644 --- a/infra/remote/docker-compose.yml +++ b/infra/remote/docker-compose.yml @@ -15,7 +15,7 @@ services: restart: always app: - image: docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-app:$(MONITORFISH-VERSION) + image: docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-app:$(MONITORFISH_VERSION) environment: - ENV_DB_URL=jdbc:postgresql://db:5432/monitorfishdb?user=postgres&password=postgres - HOST_IP=127.0.0.1