From 3dc040ec73396e7374dce3e859f825a697afe961 Mon Sep 17 00:00:00 2001
From: Simon Li <spli@dundee.ac.uk>
Date: Thu, 12 Dec 2019 17:13:23 +0000
Subject: [PATCH 1/4] Add infrastructure for an server extras image

This is based on the standalone image from https://github.com/ome/omero-web-docker/tree/5.6.0-m4
This just provides the infrastructure for building the extras image, it doesn't install or change anything (see https://github.com/ome/omero-server-docker/pull/21 instead)
---
 Makefile                       | 15 ++++++++++++++-
 extras/01-default-extras.omero |  1 +
 extras/Dockerfile              |  9 +++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 extras/01-default-extras.omero
 create mode 100644 extras/Dockerfile

diff --git a/Makefile b/Makefile
index ac30b7ec..dc63aadd 100644
--- a/Makefile
+++ b/Makefile
@@ -65,13 +65,20 @@ endif
 ifndef BUILD
 	$(eval BUILD=0)
 endif
-	docker build -t $(REPO)/omero-server:$(VERSION)-$(BUILD) .
+	docker build $(BUILDARGS) -t $(REPO)/omero-server:$(VERSION)-$(BUILD) .
 	docker tag $(REPO)/omero-server:$(VERSION)-$(BUILD) $(REPO)/omero-server:$(VERSION)
 	@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
 	docker tag $(REPO)/omero-server:$(VERSION)-$(BUILD) $(REPO)/omero-server:$$MAJOR_MINOR
 
+	docker build --build-arg=PARENT_IMAGE=$(REPO)/omero-server:$(VERSION) -t $(REPO)/omero-server-extras:$(VERSION)-$(BUILD) extras
+	docker tag $(REPO)/omero-server-extras:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:$(VERSION)
+	@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
+	docker tag $(REPO)/omero-server-extras:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:$$MAJOR_MINOR
+
+
 docker-build: docker-build-versions
 	docker tag $(REPO)/omero-server:$(VERSION)-$(BUILD) $(REPO)/omero-server:latest
+	docker tag $(REPO)/omero-server-standalone:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:latest
 
 
 docker-push-versions:
@@ -86,5 +93,11 @@ endif
 	@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
 	docker push $(REPO)/omero-server:$$MAJOR_MINOR
 
+	docker push $(REPO)/omero-server-extras:$(VERSION)-$(BUILD)
+	docker push $(REPO)/omero-server-extras:$(VERSION)
+	@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
+	docker push $(REPO)/omero-server-extras:$$MAJOR_MINOR
+
 docker-push: docker-push-versions
 	docker push $(REPO)/omero-server:latest
+	docker push $(REPO)/omero-server-extras:latest
diff --git a/extras/01-default-extras.omero b/extras/01-default-extras.omero
new file mode 100644
index 00000000..e9341f5d
--- /dev/null
+++ b/extras/01-default-extras.omero
@@ -0,0 +1 @@
+# OMERO.server extras
diff --git a/extras/Dockerfile b/extras/Dockerfile
new file mode 100644
index 00000000..464037e2
--- /dev/null
+++ b/extras/Dockerfile
@@ -0,0 +1,9 @@
+ARG PARENT_IMAGE=openmicroscopy/omero-server:latest
+FROM ${PARENT_IMAGE}
+MAINTAINER ome-devel@lists.openmicroscopy.org.uk
+
+USER root
+
+ADD 01-default-extras.omero /opt/omero/server/config/
+
+USER omero-server

From af668ac75ffa5c83c2ff178ba78d50945a2733ef Mon Sep 17 00:00:00 2001
From: Simon Li <spli@dundee.ac.uk>
Date: Thu, 4 Jun 2020 15:46:15 +0100
Subject: [PATCH 2/4] yum clean all in main Docker image to reduce size

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8a5336e3..9081bd99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,8 @@ ADD playbook.yml requirements.yml /opt/setup/
 
 RUN yum -y install epel-release \
     && yum -y install ansible sudo \
-    && ansible-galaxy install -p /opt/setup/roles -r requirements.yml
+    && ansible-galaxy install -p /opt/setup/roles -r requirements.yml \
+    && yum clean all
 
 ARG OMERO_VERSION=5.6.1
 ARG OMEGO_ADDITIONAL_ARGS=

From e94a6e951c241a124c83b992a95e4ed538f326e8 Mon Sep 17 00:00:00 2001
From: Simon Li <spli@dundee.ac.uk>
Date: Thu, 4 Jun 2020 15:46:24 +0100
Subject: [PATCH 3/4] Install git in extras image

---
 extras/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extras/Dockerfile b/extras/Dockerfile
index 464037e2..f9457aa0 100644
--- a/extras/Dockerfile
+++ b/extras/Dockerfile
@@ -4,6 +4,10 @@ MAINTAINER ome-devel@lists.openmicroscopy.org.uk
 
 USER root
 
+RUN yum -y install \
+    git \
+    && yum clean all
+
 ADD 01-default-extras.omero /opt/omero/server/config/
 
 USER omero-server

From 9405c993bc30b2bd58d1a91a25da3eeae66e4b07 Mon Sep 17 00:00:00 2001
From: Simon Li <spli@dundee.ac.uk>
Date: Thu, 4 Jun 2020 16:40:07 +0100
Subject: [PATCH 4/4] Fix typo in Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dc63aadd..c9c08d8b 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ endif
 
 docker-build: docker-build-versions
 	docker tag $(REPO)/omero-server:$(VERSION)-$(BUILD) $(REPO)/omero-server:latest
-	docker tag $(REPO)/omero-server-standalone:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:latest
+	docker tag $(REPO)/omero-server-extras:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:latest
 
 
 docker-push-versions: