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

Server installation #2036

Merged
merged 21 commits into from
Nov 28, 2019
Merged

Server installation #2036

merged 21 commits into from
Nov 28, 2019

Conversation

jburel
Copy link
Member

@jburel jburel commented Nov 26, 2019

Review installation instructions

@joshmoore joshmoore added this to In progress in OMERO.server 5.6.0 (Python 3) via automation Nov 27, 2019
@jburel jburel changed the title WIP: Server installation Server installation Nov 27, 2019
@snoopycrimecop
Copy link
Member

snoopycrimecop commented Nov 27, 2019

Conflicting PR. Removed from build OMERO-docs-superbuild-push#25. See the console output for more details.
Possible conflicts:

  • PR Merge build #2035 joshmoore 'Merge build (WIP)'
    • omero/sysadmins/unix/walkthrough/walkthrough_centos7.sh

--conflicts Conflict resolved in build OMERO-docs-superbuild-push#26. See the console output for more details.

@joshmoore
Copy link
Member

My fault, @jburel. I accidentally included files that were code-generated. They've now been removed.

@jburel
Copy link
Member Author

jburel commented Nov 27, 2019

Thanks

@ome ome deleted a comment from snoopycrimecop Nov 27, 2019
@jburel
Copy link
Member Author

jburel commented Nov 28, 2019

Following today's discussion, the walkthroughs will need to be reviewed.
If we are happy with the other changes it might be preferable to ignore changes made in the walkthroughs in that PR
and rework them in a follow-up one

Copy link
Member

@manics manics left a comment

Choose a reason for hiding this comment

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

Looks generally fine.

Just realised I've commented on some of the auto-generated docs...

omero/sysadmins/server-advanced-configuration.rst Outdated Show resolved Hide resolved
omero/sysadmins/server-advanced-configuration.rst Outdated Show resolved Hide resolved
omero/sysadmins/server-advanced-configuration.rst Outdated Show resolved Hide resolved
@@ -90,7 +90,7 @@ After that, the following should succeed:
your operating system's package installer if possible or if you must
instead use PyPI_ directly::

pip install mock
pip3 install mock
Copy link
Member

Choose a reason for hiding this comment

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

FYI need to be careful with pip / pip3. Sometimes the 3 version is missing from a virtualenv in which case pip3 might refer to a global pip. Something to check later.

omero/sysadmins/unix/install-web/web-deployment.rst Outdated Show resolved Hide resolved
omero/sysadmins/unix/server-installation.rst Outdated Show resolved Hide resolved
@@ -15,11 +15,11 @@ yum -y install java-1.8.0-openjdk

# install dependencies

yum -y install python-{pip,devel,virtualenv,yaml,jinja2,tables}
yum -y install python3-{pip,devel,virtualenv,yaml,jinja2,tables}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
yum -y install python3-{pip,devel,virtualenv,yaml,jinja2,tables}
yum -y install python3

Copy link
Member Author

Choose a reason for hiding this comment

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

Those changes are made in omero-install so they will be overridden

@@ -30,8 +30,6 @@ yum -y install libdb-utils
yum -y install openssl-devel bzip2-devel
Copy link
Member

Choose a reason for hiding this comment

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

I don't think these are necessary if everything is installed using wheels

OMERO.server/bin/omero config set omero.db.pass "$OMERO_DB_PASS"
OMERO.server/bin/omero db script -f OMERO.server/db.sql --password "$OMERO_ROOT_PASS"
# set OMERODIR
export OMERODIR=OMERO.server
Copy link
Member

Choose a reason for hiding this comment

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

probably safer to use the full absolute path

Copy link
Member Author

Choose a reason for hiding this comment

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

this has been changed in omero-install

@@ -18,24 +18,23 @@ apt-get -y install openjdk-8-jre-headless

# install dependencies

apt-get -y install python-{pip,virtualenv,yaml,jinja2}
apt-get -y install python3-{pip,venv,yaml,jinja2}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
apt-get -y install python3-{pip,venv,yaml,jinja2}
apt-get -y install python3-{pip,venv}

jburel and others added 2 commits November 28, 2019 13:57
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
@jburel
Copy link
Member Author

jburel commented Nov 28, 2019

@manics changes to the walkthroughs have to be done in omero-install.
I am currently working on that. so no need to integrate them

jburel and others added 10 commits November 28, 2019 14:07
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
Copy link
Member

@manics manics left a comment

Choose a reason for hiding this comment

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

As discussed in the office merge this and continue working in separate PRs.

@jburel jburel merged commit e367706 into ome:develop Nov 28, 2019
OMERO.server 5.6.0 (Python 3) automation moved this from In progress to Done Nov 28, 2019
@jburel jburel deleted the server-installation branch August 21, 2020 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants