Skip to content

Commit b0274b6

Browse files
committed
Use merge build in docker-compose
see: ome/omero-web-docker#29
1 parent e061111 commit b0274b6

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.env

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
REPO=test
2+
PREFIX=test
3+
TCP_PORT=
4+
SSL_PORT=4064:

docker-compose.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "3"
1+
version: "3.3"
22
#
33
# Compose for the development of this docker image
44
#
@@ -15,7 +15,12 @@ services:
1515
- "database:/var/lib/postgresql/data"
1616

1717
omero:
18-
build: .
18+
image: ${REPO}/omero-server:${PREFIX}
19+
build:
20+
context: .
21+
args:
22+
- OMEGO_ADDITIONAL_ARGS="--ci=https://merge-ci.openmicroscopy.org/jenkins/"
23+
- OMERO_VERSION="OMERO-build"
1924
environment:
2025
- CONFIG_omero_db_host=database
2126
- CONFIG_omero_db_user=omero
@@ -25,10 +30,11 @@ services:
2530
networks:
2631
- omero
2732
ports:
28-
- "4063:4063"
29-
- "4064:4064"
33+
- "${TCP_PORT}4063"
34+
- "${SSL_PORT}4064"
3035
volumes:
3136
- "omero:/OMERO"
37+
- "./:/src:ro"
3238

3339
networks:
3440
omero:

0 commit comments

Comments
 (0)