Skip to content

Commit

Permalink
Fix variable name MONITORFISH-VERSION
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentAntoine committed Mar 22, 2021
1 parent 290e665 commit 5a2b2e4
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/remote/data-pipeline/int/start-flows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion infra/remote/data-pipeline/int/start-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion infra/remote/data-pipeline/prod/start-flows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion infra/remote/data-pipeline/prod/start-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion infra/remote/data-pipeline/stop-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
)
2 changes: 1 addition & 1 deletion infra/remote/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5a2b2e4

Please sign in to comment.