From 59a1b42458c09f16e46489e718f2841af1d77876 Mon Sep 17 00:00:00 2001 From: jmoore Date: Wed, 8 May 2019 07:22:17 +0100 Subject: [PATCH] Test updated build with docker-compose Beyond just using make for building a set of paired omero-web and omero-web-standalone images, this allows building within a self-contained docker-compose.yml. see: https://github.com/openmicroscopy/omero-web-docker/pull/28 --- .env | 3 +++ docker-compose.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 .env create mode 100644 docker-compose.yml diff --git a/.env b/.env new file mode 100644 index 00000000..8152b8c8 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +REPO=test +PREFIX=test +SERVERS=[["demo.openmicroscopy.org", 4064, "OMERO"]] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..209f9c1b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,26 @@ +version: "3.3" +# +# Compose for the development of this docker image +# +services: + + parent: + image: ${REPO}/omero-web:${PREFIX} + build: + context: . + args: + - OMEGO_ADDITIONAL_ARGS="--ci=https://merge-ci.openmicroscopy.org/jenkins/" + - OMERO_VERSION="OMERO-build" + entrypoint: "true" + + web: + image: ${REPO}/omero-web-standalone:${PREFIX} + build: + context: standalone + args: + - PARENT_IMAGE=${REPO}/omero-web:${PREFIX} + environment: + - CONFIG_omero_web_debug="true" + - CONFIG_omero_web_server__list=${SERVERS} + ports: + - 4080:4080