Skip to content

Commit

Permalink
Merge pull request #184 from sbesson/server_certificates
Browse files Browse the repository at this point in the history
OMERO.server: self-signed SSL certificates
  • Loading branch information
sbesson authored Jul 14, 2021
2 parents fd0f546 + c3a0595 commit bf4f1f5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion home/jobs/OMERO-server/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ mv $WORKSPACE/$DIST $OMERO_DIST
# INSTALL PYTHON PACKAGES
source $WORKSPACE/.venv3/bin/activate
pip install git+git://github.com/$SPACE_USER/omero-metadata.git@$MERGE_PUSH_BRANCH#egg=omero-metadata
pip install git+git://github.com/$SPACE_USER/omero-cli-render.git@$MERGE_PUSH_BRANCH#egg=omero-cli-render
pip install omero-certificates

for x in *.tar.gz; do
pip install -U $x # Install marshal, etc. *after* requirements
Expand All @@ -144,6 +146,7 @@ omero config set omero.fs.repo.path "%user%_%userId%/%thread%//%year%-%mont
omero config set omero.db.poolsize 25
omero config set omero.security.trustStore /etc/pki/ca-trust/extracted/java/cacerts
omero config set omero.security.trustStorePassword changeit
omero certificates
## END LOAD CONFIG


Expand Down Expand Up @@ -175,4 +178,4 @@ deactivate</command>
<buildWrappers>
<hudson.plugins.timestamper.TimestamperBuildWrapper plugin="[email protected]"/>
</buildWrappers>
</project>
</project>
2 changes: 2 additions & 0 deletions server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
RUN yum install -y http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
RUN yum install -y mencoder

RUN yum install -y openssl

RUN localedef -i en_US -f UTF-8 en_US.UTF-8
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'

Expand Down

0 comments on commit bf4f1f5

Please sign in to comment.