diff --git a/.gitmodules b/.gitmodules index 3e41071..03e2bfe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "curriculum-store"] path = curriculum-store url = git@github.com:slonl/curriculum-store +[submodule "curriculum-registration-app"] + path = curriculum-registration-app + url = git@github.com:slonl/curriculum-registration-app diff --git a/curriculum-registration-app b/curriculum-registration-app new file mode 160000 index 0000000..3c9c818 --- /dev/null +++ b/curriculum-registration-app @@ -0,0 +1 @@ +Subproject commit 3c9c818346bc7b02fd48ffa0e4a7351f67548379 diff --git a/curriculum-rest-api b/curriculum-rest-api index 460ed8f..b8c502a 160000 --- a/curriculum-rest-api +++ b/curriculum-rest-api @@ -1 +1 @@ -Subproject commit 460ed8f8d9f8a3e0178945db13f833844489c1de +Subproject commit b8c502a9a7999d14b47b1f6ed23babc041f619f6 diff --git a/curriculum-store b/curriculum-store index 82da63a..ddc6a8f 160000 --- a/curriculum-store +++ b/curriculum-store @@ -1 +1 @@ -Subproject commit 82da63a8d3e0f0942d556662d50b6caba4efab01 +Subproject commit ddc6a8fb867e0d35934cc9b9446690cf9f20be88 diff --git a/docker-compose.yml b/docker-compose.yml index 057529e..34645f9 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,7 +37,7 @@ services: - DATA_DIR=/home/node/app/curriculum volumes: - ./curriculum-search-server/:/home/node/app - - ./curriculum-graphql-server/data/:/home/node/app/curriculum + - ./curriculum-store/:/home/node/app/curriculum ports: - "3001:3001" entrypoint: ["/bin/sh","-c"] @@ -54,7 +54,8 @@ services: environment: - NODE_ENV=development - NODE_PORT=3000 - - DATA_DIR=/home/node/app/curriculum + - DATA_FILE=/home/node/app/data/data.jsontag + - COMMANDS=/home/node/app/src/commands.mjs volumes: - ./curriculum-store/:/home/node/app ports: @@ -64,7 +65,28 @@ services: - | npm install npm start - + curriculum-registration: + image: "node:20-alpine" + user: "node" + working_dir: /home/node/app + container_name: "curriculum-registration" + environment: + - NODE_ENV=development + - NODE_PORT=4930 + - APIKEYS=apiKeys.json + volumes: + - ./curriculum-registration-app/:/home/node/app + ports: + - "4930:4930" + entrypoint: ["/bin/sh","-c"] + command: + - | + npm install + npm start + volumes: curriculum-rest-api: - curriculum-search-server: \ No newline at end of file + curriculum-search-server: + curriculum-store: + curriculum-registration-app: + \ No newline at end of file