From 9a00416460691eacba028a642d6a44ad80a27390 Mon Sep 17 00:00:00 2001 From: Olivier Bruchez Date: Fri, 12 Jul 2024 14:33:30 +0200 Subject: [PATCH] For #3321: docker-compose.yml now using images from registry --- docker/docker-compose.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9da0e0bcd0..7b3ecb1353 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,20 +1,18 @@ version: '3.8' services: - tomcat: - build: - dockerfile: Dockerfile_orbeon_forms + orbeon-forms: + image: orbeon/orbeon-forms:2023.1.3-pe ports: - ${ORBEON_TOMCAT_PORT:-8080}:8080 volumes: - - ${ORBEON_PROPERTIES_FILE}:/usr/local/tomcat/webapps/orbeon/WEB-INF/resources/config/properties-local.xml + - ${ORBEON_PROPERTIES_FILE:-./properties-local.xml}:/usr/local/tomcat/webapps/orbeon/WEB-INF/resources/config/properties-local.xml secrets: - source: license target: /usr/local/tomcat/webapps/orbeon/WEB-INF/resources/config/license.xml depends_on: - postgres postgres: - build: - dockerfile: Dockerfile_postgres + image: orbeon/postgres:2023.1.3-pe restart: always ports: - ${ORBEON_POSTGRES_PORT:-5432}:5432 @@ -32,6 +30,6 @@ volumes: name: ${POSTGRES_VOLUME:-orbeon_pgdata} secrets: license: - file: ${ORBEON_LICENSE_FILE:-license.xml} + file: ${ORBEON_LICENSE_FILE:-./license.xml} # postgres_password: # file: ${ORBEON_POSTGRES_PASSWORD_FILE:-postgres_password.txt} \ No newline at end of file