Push to dockerhub #63

jburel · 2022-03-14T13:42:05Z

https://hub.docker.com/r/openmicroscopy/omero-web/ and https://hub.docker.com/r/openmicroscopy/omero-web-standalone/ have not been updated since the release of omero-web 5.11
This PR automatically will push to dockerhub when a tag is pushed to this repo

cc @sbesson @will-moore

Tested using my account see https://hub.docker.com/r/jburel/omero-web/ and https://hub.docker.com/r/jburel/omero-web-standalone

sbesson · 2022-03-14T13:50:18Z

I assume the tag still must be created using https://github.com/ome/omero-web-docker/blob/master/Makefile i.e. replacing the variables and effectively, this replaces the docker-build and docker-push steps?

jburel · 2022-03-14T13:56:12Z

The tag needs to be created and pushed cf. description. The changes follow a similar approach that the one taken in omero-server-docker and replace docker-build/push
Another option could be to post an event from omero-web when a tag is pushed and listen to that event here but it is outside the scope of this PR

sbesson

The images pushed to https://hub.docker.com/r/jburel/omero-web/tags and https://hub.docker.com/r/jburel/omero-web-standalone/tags have exactly the same checksums and sizes. I assume the build step needs to specify which Dockerfile should be used for each image, which in turn might speak for creating two upload workflows rather than combining them into one.

jburel · 2022-03-15T09:09:25Z

I realised that afterwards. I am going to slip things up

.github/workflows/main.yml

jburel · 2022-03-16T09:27:07Z

@sbesson problem is now fixed
https://hub.docker.com/repository/docker/jburel/omero-web
https://hub.docker.com/repository/docker/jburel/omero-web-standalone
different checksums and sizes.

sbesson

The updated logic makes sense although I haven't functionally tested the generated images. Getting it in will certainly automate part of the update of these images and reduce the manual load.

I share some of the re-usability concerns expressed here and in #64 (comment). In the case of these images. I assume the only way to reduce the customization of the workflow would be to extract the standalone Docker files into its own repository.

jburel · 2022-03-18T09:07:03Z

As indicated previously during discussion, web-standalone should be extracted so we can push a new version each time a new web app included in the standalone image is released.
When that is done, we can have a reusable workflow i.e. omero-server-docker and omero-web-docker will follow a similar pattern

sbesson · 2022-03-18T09:10:11Z

As indicated previously during discussion, web-standalone should be extracted so we can push a new version each time a new web app included in the standalone image is released.

But the extraction will break the workflow that is proposed in this PR. So I guess the question is whether we want to extrac first or capture as an issue and come back to it?

jburel · 2022-03-18T09:12:37Z

If we extract, of course the workflow will need to be reviewed. The proposed changes automate the build/push of the images.
I think we can extract afterwards and adjust accordingly

jburel · 2022-03-18T09:14:04Z

#53 already captures the release of apps problem. i did not notice the issue

jburel · 2022-03-18T11:41:33Z

The commit 6d985b7 adds labels cf. in ome/omero-server-docker#57. More labels than the 3 current listed in the Dockerfile are added.

List of labels:

org.opencontainers.image.title=omero-web-docker
  org.opencontainers.image.description= OMERO.web production docker image
  org.opencontainers.image.url=https://github.com/***/omero-web-docker
  org.opencontainers.image.source=https://github.com/***/omero-web-docker
  org.opencontainers.image.version=5.13.0-15
  org.opencontainers.image.created=2022-03-18T11:40:23.[34](https://github.com/jburel/omero-web-docker/runs/5599778430?check_suite_focus=true#step:3:34)5Z
  org.opencontainers.image.revision=6d985b7284edacba4f3d094d43ddeb3c[39](https://github.com/jburel/omero-web-docker/runs/5599778430?check_suite_focus=true#step:3:39)73075f
  org.opencontainers.image.licenses=

jburel · 2022-03-18T11:48:11Z

Images rebuilt see https://hub.docker.com/repository/docker/jburel/omero-web and https://hub.docker.com/repository/docker/jburel/omero-web-standalone

sbesson

(base) [sbesson@idr2-slot3 ~]$ docker pull jburel/omero-web:latest && docker inspect jburel/omero-web:latest | grep opencon
latest: Pulling from jburel/omero-web
Digest: sha256:e55b1e767779aa51517d979a2c8482ee83eea16e406d149ea376abae5966eeeb
Status: Image is up to date for jburel/omero-web:latest
docker.io/jburel/omero-web:latest
                "org.opencontainers.image.created": "2022-03-18T11:40:23.345Z",
                "org.opencontainers.image.description": " OMERO.web production docker image",
                "org.opencontainers.image.licenses": "",
                "org.opencontainers.image.revision": "6d985b7284edacba4f3d094d43ddeb3c3973075f",
                "org.opencontainers.image.source": "https://github.com/jburel/omero-web-docker",
                "org.opencontainers.image.title": "omero-web-docker",
                "org.opencontainers.image.url": "https://github.com/jburel/omero-web-docker",
                "org.opencontainers.image.vendor": "CentOS",
                "org.opencontainers.image.version": "5.13.0-15"
(base) [sbesson@idr2-slot3 ~]$ docker pull jburel/omero-web-standalone:latest && docker inspect jburel/omero-web-standalone:latest  | grep opencon
latest: Pulling from jburel/omero-web-standalone
Digest: sha256:eafffcf657c150dcaf1c715c62872fa379750f461100a9bb7fcd3046149e0025
Status: Image is up to date for jburel/omero-web-standalone:latest
docker.io/jburel/omero-web-standalone:latest
                "org.opencontainers.image.created": "2022-03-18T11:40:23.345Z",
                "org.opencontainers.image.description": " OMERO.web production docker image",
                "org.opencontainers.image.licenses": "",
                "org.opencontainers.image.revision": "6d985b7284edacba4f3d094d43ddeb3c3973075f",
                "org.opencontainers.image.source": "https://github.com/jburel/omero-web-docker",
                "org.opencontainers.image.title": "omero-web-docker",
                "org.opencontainers.image.url": "https://github.com/jburel/omero-web-docker",
                "org.opencontainers.image.vendor": "CentOS",
                "org.opencontainers.image.version": "5.13.0-15"

Looks good. Can you clean up the corresponding LABEL statements from the Dockerfile for both images?

The redundancy of org.opencontainers.image.title and other metadata is probably an indicator that we will need to extract the standalone image eventually

jburel · 2022-03-21T09:38:04Z

@sbesson I have cleaned up the LABEL.
It will be good to have this PR merged before deploying omero-web so I can tag with a 5.13 web then a Django upgrade image.

sbesson

There are a few potential follow-ups mentioned in the thread worth capturing as issues but otherwise I am fine for this to get merged to start making incremental improvement of our deployment workflow

sbesson · 2022-03-21T11:10:25Z

Makefile

@@ -34,8 +34,6 @@ ifndef VERSION
 endif

 	perl -i -pe 's/OMERO_VERSION=(\S+)/OMERO_VERSION=$(VERSION)/' Dockerfile


Since I cannot spot any OMERO_VERSION left in Dockerfile, these changes might make the Makefile irrelevant and it can probably cleaned up as a follow-up.

I could not spot it but I kept it "just in case"
With the automation option proposed in another PR, the Makefile will become totally irrelevant

jburel added 5 commits March 14, 2022 11:28

deploy on dockerhub

fca01be

use-standalone

e1c6531

add missing character

8212d9b

simplify

a5e737e

use official repo

a1fd2e5

sbesson requested changes Mar 14, 2022

View reviewed changes

jburel added 4 commits March 15, 2022 09:15

fix typo

067325a

add line

56cef6a

split workflow

05f43bf

use personal repo

b57731b

jburel force-pushed the build branch from d661910 to 3fba6d8 Compare March 15, 2022 11:24

use args

bd6e438

jburel force-pushed the build branch from 3fba6d8 to bd6e438 Compare March 15, 2022 11:25

joshmoore reviewed Mar 15, 2022

View reviewed changes

.github/workflows/main.yml Show resolved Hide resolved

set context using path and checkout

2147e6b

jburel force-pushed the build branch from 8384a90 to 2147e6b Compare March 16, 2022 09:13

use official repo

9aee4ed

jburel mentioned this pull request Mar 16, 2022

Find upstream tag and Create tag #64

Open

sbesson approved these changes Mar 18, 2022

View reviewed changes

add labels

6d985b7

sbesson requested changes Mar 18, 2022

View reviewed changes

jburel added 3 commits March 18, 2022 13:36

use official repo

3a10477

remove label

0ceb75a

remove label

35afa24

jburel mentioned this pull request Mar 18, 2022

Labels ome/omero-server-docker#63

Closed

sbesson approved these changes Mar 21, 2022

View reviewed changes

This was referenced Mar 21, 2022

Makefile usage #65

Open

Rebuild on each iviewer release, etc. #53

Open

jburel merged commit 9f85a7d into ome:master Mar 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Push to dockerhub #63

Push to dockerhub #63

jburel commented Mar 14, 2022 •

edited

Loading

sbesson commented Mar 14, 2022

jburel commented Mar 14, 2022 •

edited

Loading

sbesson left a comment

jburel commented Mar 15, 2022

jburel commented Mar 16, 2022

sbesson left a comment

jburel commented Mar 18, 2022

sbesson commented Mar 18, 2022

jburel commented Mar 18, 2022

jburel commented Mar 18, 2022

jburel commented Mar 18, 2022 •

edited

Loading

jburel commented Mar 18, 2022

sbesson left a comment

jburel commented Mar 21, 2022 •

edited

Loading

sbesson left a comment

sbesson Mar 21, 2022

jburel Mar 21, 2022

		@@ -34,8 +34,6 @@ ifndef VERSION
		endif

		perl -i -pe 's/OMERO_VERSION=(\S+)/OMERO_VERSION=$(VERSION)/' Dockerfile

Push to dockerhub #63

Push to dockerhub #63

Conversation

jburel commented Mar 14, 2022 • edited Loading

sbesson commented Mar 14, 2022

jburel commented Mar 14, 2022 • edited Loading

sbesson left a comment

Choose a reason for hiding this comment

jburel commented Mar 15, 2022

jburel commented Mar 16, 2022

sbesson left a comment

Choose a reason for hiding this comment

jburel commented Mar 18, 2022

sbesson commented Mar 18, 2022

jburel commented Mar 18, 2022

jburel commented Mar 18, 2022

jburel commented Mar 18, 2022 • edited Loading

jburel commented Mar 18, 2022

sbesson left a comment

Choose a reason for hiding this comment

jburel commented Mar 21, 2022 • edited Loading

sbesson left a comment

Choose a reason for hiding this comment

sbesson Mar 21, 2022

Choose a reason for hiding this comment

jburel Mar 21, 2022

Choose a reason for hiding this comment

jburel commented Mar 14, 2022 •

edited

Loading

jburel commented Mar 14, 2022 •

edited

Loading

jburel commented Mar 18, 2022 •

edited

Loading

jburel commented Mar 21, 2022 •

edited

Loading