Skip to content

Commit

Permalink
#237 - Minor suggestions to improve the container image
Browse files Browse the repository at this point in the history
- mount certificates file and use_system_ca_certs
- remove custom docker entrypoint
  • Loading branch information
michael-82 committed Sep 10, 2024
1 parent 64e0650 commit 214de85
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 38 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ HEALTHCHECK --interval=5s --start-period=10s CMD curl -s -f http://localhost:809

COPY ./target/*.jar ./dataportal-backend.jar
COPY ontology ontology
COPY ./docker-entrypoint.sh /

ENTRYPOINT ["/bin/bash", "/docker-entrypoint.sh"]
ENTRYPOINT ["exec", "java", "$JAVA_OPTS" , "-jar", "dataportal-backend.jar"]
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ services:
init-elasticsearch:
condition: service_completed_successfully
environment:
USE_SYSTEM_CA_CERTS: 1
# ----- app
QUERY_VALIDATION_ENABLED: ${DATAPORTAL_BACKEND_QUERY_VALIDATION_ENABLED:-true}
CQL_TRANSLATE_ENABLED: ${DATAPORTAL_BACKEND_CQL_TRANSLATE_ENABLED:-true}
Expand Down Expand Up @@ -96,7 +97,7 @@ services:
- ${DATAPORTAL_BACKEND_LOCAL_TERM_CODE_MAPPING_PATH:-./ontology/dataportal-term-code-mapping.json}:${DATAPORTAL_BACKEND_ONTOLOGY_FILES_FOLDER:-/opt/dataportal-backend/ontology}/dataportal-term-code-mapping.json
- ${DATAPORTAL_BACKEND_DSF_SECURITY_DIR:-/dev/null}:/opt/dataportal-backend/dsf-security/
- ${DATAPORTAL_BACKEND_ONTOLOGY_DB_MIGRATION_FOLDER:-../ontology/migration}:/opt/dataportal-backend/ontology/migration

- ${DATAPORTAL_BACKEND_CERTS_DIR:-./certs}:/certificates/
dataportal-postgres:
container_name: dataportal-postgres
image: 'postgres:16-alpine'
Expand Down
35 changes: 0 additions & 35 deletions docker-entrypoint.sh

This file was deleted.

0 comments on commit 214de85

Please sign in to comment.