add the-train to compose journey

ONSdigital · Oct 25, 2021 · d1c6a36 · d1c6a36
1 parent b2afee1
commit d1c6a36
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/cantabular-import/.env b/cantabular-import/.env
@@ -1,3 +1 @@
 COMPOSE_FILE=deps.yml:dp-import-api.yml:dp-import-cantabular-dataset.yml:dp-import-cantabular-dimension-options.yml:dp-cantabular-server.yml:dp-cantabular-api-ext.yml:dp-dataset-api.yml:dp-cantabular-csv-exporter.yml:dp-recipe-api.yml:zebedee.yml:dp-download-service.yml:dp-frontend-dataset-controller.yml:dp-api-router.yml:dp-frontend-router.yml:dp-publishing-dataset-controller.yml:florence.yml:the-train.yml:babbage.yml
-COMPOSE_PATH_SEPARATOR=:
-COMPOSE_PROJECT_NAME=cantabular-import-journey
diff --git a/cantabular-import/Makefile b/cantabular-import/Makefile
@@ -1,7 +1,14 @@
+UID := $(shell id -u)
+GID := $(shell id -g)
+
+export UID
+export GID
+
 # start full journey
 .PHONY: start
 start:
-	UID=$(id -u) GID=$(id -g) docker-compose up
+	@echo "starting containers"
+	docker-compose up
 
 # Start full journey with super user privileges
 .PHONY: start-privileged
@@ -12,13 +19,13 @@ start-privileged:
 .PHONY: start-detached
 start-detached:
 	@echo "starting containers in background"
-	UID=$(id -u) GID=$(id -g)  docker-compose up -d
+	docker-compose up -d
 
 # start only backend services
 .PHONY: start-backend
 start-backend:
 	@echo "starting back-end containers"
-	UID=$(id -u) GID=$(id -g)  docker-compose --env-file .env.backend up
+	docker-compose --env-file .env.backend up
 
 .PHONY: stop
 stop:

diff --git a/cantabular-import/README.md b/cantabular-import/README.md
@@ -38,7 +38,7 @@ Expects you to have environment variables `zebedee_root` and
 
 To use the `start-import` helpers scripts or analysis tools you will need
 to set an environment variable called `FLORENCE_PASSWORD` to your local
-florence login password for `[email protected]`. Alternatively
+florence login password for `florence@magicroundabout.ons.gov.uk`. Alternatively
 you can directly edit `helpers/florence-token` to hard code your username
 and password.
 

diff --git a/cantabular-import/run-cantabular-without-sudo.sh b/cantabular-import/run-cantabular-without-sudo.sh
@@ -1,2 +1,2 @@
 #!/usr/local/bin/bash
-docker-compose up
+docker-compose up
diff --git a/cantabular-import/zebedee.yml b/cantabular-import/zebedee.yml
@@ -36,4 +36,3 @@ services:
             ENABLE_CENTRALISED_KEYRING: "false"
             KEYRING_SECRET_KEY:         "38c03PzhNuSrYV8J0537XQ=="
             KEYRING_INIT_VECTOR:        "RkL9MmjfRcPB86alO82gHQ=="
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,4 +36,3 @@ services:
		ENABLE_CENTRALISED_KEYRING: "false"
		KEYRING_SECRET_KEY: "38c03PzhNuSrYV8J0537XQ=="
		KEYRING_INIT_VECTOR: "RkL9MmjfRcPB86alO82gHQ=="