Skip to content

Add infrastructure for a server extras image #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
manics wants to merge 4 commits into from
Closed

Add infrastructure for a server extras image #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3dc040e
Add infrastructure for an server extras image
manics Dec 12, 2019
af668ac
yum clean all in main Docker image to reduce size
manics Jun 4, 2020
e94a6e9
Install git in extras image
manics Jun 4, 2020
9405c99
Fix typo in Makefile
manics Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
15 changes: 14 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-extras:$(VERSION)-$(BUILD) $(REPO)/omero-server-extras:latest


docker-push-versions:
Expand All @@ -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
1 change: 1 addition & 0 deletions extras/01-default-extras.omero
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# OMERO.server extras
13 changes: 13 additions & 0 deletions extras/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ARG PARENT_IMAGE=openmicroscopy/omero-server:latest
FROM ${PARENT_IMAGE}
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