Ansible updates #38

manics · 2019-11-20T12:38:12Z

/opt/omero/web/OMERO.web/bin/omero is a python wrapper that sets OMERODIR.

Also cleans up the Dockerfile.

Note this is includes #44

joshmoore · 2019-11-20T12:41:32Z

Dockerfile

@@ -13,11 +13,9 @@ RUN yum -y install epel-release \
    && yum -y install ansible sudo \
    && ansible-galaxy install -p /opt/setup/roles -r requirements.yml

-ARG OMERO_VERSION=5.6.0-m1
-ARG OMEGO_ADDITIONAL_ARGS=


Why is OMEGO_ADDITIONAL_ARGS removed? Isn't that still necessary if someone wants a merge build?

We're not using omego

Can you outline how to do this then?

If there's a URL to a zip somewhere I can update the role. Would it just be for OMERO.web, or for OMERO.py, OMERO.marshal, etc?

The previous functionality encompassed py, web, dropbox, marshal.

I'd add this as a use case to consider in ome/ansible-role-omero-web#27

👍 see also #33

--> ome/ansible-role-omero-web#29

snoopycrimecop · 2019-11-22T01:10:02Z

Conflicting PR. Removed from build DOCKER-merge#965. See the console output for more details.
Possible conflicts:

Upstream changes
- Dockerfile

--conflicts

requirements.yml

Dockerfile

snoopycrimecop · 2019-11-29T01:10:14Z

Conflicting PR. Removed from build DOCKER-merge#972. See the console output for more details.
Possible conflicts:

Upstream changes
- Dockerfile

--conflicts

snoopycrimecop · 2019-11-30T01:10:06Z

Conflicting PR. Removed from build DOCKER-merge#973. See the console output for more details.
Possible conflicts:

Upstream changes
- Dockerfile

~~--conflicts~~ Conflict resolved in build DOCKER-merge#986. See the console output for more details.

manics · 2019-12-12T17:17:36Z

This is now rebased on top of #44

manics · 2019-12-19T09:48:17Z

Dockerfile

 USER omero-web
 EXPOSE 4080
 VOLUME ["/opt/omero/web/OMERO.web/var"]

-ENV OMERODIR=/opt/omero/web/OMERO.web/


Not sure about this. It's set in the wrapper script. Delete it, keep it, or keep it only in the devtest image?

For uses without the wrapper (i.e. with venv3/bin/omero, I'd keep it.) No strong feeling over here or only in devtest if the latter works, but at least in omero-server there were various requirements to have it defined earlier (e.g. pre-omego)

manics · 2019-12-19T17:26:49Z

omero-mapr passes with this PR: ome/omero-mapr#60

manics · 2019-12-19T19:21:28Z

Removing basedeps didn't save as much as I expected. Clearing the yum cache saves a lot though:

manics/omero-web-devtest                     dev.pr38.3-0        54fb058b7cd0        24 minutes ago      856MB
manics/omero-web-standalone                  dev.pr38.3-0        d077c5077a75        27 minutes ago      627MB
manics/omero-web                             dev.pr38.3-0        cb3caa29d138        27 minutes ago      620MB

snoopycrimecop · 2020-01-16T01:10:27Z

Conflicting PR. Removed from build DOCKER-merge#1020. See the console output for more details.
Possible conflicts:

Upstream changes
- requirements.yml
- playbook.yml

~~--conflicts~~ Conflict resolved in build DOCKER-merge#1063. See the console output for more details.

E.g. `make VERSION=x.y.z docker-build` ``` openmicroscopy/omero-web-devtest x.y.z b109930c8052 27 seconds ago 1.2GB openmicroscopy/omero-web-devtest x.y.z-0 b109930c8052 27 seconds ago 1.2GB openmicroscopy/omero-web-standalone x.y.z d23d308c0d4f 9 minutes ago 869MB openmicroscopy/omero-web-standalone x.y.z-0 d23d308c0d4f 9 minutes ago 869MB openmicroscopy/omero-web x.y.z 3331af321dd0 9 minutes ago 862MB openmicroscopy/omero-web x.y.z-0 3331af321dd0 9 minutes ago 862MB ```

Use /opt/omero/web/OMERO.web/bin/omero wrapper

ome/ansible-role-omero-web#30

Previously this was using the latest pypi package

manics · 2020-06-04T11:44:19Z

Rebased, and added git to the devtest image to handle ome/omero-plugins#33 (comment)

joshmoore reviewed Nov 20, 2019

View reviewed changes

joshmoore mentioned this pull request Nov 21, 2019

bin/omero: workaround for python bin/omero import usage #37

Merged

manics commented Nov 28, 2019

View reviewed changes

requirements.yml Outdated Show resolved Hide resolved

requirements.yml Outdated Show resolved Hide resolved

Dockerfile Outdated Show resolved Hide resolved

joshmoore mentioned this pull request Nov 29, 2019

Support merge builds ome/ansible-role-omero-web#29

Open

manics force-pushed the ansible-updates branch 2 times, most recently from b92ecb9 to b0da6ff Compare December 12, 2019 16:51

manics commented Dec 19, 2019

View reviewed changes

manics mentioned this pull request Dec 19, 2019

[Do not merge] Test manics/omero-web-devtest:dev.pr38 ome/omero-mapr#60

Closed

manics mentioned this pull request Dec 19, 2019

Tasks for 5.6.0 release #45

Open

9 tasks

joshmoore mentioned this pull request Jan 20, 2020

Unpin whitenoise and bump plugins #49

Merged

manics force-pushed the ansible-updates branch from 46214a6 to 311729a Compare February 27, 2020 11:46

manics mentioned this pull request Feb 27, 2020

Move unnecessary deps from production image into devtest image #44

Closed

manics added 11 commits June 4, 2020 12:29

Remove unused ice vars

700f99b

update build-args for python3

341f940

Remove ENV OMERODIR (set in bin/omero)

1a68b3c

Use /opt/omero/web/OMERO.web/bin/omero wrapper

Update dumb-init 1.2.2

c98da7b

Remove faffing with OMERO.web/bin/omero in devtest

f438dd7

Use omero config glob feature

6417fce

ome/ansible-role-omero-web#30

omit basedeps ome/ansible-role-omero-web#32

db58177

yum clean all

f950b22

OMERO.web version can be specified

fcedf9b

Previously this was using the latest pypi package

Fix travis build.sh

cee884a

manics added 2 commits June 4, 2020 12:31

Update requirements

06efe1a

Include git in devtest

7f52576

manics force-pushed the ansible-updates branch from bfdad9a to 7f52576 Compare June 4, 2020 11:32

manics mentioned this pull request Jun 4, 2020

Switch to devtest image ome/omero-test-infra#54

Closed

manics mentioned this pull request Sep 30, 2020

Move unnecessary deps from production image into devtest image #54

Open

manics closed this Oct 1, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ansible updates #38

Ansible updates #38

manics commented Nov 20, 2019 •

edited

Loading

joshmoore Nov 20, 2019 •

edited

Loading

manics Nov 20, 2019

joshmoore Nov 20, 2019

manics Nov 20, 2019

joshmoore Nov 20, 2019

manics Nov 20, 2019

joshmoore Nov 20, 2019

joshmoore Nov 29, 2019

snoopycrimecop commented Nov 22, 2019

snoopycrimecop commented Nov 29, 2019

snoopycrimecop commented Nov 30, 2019 •

edited

Loading

manics commented Dec 12, 2019

manics Dec 19, 2019

joshmoore Dec 19, 2019

manics commented Dec 19, 2019

manics commented Dec 19, 2019

snoopycrimecop commented Jan 16, 2020 •

edited

Loading

manics commented Jun 4, 2020

Ansible updates #38

Ansible updates #38

Conversation

manics commented Nov 20, 2019 • edited Loading

joshmoore Nov 20, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

snoopycrimecop commented Nov 22, 2019

snoopycrimecop commented Nov 29, 2019

snoopycrimecop commented Nov 30, 2019 • edited Loading

manics commented Dec 12, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

manics commented Dec 19, 2019

manics commented Dec 19, 2019

snoopycrimecop commented Jan 16, 2020 • edited Loading

manics commented Jun 4, 2020

manics commented Nov 20, 2019 •

edited

Loading

joshmoore Nov 20, 2019 •

edited

Loading

snoopycrimecop commented Nov 30, 2019 •

edited

Loading

snoopycrimecop commented Jan 16, 2020 •

edited

Loading