Skip to content

Commit

Permalink
Further tweaks to Docker instructions in README. Use omero-web-standa…
Browse files Browse the repository at this point in the history
…lone:latest in Dockerfile
  • Loading branch information
will-moore committed Dec 8, 2023
1 parent 43e4aee commit e264b8b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openmicroscopy/omero-web-standalone:5.21.0
FROM openmicroscopy/omero-web-standalone:latest

USER root
RUN yum -y install npm
Expand Down
20 changes: 11 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -184,35 +184,37 @@ Using Docker
************

It is also possible to develop figure in docker without installing anything locally.
The Docker image is built on top of ``openmicroscopy/omero-web-standalone:latest``, so you will have a fully functional
omero-web environment while developing ``omero-figure``.
The Docker image at ``omero-figure/Dockerfile`` is built on top of
`openmicroscopy/omero-web-standalone:latest <https://hub.docker.com/r/openmicroscopy/omero-web-standalone>`_,
so you will have a fully functional omero-web environment while developing ``omero-figure``.
First build the Docker image and specify the server you wish to connect to:

::

$ cd omero-figure
$ docker build -t figure-devel .
$ export OMEROHOST=demo.openmicroscopy.org


To develop ``omero-figure`` you can either make all the changes within the Docker container itself by running:
The preferred option is to mount the repository containing the omero-figure code. You can make the changes locally and run `grunt watch`
as described above and see changes in the docker container. To do so, run:
::

$ docker run -ti -e OMEROHOST -p 4080:4080 -v /PATH_TO_GIT_REPO/omero-figure:/home/figure/src figure-devel

$ docker run -ti -e OMEROHOST -p 4080:4080 figure-devel

The preferred option is to mount the repository containing the omero-figure code. Make the changes locally and see the changes in the docker container. To do so, run:
Alternatively, to run and develop ``omero-figure`` within the Docker container itself:
::

$ docker run -ti -e OMEROHOST -p 4080:4080 -v /PATH_TO_GIT_REPO/omero-figure:/home/figure/src figure-devel

$ docker run -ti -e OMEROHOST -p 4080:4080 figure-devel

After starting the container, run ``docker ps`` in another terminal to find the ID of the container. Then run:

::

$ docker exec -u 0 -it CONTAINER_ID bash # replace CONTAINER_ID by the correct value
$ cd /home/figure/src
$ grunt watch
$ vi src/js/app.js
$ grunt build # or run grunt watch in another terminal



Expand Down

0 comments on commit e264b8b

Please sign in to comment.