Skip to content
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.

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

Move unnecessary deps from production image into devtest image #54

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,16 @@ endif
@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
docker tag $(REPO)/omero-web-standalone:$(VERSION)-$(BUILD) $(REPO)/omero-web-standalone:$$MAJOR_MINOR

docker build --build-arg=PARENT_IMAGE=$(REPO)/omero-web-standalone:$(VERSION) -t $(REPO)/omero-web-devtest:$(VERSION)-$(BUILD) devtest
docker tag $(REPO)/omero-web-devtest:$(VERSION)-$(BUILD) $(REPO)/omero-web-devtest:$(VERSION)
@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
docker tag $(REPO)/omero-web-devtest:$(VERSION)-$(BUILD) $(REPO)/omero-web-devtest:$$MAJOR_MINOR


docker-build: docker-build-versions
docker tag $(REPO)/omero-web:$(VERSION)-$(BUILD) $(REPO)/omero-web:latest
docker tag $(REPO)/omero-web-standalone:$(VERSION)-$(BUILD) $(REPO)/omero-web-standalone:latest
docker tag $(REPO)/omero-web-devtest:$(VERSION)-$(BUILD) $(REPO)/omero-web-devtest:latest


docker-push-versions:
Expand All @@ -98,6 +104,12 @@ endif
@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
docker push $(REPO)/omero-web-standalone:$$MAJOR_MINOR

docker push $(REPO)/omero-web-devtest:$(VERSION)-$(BUILD)
docker push $(REPO)/omero-web-devtest:$(VERSION)
@MAJOR_MINOR=$(shell echo $(VERSION) | cut -f1-2 -d. );\
docker push $(REPO)/omero-web-devtest:$$MAJOR_MINOR

docker-push: docker-push-versions
docker push $(REPO)/omero-web:latest
docker push $(REPO)/omero-web-standalone:latest
docker push $(REPO)/omero-web-devtest:latest
20 changes: 20 additions & 0 deletions devtest/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ARG PARENT_IMAGE=openmicroscopy/omero-web-standalone:latest
FROM ${PARENT_IMAGE}
MAINTAINER [email protected]

USER root

RUN yum install -y -q \
java-11-openjdk \
patch \
redhat-lsb-core \
rsync \
tar \
unzip \
wget \
zip

# Shouldn't be necessary any more since OMERO.web/bin/omero is a Python script but included anyway from previous image used in https://github.com/ome/omero-test-infra
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What would take to strip it from test-infra?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know, though I suspect it might already work. My intention in this PR was to minimise changes that might impact omero-test-infra, but if you're happy with larger changes I can try removing it.

RUN rm /opt/omero/web/OMERO.web/bin/omero && ln -s /opt/omero/web/venv3/bin/omero /opt/omero/web/OMERO.web/bin/omero

USER omero-web
1 change: 0 additions & 1 deletion playbook.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
- hosts: localhost
roles:
- role: ome.omero_web
- role: ome.java
vars:
ice_version: "3.6"
ice_install_devel: False
Expand Down
6 changes: 3 additions & 3 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
version: 1.1.0

- src: ome.ice
version: 3.1.0
version: 4.1.0

- src: ome.java
version: 2.0.3
version: 2.1.0

- src: ome.omero_common
version: 0.3.2

- name: ome.omero_web
version: 3.0.0
version: 3.1.0