Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
openstructure
Commits
49f564e2
Commit
49f564e2
authored
4 years ago
by
Studer Gabriel
Browse files
Options
Downloads
Patches
Plain Diff
Update container base image from ubuntu:18.04 to ubuntu:20.04
parent
b3a9897d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.txt
+1
-0
1 addition, 0 deletions
CHANGELOG.txt
docker/Dockerfile
+2
-2
2 additions, 2 deletions
docker/Dockerfile
singularity/Singularity
+3
-3
3 additions, 3 deletions
singularity/Singularity
with
6 additions
and
5 deletions
CHANGELOG.txt
+
1
−
0
View file @
49f564e2
...
@@ -8,6 +8,7 @@ Changes in Release 2.2.0
...
@@ -8,6 +8,7 @@ Changes in Release 2.2.0
own code. You might have to adapt CMake flags when building OpenStructure to
own code. You might have to adapt CMake flags when building OpenStructure to
variables specified here:
variables specified here:
https://cmake.org/cmake/help/latest/module/FindPython.html
https://cmake.org/cmake/help/latest/module/FindPython.html
* Update container base image from ubuntu:18.04 to ubuntu:20.04
* Several minor bug fixes and improvements.
* Several minor bug fixes and improvements.
Changes in Release 2.1.0
Changes in Release 2.1.0
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile
+
2
−
2
View file @
49f564e2
FROM
ubuntu:
18
.04
FROM
ubuntu:
20
.04
# ARGUMENTS
# ARGUMENTS
###########
###########
...
@@ -98,7 +98,7 @@ RUN cd ${SRC_FOLDER} && \
...
@@ -98,7 +98,7 @@ RUN cd ${SRC_FOLDER} && \
#############
#############
WORKDIR
/home
WORKDIR
/home
ENV
OST_ROOT="/usr/local"
ENV
OST_ROOT="/usr/local"
ENV
PYTHONPATH="/usr/local/lib64/python3.
6
/site-packages"
ENV
PYTHONPATH="/usr/local/lib64/python3.
8
/site-packages"
ENV
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib64:/usr/local/openmm/lib/"
ENV
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib64:/usr/local/openmm/lib/"
ENV
QT_X11_NO_MITSHM=1
ENV
QT_X11_NO_MITSHM=1
ENV
OPENSTRUCTURE_VERSION=$OPENSTRUCTURE_VERSION
ENV
OPENSTRUCTURE_VERSION=$OPENSTRUCTURE_VERSION
...
...
This diff is collapsed.
Click to expand it.
singularity/Singularity
+
3
−
3
View file @
49f564e2
BootStrap: docker
BootStrap: docker
From: registry.scicore.unibas.ch/schwede/openstructure:2.2.0
From: registry.scicore.unibas.ch/schwede/openstructure:2.2.0
-focal
%post
%post
##############################################################################
##############################################################################
# POST
# POST
...
@@ -54,7 +54,7 @@ cat > $JUPYTER_PATH/kernels/ost-kernel/kernel.json <<EOF
...
@@ -54,7 +54,7 @@ cat > $JUPYTER_PATH/kernels/ost-kernel/kernel.json <<EOF
"-m", "ipykernel",
"-m", "ipykernel",
"-f", "{connection_file}",
"-f", "{connection_file}",
"--InteractiveShellApp.exec_PYTHONSTARTUP=False",
"--InteractiveShellApp.exec_PYTHONSTARTUP=False",
"--InteractiveShellApp.exec_files=['/usr/local/lib64/python3.
6
/site-packages/ost/ost_startup.py']"
"--InteractiveShellApp.exec_files=['/usr/local/lib64/python3.
8
/site-packages/ost/ost_startup.py']"
],
],
"env": {
"env": {
}
}
...
@@ -176,7 +176,7 @@ goes to CWD. Thus this sould work as expected out of the box.
...
@@ -176,7 +176,7 @@ goes to CWD. Thus this sould work as expected out of the box.
# NOTEBOOK ENV
# NOTEBOOK ENV
##############################################################################
##############################################################################
export DNG_ROOT=$OST_ROOT
export DNG_ROOT=$OST_ROOT
export DNG_INITDIR=${DNG_ROOT}/lib64/python3.
6
/site-packages/ost
export DNG_INITDIR=${DNG_ROOT}/lib64/python3.
8
/site-packages/ost
%apprun IPython
%apprun IPython
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment