Skip to content

hot fix for docker install #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennyEung merged 5 commits into from
Apr 6, 2023
Merged

hot fix for docker install #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b062c2
hot fix for docker install
smalho01 Apr 6, 2023
916ee3b
docker container name updates + dockerfile update
smalho01 Apr 6, 2023
5f8534e
production docker image base change
smalho01 Apr 6, 2023
26277a2
dockerfile Updates
smalho01 Apr 6, 2023
7665524
env updates
smalho01 Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM ubuntu:latest
FROM node:18-alpine
WORKDIR /REMS
COPY . .
CMD ./dockerRunner.sh
COPY --chown=node:node . .
RUN npm install
EXPOSE 8090
CMD npm run start
1 change: 1 addition & 0 deletions Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ WORKDIR /REMS
COPY --chown=node:node . .
RUN npm install
EXPOSE 8090
EXPOSE 8091
CMD ./dockerRunnerDev.sh
10 changes: 0 additions & 10 deletions Dockerfile.porter-windows
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions Dockerfile.tmpl
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions docker-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
MONGO_INITDB_ROOT_USERNAME: rems-admin-pims-root
MONGO_INITDB_ROOT_PASSWORD: rems-admin-pims-password
volumes:
- pims_remsadmin_mongo:/data/db
- rems_dev_pims_remsadmin_mongo:/data/db
- ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js

crd-request-generator:
Expand Down Expand Up @@ -141,7 +141,7 @@ volumes:


rems_dev_keycloak-data:
pims_remsadmin_mongo:
rems_dev_pims_remsadmin_mongo:
rems_dev_test-ehr-gradle:
rems_dev_test-ehr-bin:
rems_dev_test-ehr-build:
Expand Down
9 changes: 5 additions & 4 deletions docker-compose-m1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,23 @@ services:
- "9015:9015" # Bind port 3000 of host to 3000 of container
environment:
VSAC_API_KEY: ${VSAC_API_KEY}
MONGO_HOSTNAME: mongodb://rems-admin-pims-root:rems-admin-pims-password@pims_remsadmin_mongo:27017
MONGO_HOSTNAME: mongodb://rems-user:pass@pims_remsadmin_mongo:27017

pims_remsadmin_mongo:
image: mongo
container_name: rems_dev_pims-remsadmin-mongo
container_name: rems_prod_m1_pims-remsadmin-mongo
ports:
- '27017:27017'
environment:
MONGO_INITDB_ROOT_USERNAME: rems-admin-pims-root
MONGO_INITDB_ROOT_PASSWORD: rems-admin-pims-password
volumes:
- pims_remsadmin_mongo:/data/db
- rems_prod_m1_pims_remsadmin_mongo:/data/db
- ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js

pims:
image: codexrems/pims:REMSvCurrent
container_name: rems_dev_pims
container_name: rems_prod_m1_pims
environment:
REMS_ADMIN_BASE: http://rems-administrator:8090
MONGO_HOSTNAME: mongodb://pims_remsadmin_mongo:27017/pims
Expand All @@ -85,4 +85,5 @@ services:

volumes:
rems_prod_m1_keycloak-data:
rems_prod_m1_pims_remsadmin_mongo:

10 changes: 6 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,23 @@ services:
- "9015:9015" # Bind port 3000 of host to 3000 of container
environment:
VSAC_API_KEY: ${VSAC_API_KEY}
MONGO_HOSTNAME: mongodb://rems-admin-pims-root:rems-admin-pims-password@pims_remsadmin_mongo:27017
MONGO_HOSTNAME: mongodb://rems-user:pass@pims_remsadmin_mongo:27017

pims_remsadmin_mongo:
image: mongo
container_name: rems_dev_pims-remsadmin-mongo
container_name: rems_prod_pims-remsadmin-mongo
ports:
- '27017:27017'
environment:
MONGO_INITDB_ROOT_USERNAME: rems-admin-pims-root
MONGO_INITDB_ROOT_PASSWORD: rems-admin-pims-password
volumes:
- pims_remsadmin_mongo:/data/db
- rems_prod_pims_remsadmin_mongo:/data/db
- ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js

pims:
image: codexrems/pims:REMSvCurrent
container_name: rems_dev_pims
container_name: rems_prod_pims
environment:
REMS_ADMIN_BASE: http://rems-administrator:8090
MONGO_HOSTNAME: mongodb://pims_remsadmin_mongo:27017/pims
Expand All @@ -86,4 +86,6 @@ services:

volumes:
rems_prod_keycloak-data:
rems_prod_pims_remsadmin_mongo: