diff --git a/sharemind/Dockerfile b/sharemind/Dockerfile index afa0ced..9b7466b 100644 --- a/sharemind/Dockerfile +++ b/sharemind/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:22.04 WORKDIR /root RUN apt-get update && apt-get install -y \ bison \ @@ -13,25 +13,25 @@ RUN apt-get update && apt-get install -y \ libboost-iostreams-dev \ libboost-program-options-dev \ libboost-system-dev \ - libbz2-dev \ + #libbz2-dev \ libcrypto++-dev \ - libgmp-dev \ - libgnutls28-dev \ + #libgmp-dev \ + #libgnutls28-dev \ libhdf5-dev \ libhiredis-dev \ libmpfr-dev \ - libssl-dev \ + #libssl-dev \ m4 \ make \ - nettle-dev \ - patch \ - pkg-config \ + #nettle-dev \ + #patch \ + #pkg-config \ vim \ wget \ xz-utils RUN apt-get install -y --no-install-recommends doxygen ADD source/ /root/source -ENV LD_LIBRARY_PATH /root/build-sdk/prefix/lib +#ENV LD_LIBRARY_PATH /root/build-sdk/prefix/lib #ADD README.md . ADD install.sh . RUN ["bash", "install.sh"] diff --git a/sharemind/install.sh b/sharemind/install.sh index 9795809..3cd07ee 100644 --- a/sharemind/install.sh +++ b/sharemind/install.sh @@ -1,14 +1,16 @@ +set -ex + # install proper cmake version -wget https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.sh -sh cmake-3.11.0-Linux-x86_64.sh --skip-license --include-subdir -cp cmake-3.11.0-Linux-x86_64/bin/* /usr/bin/ -cp -r cmake-3.11.0-Linux-x86_64/share/* /usr/share/ -rm -r cmake-3.11* +#wget https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.sh +#sh cmake-3.11.0-Linux-x86_64.sh --skip-license --include-subdir +#cp cmake-3.11.0-Linux-x86_64/bin/* /usr/bin/ +#cp -r cmake-3.11.0-Linux-x86_64/share/* /usr/share/ +#rm -r cmake-3.11* # install sharemind sdk git clone https://github.com/sharemind-sdk/build-sdk.git cd build-sdk -git checkout tags/release_2017.12 +git checkout tags/release_2022.03 cp ~/source/config.local . mkdir build cd build @@ -17,15 +19,15 @@ make cp /root/build-sdk/prefix/bin/* /usr/bin/ # copy config files from VM setup into the expected location -CONFIG_DIR="/home/sharemind/.config/" -cd -git clone https://github.com/sharemind-sdk/packer-sharemind-sdk.git -cd packer-sharemind-sdk -git checkout tags/release_2017.12 -mkdir -p $CONFIG_DIR -mv sharemind-sdk/files/sdk/sharemind-config/sharemind $CONFIG_DIR -cd -rm -r packer-sharemind-sdk -ln -s $CONFIG_DIR .config +#CONFIG_DIR="/home/sharemind/.config/" +#cd +#git clone https://github.com/sharemind-sdk/packer-sharemind-sdk.git +#cd packer-sharemind-sdk +#git checkout tags/release_2017.12 +#mkdir -p $CONFIG_DIR +#mv sharemind-sdk/files/sdk/sharemind-config/sharemind $CONFIG_DIR +#cd +#rm -r packer-sharemind-sdk +#ln -s $CONFIG_DIR .config diff --git a/sharemind/source/config.local b/sharemind/source/config.local index 03d2d06..e2c36fa 100644 --- a/sharemind/source/config.local +++ b/sharemind/source/config.local @@ -51,5 +51,5 @@ ENDMACRO() FUNCTION(Thing_OVERRIDE name) Thing_removeArgs("${ARGN}" GIT_TAG args) - Thing_addFromOverride("${name}" ${args} GIT_TAG "2017.12") + Thing_addFromOverride("${name}" ${args} GIT_TAG "release_2022.03") ENDFUNCTION()