From 1d0b605fbb9c724bc5049f28a0b1fca0d74699eb Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 1 Mar 2022 15:08:00 +0100 Subject: [PATCH 1/2] added new compose file for deployment of initial data with liquibase --- docker-compose.yml | 138 ++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 791417b..d7087f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,69 +1,69 @@ -version: '3.6' -services: - db: - image: patternatlas/pattern-atlas-db:v1.1.0 - environment: - POSTGRES_USER: patternatlas - POSTGRES_PASSWORD: patternatlas - POSTGRES_DB: patternatlas - PATTERN_ATLAS_CONTENT_REPOSITORY_BRANCH: master - READ_ONLY: 'false' - ports: - - "5060:5060" - networks: - - default - pattern-atlas-api: - image: patternatlas/pattern-atlas-api:v1.6.1 - environment: - JDBC_DATABASE_URL: db - JDBC_DATABASE_USERNAME: patternatlas - JDBC_DATABASE_PASSWORD: patternatlas - LATEX_RENDERER_HOST_NAME: latex-renderer - LATEX_RENDERER_PORT: 5030 - JDBC_DATABASE_NAME: patternatlas - HAL_EXPLORER: 'true' - # activate correct application properties - SPRING_PROFILES_ACTIVE: docker - ports: - - "1977:1977" - networks: - - default - depends_on: - - db - - latex-renderer - restart: on-failure - pattern-atlas-ui: - image: patternatlas/pattern-atlas-ui:v1.4.1 - depends_on: - - config-server - environment: - # because the requests are performed from the browser and not - # from the container itself we have to specify localhost here - # and **not** the container name - PATTERN_ATLAS_API_HOST_NAME: localhost - PATTERN_ATLAS_API_PORT: 1977 - LATEX_RENDERER_HOST_NAME: localhost - LATEX_RENDERER_PORT: 5030 - URL_SCHEME: http - ports: - - "1978:80" - config-server: - image: quay.io/coreos/etcd:v3.3.8 - environment: - ETCD_NAME: config-node1 - ETCD_CORS: "*" - ETCD_ADVERTISE_CLIENT_URLS: "http://config-server:2379" - ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379" - ETCDCTL_API: 3 - ports: - - "2379:2379" - networks: - - default - # used by the pattern atlas to render latex - latex-renderer: - image: planqk/latex-renderer:v1.1.1 - ports: - - "5030:5030" -networks: - default: - driver: bridge +version: '3.6' +services: + db: + image: postgres:13 + environment: + POSTGRES_USER: patternatlas + POSTGRES_PASSWORD: patternatlas + POSTGRES_DB: patternatlas + ports: + - "5432:5432" + networks: + - default + pattern-atlas-api: + image: patternatlas/pattern-atlas-api:latest + environment: + JDBC_DATABASE_URL: db + JDBC_DATABASE_USERNAME: patternatlas + JDBC_DATABASE_PASSWORD: patternatlas + JDBC_DATABASE_PORT: 5432 + LATEX_RENDERER_HOST_NAME: latex-renderer + LATEX_RENDERER_PORT: 5030 + JDBC_DATABASE_NAME: patternatlas + PATTERN_ATLAS_FETCH_INITIAL_DATA: 'true' + HAL_EXPLORER: 'true' + # activate correct application properties + SPRING_PROFILES_ACTIVE: docker + ports: + - "1977:1977" + networks: + - default + depends_on: + - db + - latex-renderer + restart: on-failure + pattern-atlas-ui: + image: patternatlas/pattern-atlas-ui:latest + depends_on: + - config-server + environment: + # because the requests are performed from the browser and not + # from the container itself we have to specify localhost here + # and **not** the container name + PATTERN_ATLAS_API_HOST_NAME: localhost + PATTERN_ATLAS_API_PORT: 1977 + LATEX_RENDERER_HOST_NAME: localhost + LATEX_RENDERER_PORT: 5030 + URL_SCHEME: http + ports: + - "1978:80" + config-server: + image: quay.io/coreos/etcd:v3.3.8 + environment: + ETCD_NAME: config-node1 + ETCD_CORS: "*" + ETCD_ADVERTISE_CLIENT_URLS: "http://config-server:2379" + ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379" + ETCDCTL_API: 3 + ports: + - "2379:2379" + networks: + - default + # used by the pattern atlas to render latex + latex-renderer: + image: planqk/latex-renderer:v1.1.1 + ports: + - "5030:5030" +networks: + default: + driver: bridge From a1a27032560c712864c49e5720b7deaf25e0e960 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 8 Mar 2022 15:26:32 +0100 Subject: [PATCH 2/2] set fixed version for docker compose again --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d7087f9..1c2c644 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: networks: - default pattern-atlas-api: - image: patternatlas/pattern-atlas-api:latest + image: patternatlas/pattern-atlas-api:v1.7.0 environment: JDBC_DATABASE_URL: db JDBC_DATABASE_USERNAME: patternatlas @@ -33,7 +33,7 @@ services: - latex-renderer restart: on-failure pattern-atlas-ui: - image: patternatlas/pattern-atlas-ui:latest + image: patternatlas/pattern-atlas-ui:v1.4.2 depends_on: - config-server environment: