Skip to content
Snippets Groups Projects
Commit 4c8e1ed0 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Merge branch 'update_master' into 'master'

Update master

See merge request !53
parents 69308250 cc9a3ac1
No related branches found
No related tags found
1 merge request!53Update master
...@@ -39,9 +39,9 @@ cd eic_container ...@@ -39,9 +39,9 @@ cd eic_container
modeuefile will be installed to `$PREFIX/../../etc/modulefiles`. modeuefile will be installed to `$PREFIX/../../etc/modulefiles`.
You can use the `-v` flag to select the version you want to install, or omit the You can use the `-v` flag to select the version you want to install, or omit the
flag if you want to install the master build. The recommended stable flag if you want to install the master build. The recommended stable
release version is `v3.0.0`. release version is `v3.0.1`.
```bash ```bash
./install.py -v 3.0.0 <PREFIX> ./install.py -v 3.0.1 <PREFIX>
``` ```
Available flags: Available flags:
...@@ -49,7 +49,7 @@ cd eic_container ...@@ -49,7 +49,7 @@ cd eic_container
-c CONTAINER, --container CONTAINER -c CONTAINER, --container CONTAINER
(opt.) Container to install. D: jug_xl (also available: jug_dev, and legacy eic container). (opt.) Container to install. D: jug_xl (also available: jug_dev, and legacy eic container).
-v VERSION, --version VERSION -v VERSION, --version VERSION
(opt.) project version. D: 3.0.0. For MRs, use mr-XXX. (opt.) project version. D: 3.0.1. For MRs, use mr-XXX.
-f, --force Force-overwrite already downloaded container -f, --force Force-overwrite already downloaded container
-b BIND_PATHS, --bind-path BIND_PATHS -b BIND_PATHS, --bind-path BIND_PATHS
(opt.) extra bind paths for singularity. (opt.) extra bind paths for singularity.
......
...@@ -206,6 +206,12 @@ RUN --mount=from=staging,target=/staging \ ...@@ -206,6 +206,12 @@ RUN --mount=from=staging,target=/staging \
&& sed -i '/MANPATH/ s/;$/:;/' /etc/eic-env.sh \ && sed -i '/MANPATH/ s/;$/:;/' /etc/eic-env.sh \
&& cp /etc/eic-env.sh /etc/profile.d/z10_eic-env.sh && cp /etc/eic-env.sh /etc/profile.d/z10_eic-env.sh
## Bugfix to address issues loading the Qt5 libraries on Linux kernels prior to 3.15
## See
#https://askubuntu.com/questions/1034313/ubuntu-18-4-libqt5core-so-5-cannot-open-shared-object-file-no-such-file-or-dir
## and links therin for more info
RUN strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so
COPY eic-shell /usr/local/bin/eic-shell COPY eic-shell /usr/local/bin/eic-shell
## make sure we have the entrypoints setup correctly ## make sure we have the entrypoints setup correctly
......
...@@ -20,7 +20,7 @@ import urllib.request ...@@ -20,7 +20,7 @@ import urllib.request
## Gitlab group and project/program name. ## Gitlab group and project/program name.
DEFAULT_IMG='jug_xl' DEFAULT_IMG='jug_xl'
DEFAULT_VERSION='3.0.0' DEFAULT_VERSION='3.0.1'
SHORTCUTS = ['eic-shell'] SHORTCUTS = ['eic-shell']
......
#!/bin/bash #!/bin/bash
CONTAINER=jug_xl CONTAINER=jug_xl
VERSION=3.0.0 VERSION=3.0.1
## Simple setup script that installs the container ## Simple setup script that installs the container
## in your local environment under $PWD/local/lib ## in your local environment under $PWD/local/lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment