From fe5f7c7022f89f00f6cc59f1f1895760d57b0302 Mon Sep 17 00:00:00 2001 From: John Abrahams Date: Tue, 10 Jan 2023 12:28:38 -0500 Subject: [PATCH 1/2] Update pass-core env config --- .eclipse-pass.base_env | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.eclipse-pass.base_env b/.eclipse-pass.base_env index 55b1e91..7d641a1 100644 --- a/.eclipse-pass.base_env +++ b/.eclipse-pass.base_env @@ -3,12 +3,23 @@ ################################################### PASS_CORE_POSTGRES_PORT=5432 PASS_CORE_API_PORT=8080 + +# Postgres configuration POSTGRES_USER=postgres POSTGRES_PASSWORD=postgres -JDBC_DATABASE_URL=jdbc:postgresql://postgres:5432/pass -JDBC_DATABASE_USERNAME=pass -JDBC_DATABASE_PASSWORD=moo +# PASS core configuration +spring_profiles_active=production + +PASS_CORE_DATABASE_URL=jdbc:postgresql://postgres:5432/pass +PASS_CORE_DATABASE_USERNAME=pass +PASS_CORE_DATABASE_PASSWORD=moo + +PASS_CORE_PORT=8080 +PASS_CORE_BASE_URL=http://localhost:8080 + +# Automatically create database tables +PASS_CORE_JAVA_OPTS="-Djavax.persistence.schema-generation.database.action=create" ################################################### # PASS_UI config ################################## From 57a14ca28cddb7c7bf02b6ede4696a7f9727212b Mon Sep 17 00:00:00 2001 From: John Abrahams Date: Tue, 10 Jan 2023 12:48:19 -0500 Subject: [PATCH 2/2] Remove unused compose file --- demo.yml | 163 ------------------------------------------------------- 1 file changed, 163 deletions(-) delete mode 100644 demo.yml diff --git a/demo.yml b/demo.yml deleted file mode 100644 index b47a425..0000000 --- a/demo.yml +++ /dev/null @@ -1,163 +0,0 @@ -version: '3.8' - -# When running commands with this file, you must specify both this yml file and -# the correct env file. For example: -# `docker-compose -f demo.yml --env-file .demo_env up` -services: - auth: - image: ghcr.io/eclipse-pass/pass-auth:0.2.0@sha256:c966c8500fe43d90a59839bba2798f9ed9a051c5379783a0971bf700003aeddf - env_file: .demo_env - container_name: auth - networks: - - front - - back - secrets: - - source: sp_key - - source: sp_cert - - source: idp_cert - - pass-core: - image: ghcr.io/eclipse-pass/pass-core-main:0.2.0-SNAPSHOT@sha256:318b14d2dbfee4570b91454632a443aef67d15bf481677fbd7f4532c02853af2 - env_file: .demo_env - container_name: pass-core - networks: - - back - depends_on: - - postgres - healthcheck: - test: "curl -f http://pass-core:8080/data/user || exit 1" - start_period: 30s - - pass-ui: - image: ghcr.io/eclipse-pass/pass-ui:0.2.0@sha256:8e82bb2e3b5e760d17f36c0c980547f132b284739982938b5f235d079430f6c4 - build: - context: ./ember - args: - # required args (throw error during build if not defined in env): - EMBER_GIT_REPO: "${EMBER_GIT_REPO:?undefined-EMBER_GIT_REPO}" - EMBER_GIT_BRANCH: "${EMBER_GIT_BRANCH:?undefined-EMBER_GIT_BRANCH}" - # sensible defaults have been defined: - DOI_SERVICE_URL: "${DOI_SERVICE_URL:-}" - MANUSCRIPT_SERVICE_LOOKUP_URL: "${MANUSCRIPT_SERVICE_LOOKUP_URL:-}" - MANUSCRIPT_SERVICE_DOWNLOAD_URL: "${MANUSCRIPT_SERVICE_DOWNLOAD_URL:-}" - METADATA_SCHEMA_URI: "${METADATA_SCHEMA_URI:-}" - PASS_UI_PORT: "${PASS_UI_PORT:-}" - PASS_API_NAMESPACE: "${PASS_API_NAMESPACE:-}" - PASS_UI_ROOT_URL: "${PASS_UI_ROOT_URL:-}" - POLICY_SERVICE_URL: "${POLICY_SERVICE_URL:-}" - USER_SERVICE_URL: "${USER_SERVICE_URL:-}" - env_file: .demo_env - container_name: pass-ui - networks: - - back # is 'back' in the main docker-compose, use this or 'front'? - - postgres: - image: postgres:14-alpine - restart: always - env_file: .demo_env - networks: - - back - volumes: - - db:/var/lib/postgresql/data - - ./postgres/demo/init_postgres.sh:/docker-entrypoint-initdb.d/init_postgres.sh - - proxy: - build: ./demo-proxy/ - image: ghcr.io/eclipse-pass/proxy:0.2.0@sha256:6020f7f017108fcc1911d94e0afafcbb5dd02f005876eaa5453395697627628c - container_name: proxy - networks: - - front - - back - ports: - - "80:80" - - "443:443" - - pass-ui-public: - build: - context: ./static-html - args: - STATIC_HTML_GIT_REPO: "${STATIC_HTML_GIT_REPO}" - STATIC_HTML_GIT_BRANCH: "${STATIC_HTML_GIT_BRANCH}" - image: ghcr.io/eclipse-pass/pass-ui-public:0.2.0@sha256:35ee542e0e38183baeb94b0274c4a360f6a7b6a147a8557ab421ae4a6d86ea4d - container_name: pass-ui-public - env_file: .demo_env - ports: - - "${STATIC_HTML_PORT}:${STATIC_HTML_PORT}" - networks: - - front - - idp: - build: - context: ./idp - args: - TENANT: jhu - image: ghcr.io/eclipse-pass/idp:0.2.0@sha256:02235c80cda327375819d84074b165bf931b25e219aff100e8fad13c2a21800d - container_name: idp - depends_on: - - ldap - environment: - - IDP_HOST=https://pass.local - - JETTY_MAX_HEAP=64m - - JETTY_BROWSER_SSL_KEYSTORE_PASSWORD=password - - JETTY_BACKCHANNEL_SSL_KEYSTORE_PASSWORD=password - expose: - - "4443" - networks: - - back - secrets: - - source: idp_backchannel - - source: idp_browser - - source: idp_encryption - - source: idp_signing - - source: idp_sealer - - source: idp_cert - - ldap: - build: - context: ./ldap - args: - TENANT: jhu - image: ghcr.io/eclipse-pass/demo-ldap:0.2.0@sha256:331cd3ae9c3673c9439fa7465ee807172702bc3dac6583c173766e3c036e8c3e - container_name: ldap - networks: - - back - - loader: - image: curlimages/curl:7.87.0 - container_name: loader - command: [curl, http://pass-core:8080/data/, -X, PATCH, -H, "content-type: application/vnd.api+json; ext=jsonpatch", -d, "@/data.json"] - networks: - - back - depends_on: - pass-core: - condition: service_healthy - volumes: - - ./demo_data.json:/data.json - -volumes: - db: - driver: local - -networks: - front: - driver: bridge - back: - driver: bridge - -secrets: - idp_backchannel: - file: ./secrets/idp/idp-backchannel.p12 - idp_browser: - file: ./secrets/idp/idp-browser.p12 - idp_encryption: - file: ./secrets/idp/idp-encryption.key - idp_signing: - file: ./secrets/idp/idp-signing.key - idp_sealer: - file: ./secrets/idp/sealer.jks - idp_cert: - file: ./secrets/idp/idp-signing.crt - sp_key: - file: ./secrets/sp/sp-key.pem - sp_cert: - file: ./secrets/sp/sp-cert.pem