Skip to content

Commit 89c046b

Browse files
smalho01smalho01
authored
Merge pull request #77 from mcode/dev
Dev
2 parents 99fd3cc + 4595bf7 commit 89c046b

10 files changed

+179
-4
lines changed

‎.github/workflows/mongo-docker-cd-dev.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Mongo Development Docker Image CD
2+
3+
on:
4+
push:
5+
branches: [ dev ]
6+
workflow_dispatch:
7+
8+
jobs:
9+
mongo-docker-cd:
10+
runs-on: ubuntu-latest
11+
steps:
12+
13+
- name: Checkout Repository
14+
uses: actions/checkout@v3
15+
with:
16+
submodules: true
17+
18+
- name: Setup Docker Buildx
19+
uses: docker/setup-buildx-action@v2
20+
21+
- name: Docker meta data
22+
id: docker-meta-data
23+
uses: docker/metadata-action@v4
24+
with:
25+
images: codexrems/mongo
26+
flavor: latest=false
27+
28+
- name: Log in to Docker Hub
29+
uses: docker/login-action@v1
30+
with:
31+
username: ${{ secrets.DOCKER_USERNAME }}
32+
password: ${{ secrets.DOCKER_TOKEN }}
33+
34+
- name: Build and push mongo Docker image
35+
uses: docker/build-push-action@v5
36+
with:
37+
context: .
38+
platforms: linux/amd64,linux/arm64
39+
file: Dockerfile.mongo
40+
push: true
41+
tags: codexrems/mongo:experimental
42+
labels: ${{ steps.docker-meta-data.outputs.labels }}
43+

‎.github/workflows/mongo-docker-cd.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Mongo Docker Image CD
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
workflow_dispatch:
7+
8+
jobs:
9+
mongo-docker-cd:
10+
runs-on: ubuntu-latest
11+
steps:
12+
13+
- name: Checkout Repository
14+
uses: actions/checkout@v3
15+
with:
16+
submodules: true
17+
18+
- name: Setup Docker Buildx
19+
uses: docker/setup-buildx-action@v3
20+
21+
- name: Docker meta data
22+
id: docker-meta-data
23+
uses: docker/metadata-action@v4
24+
with:
25+
images: codexrems/mongo
26+
flavor: latest=false
27+
28+
- name: Log in to Docker Hub
29+
uses: docker/login-action@v1
30+
with:
31+
username: ${{ secrets.DOCKER_USERNAME }}
32+
password: ${{ secrets.DOCKER_TOKEN }}
33+
34+
- name: Build and push Mongo Docker image
35+
uses: docker/build-push-action@v6
36+
with:
37+
context: .
38+
platforms: linux/amd64,linux/arm64
39+
file: Dockerfile.mongo
40+
push: true
41+
tags: codexrems/mongo:latest
42+
labels: ${{ steps.docker-meta-data.outputs.labels }}
43+
44+

‎.github/workflows/mongo-docker-ci.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Mongo Docker Image CI
2+
3+
on:
4+
pull_request:
5+
branches: [ main, dev ]
6+
workflow_dispatch:
7+
8+
jobs:
9+
docker-ci:
10+
runs-on: ubuntu-latest
11+
steps:
12+
13+
- name: Checkout Repository
14+
uses: actions/checkout@v2
15+
with:
16+
submodules: true
17+
18+
- name: Test Server Docker image Builds
19+
run: docker build -f Dockerfile.mongo .

‎.github/workflows/mongo-docker-tag-cd.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Mongo Docker Tagged Image CD
2+
on:
3+
workflow_dispatch:
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
docker:
10+
runs-on: ubuntu-latest
11+
steps:
12+
13+
- name: Checkout Repository
14+
uses: actions/checkout@v3
15+
with:
16+
submodules: true
17+
18+
- name: Setup Docker Buildx
19+
uses: docker/setup-buildx-action@v2
20+
21+
- name: Docker meta data
22+
id: docker-meta-data
23+
uses: docker/metadata-action@v4
24+
with:
25+
images: codexrems/mongo
26+
flavor: latest=false
27+
28+
- name: Log in to Docker Hub
29+
uses: docker/login-action@v2
30+
with:
31+
username: ${{ secrets.DOCKER_USERNAME }}
32+
password: ${{ secrets.DOCKER_TOKEN }}
33+
34+
- name: Build and push
35+
uses: docker/build-push-action@v5
36+
with:
37+
context: .
38+
push: true
39+
platforms: linux/amd64,linux/arm64
40+
file: Dockerfile.mongo
41+
tags: ${{ steps.docker-meta-data.outputs.tags }}
42+
labels: ${{ steps.docker-meta-data.outputs.labels }}

‎.github/workflows/playwright.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
working-directory: ./rems-setup
116116
env:
117117
VSAC_API_KEY: ${{secrets.VSAC_API_KEY}}
118-
118+
119119
- uses: actions/setup-node@v3
120120
with:
121121
node-version: 18

‎Dockerfile.mongo‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM mongo:latest
2+
3+
ENV MONGO_INITDB_ROOT_USERNAME=mongo-user
4+
ENV MONGO_INITDB_ROOT_PASSWORD=mongo-password
5+
COPY ./mongo-init.js /docker-entrypoint-initdb.d/mongo-init.js

‎docker-compose-dev.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ services:
9696
ports:
9797
- "8090:8090"
9898
- "8091:8091"
99+
- "9090:9090"
100+
- "9091:9091"
99101
environment:
100102
VSAC_API_KEY: ${VSAC_API_KEY}
101103
MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
@@ -118,12 +120,17 @@ services:
118120
ports:
119121
- "8095:8095"
120122
- "8096:8096"
123+
- "9095:9095"
124+
- "9096:9096"
121125
environment:
122126
VSAC_API_KEY: ${VSAC_API_KEY}
123127
MONGO_DB_NAME: remsadmin2
124128
MONGO_URL: mongodb://rems-user2:pass@pims_remsadmin_mongo:27017
125129
SERVER_NAME: 'CodeX REMS Administrator Prototype #2'
126130
PORT: 8095
131+
FRONTEND_PORT: 9095
132+
AUTH_SERVER_URI: 'http://localhost:8095'
133+
RESOURCE_SERVER: 'http://localhost:8095/'
127134
volumes:
128135
- rems_dev_rems-admin2-sync:/rems-admin2:nocopy # nocopy is important
129136
- rems_dev_rems-admin2-nodeModules:/rems-admin2/node_modules
@@ -169,6 +176,7 @@ services:
169176
REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0
170177
ports:
171178
- "3003:3003"
179+
- "9080:9080"
172180
volumes:
173181
- rems_dev_rems-intermediary-sync:/rems-intermediary:nocopy # nocopy is important
174182
- rems_dev_rems-intermediary-nodeModules:/rems-intermediary/node_modules

‎docker-compose-local-build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ services:
7777
ports:
7878
- "8090:8090"
7979
- "8091:8091"
80+
- "9090:9090"
81+
- "9091:9091"
8082
environment:
8183
VSAC_API_KEY: ${VSAC_API_KEY}
8284
MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
@@ -94,12 +96,17 @@ services:
9496
ports:
9597
- "8095:8095"
9698
- "8096:8096"
99+
- "9095:9095"
100+
- "9096:9096"
97101
environment:
98102
VSAC_API_KEY: ${VSAC_API_KEY}
99103
MONGO_DB_NAME: remsadmin2
100104
MONGO_URL: mongodb://rems-user2:pass@pims_remsadmin_mongo:27017
101105
SERVER_NAME: 'CodeX REMS Administrator Prototype #2'
102106
PORT: 8095
107+
FRONTEND_PORT: 9095
108+
AUTH_SERVER_URI: 'http://localhost:8095'
109+
RESOURCE_SERVER: 'http://localhost:8095/'
103110
depends_on:
104111
pims_remsadmin_mongo:
105112
condition: service_healthy
@@ -132,6 +139,7 @@ services:
132139
REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0
133140
ports:
134141
- "3003:3003"
142+
- "9080:9080"
135143
depends_on:
136144
pims_remsadmin_mongo:
137145
condition: service_healthy

‎docker-compose.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ services:
4949
container_name: rems_prod_rems-administrator
5050
ports: # Port binding to host from docker container
5151
- "8090:8090"
52+
- "9090:9090"
5253
environment:
5354
VSAC_API_KEY: ${VSAC_API_KEY}
5455
MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
@@ -62,12 +63,16 @@ services:
6263
container_name: rems_prod_rems-administrator2
6364
ports: # Port binding to host from docker container
6465
- "8095:8095"
66+
- "9095:9095"
6567
environment:
6668
VSAC_API_KEY: ${VSAC_API_KEY}
6769
MONGO_DB_NAME: remsadmin2
6870
MONGO_URL: mongodb://rems-user2:pass@pims_remsadmin_mongo:27017
6971
SERVER_NAME: 'CodeX REMS Administrator Prototype #2'
7072
PORT: 8095
73+
FRONTEND_PORT: 9095
74+
AUTH_SERVER_URI: 'http://localhost:8095'
75+
RESOURCE_SERVER: 'http://localhost:8095/'
7176
depends_on:
7277
pims_remsadmin_mongo:
7378
condition: service_healthy
@@ -119,6 +124,7 @@ services:
119124
REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0
120125
ports:
121126
- "3003:3003"
127+
- "9080:9080"
122128
depends_on:
123129
pims_remsadmin_mongo:
124130
condition: service_healthy

‎docker-sync.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ syncs:
1717

1818
rems_dev_rems-admin-sync:
1919
src: '../rems-admin'
20-
sync_excludes: ['node_modules']
20+
sync_excludes: ['node_modules', './frontend/node_modules']
2121

2222
rems_dev_rems-admin2-sync:
2323
src: '../rems-admin'
24-
sync_excludes: ['node_modules']
24+
sync_excludes: ['node_modules', './frontend/node_modules']
2525

2626

2727
rems_dev_pims-sync:
@@ -30,4 +30,4 @@ syncs:
3030

3131
rems_dev_rems-intermediary-sync:
3232
src: '../rems-intermediary'
33-
sync_excludes: ['node_modules']
33+
sync_excludes: ['node_modules', './frontend/node_modules']

0 commit comments

Comments
 (0)