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

Fix email #374

Merged
merged 5 commits into from
Nov 20, 2023
Merged
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
4 changes: 2 additions & 2 deletions omero/learning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@

vars:
postgresql_version: "13"
omero_server_release: 5.6.6
omero_web_release: 5.16.0
omero_server_release: 5.6.8
omero_web_release: 5.22.1
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
omero_web_apps_release:
omero_gallery: 3.4.2
Expand Down
10 changes: 5 additions & 5 deletions omero/nightshade-webclients.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@
(omero_web_config_set_for_host | default({})))
}}

omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
omero_web_release: "{{ omero_web_release_override | default('5.22.1') }}"
omero_py_release: "{{ omero_py_release_override | default('5.15.0') }}"
omero_figure_release: >-
{{ omero_figure_release_override | default('5.1.0') }}
{{ omero_figure_release_override | default('6.0.1') }}
omero_fpbioimage_release: >-
{{ omero_fpbioimage_release_override | default('0.4.0') }}
{{ omero_fpbioimage_release_override | default('0.4.1') }}
omero_iviewer_release: >-
{{ omero_iviewer_release_override | default('0.12.0') }}
{{ omero_iviewer_release_override | default('0.13.0') }}
omero_parade_release: >-
{{ omero_parade_release_override | default('0.2.3') }}
omero_webtagging_autotag_release: >-
Expand Down
38 changes: 17 additions & 21 deletions omero/ome-demoserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,15 @@

vars:
omero_figure_release: >-
{{ omero_figure_release_override | default('5.1.0') }}
{{ omero_figure_release_override | default('6.0.1') }}
omero_figure_script_release: >-
{{ omero_figure_script_release_override | default('v5.1.0') }}
{{ omero_figure_script_release_override | default('v6.0.1') }}
omero_fpbioimage_release: >-
{{ omero_fpbioimage_release_override | default('0.4.0') }}
{{ omero_fpbioimage_release_override | default('0.4.1') }}
omero_iviewer_release: >-
{{ omero_iviewer_release_override | default('0.12.0') }}
{{ omero_iviewer_release_override | default('0.13.0') }}
omero_parade_release: >-
{{ omero_parade_release_override | default('0.2.3') }}
{{ omero_parade_release_override | default('0.2.4') }}
omero_webtagging_autotag_release: >-
{{ omero_webtagging_autotag_release_override | default('3.2.0') }}
omero_webtagging_tagsearch_release: >-
Expand All @@ -349,9 +349,9 @@
{{ omero_signup_release_override | default('0.3.2') }}

omero_server_release: >-
{{ omero_server_release_override | default('5.6.6') }}
omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
{{ omero_server_release_override | default('5.6.8') }}
omero_web_release: "{{ omero_web_release_override | default('5.22.1') }}"
omero_py_release: "{{ omero_py_release_override | default('5.15.0') }}"
# For https://github.com/openmicroscopy/ansible-role-java,
# which is a dependency.
java_jdk_install: true
Expand All @@ -377,20 +377,16 @@
password: {password}\n\n
Use these login details as follows\n
1. In your browser, go to demo.openmicroscopy.org and log in.\n
2. Download the OMERO.insight [1] desktop application to im
port your first data into OMERO.\n
3. Following the steps in the omero-guide [2], change the server ad
dress to\n
demo.openmicroscopy.org and connect\n
using the login details as above to import your data.\n
4. Use the walkthrough example [3] to get ideas about ho
w to start using OMERO.\n
2. Download the OMERO.insight [1] desktop application to import\n
your first data into OMERO.\n
3. Once OMERO.insight is started, following the steps in the\n omero-guide [1], change the server address to\n
demo.openmicroscopy.org\n
and connect using the login details as above to import your data.\n
4. Use the walkthrough example [1] to get further ideas about how
to start using OMERO.\n
OME Team\n\n
[1] https://omero-guides.readthedocs.io/en/latest\
/upload/docs/import-desktop-client.html \n
[2] https://omero-guides.readthedocs.io/en/latest/upload/\
docs/import-desktop-client.html#step-by-step \n
[3] https://omero-guides.readthedocs.io/en/latest/example.html \n'
[1] In your browser, go to omero-guides.readthedocs.io/en/latest
and click on OMERO walkthrough example under Getting started.'

postgresql_version: "11"
filesystem: "xfs"
Expand Down
6 changes: 3 additions & 3 deletions omero/ome-dundeeomero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
# Note - had to have these set to `install-mock` to progress role
# installation before changing config to restored DB from other system.
- role: ome.omero_server
omero_server_release: 5.6.6
omero_server_release: 5.6.8
omero_server_datadir_manage: "{{ molecule_test | default(False) }}"
omero_server_systemd_limit_nofile: 16384
omero_server_systemd_after: >-
Expand Down Expand Up @@ -229,8 +229,8 @@
postgresql_version: "11"
filesystem: "xfs"
omero_figure_release: >-
{{ omero_figure_release_override | default('5.1.0') }}
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
{{ omero_figure_release_override | default('6.0.1') }}
omero_py_release: "{{ omero_py_release_override | default('5.15.0') }}"

omero_server_config_set_production:
omero.db.poolsize: 60
Expand Down
14 changes: 7 additions & 7 deletions omero/training-server/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -440,14 +440,14 @@
omero_server_system_managedrepo_group: managed_repo_group
omero_server_datadir_managedrepo_mode: u=rwX,g=srwX,o=rX,+t
omero_server_datadir_chown: False
omero_server_release: "{{ omero_server_release_override | default('5.6.6') }}"
omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
omero_figure_release: "{{ omero_figure_release_override | default('5.1.0') }}"
omero_fpbioimage_release: "{{ omero_fpbioimage_release_override | default('0.4.0') }}"
omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.12.0') }}"
omero_server_release: "{{ omero_server_release_override | default('5.6.8') }}"
omero_web_release: "{{ omero_web_release_override | default('5.22.1') }}"
omero_figure_release: "{{ omero_figure_release_override | default('6.0.1') }}"
omero_fpbioimage_release: "{{ omero_fpbioimage_release_override | default('0.4.1') }}"
omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.13.0') }}"
omero_mapr_release: "{{ omero_mapr_release_override | default('0.5.0') }}"
omero_parade_release: "{{ omero_parade_release_override | default('0.2.3') }}"
omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
omero_parade_release: "{{ omero_parade_release_override | default('0.2.4') }}"
omero_py_release: "{{ omero_py_release_override | default('5.15.0') }}"

# The omero_web_apps_* vars are used by the ome.omero_web role under
# Python 3 otherwise ignored
Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
version: 1.2.0

- name: ome.omero_prometheus_exporter
version: 0.3.3
version: 0.3.6

- name: ome.omero_server
version: 4.0.2
Expand Down