Skip to content
Snippets Groups Projects

Update master

Merged Update master
update_master into master
Merged Sylvester Joosten requested to merge update_master into master
Compare
and
4 files
+ 11
− 5
Compare changes
  • Side-by-side
  • Inline
Files
4
containers/jug/Dockerfile.dev
+ 6
− 0
@@ -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