diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b5b399..2e12e57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,7 +133,7 @@ set(CPACK_RPM_PACKAGE_URL "https://github.com/UtrechtUniversity/irods-uu-microse set(CPACK_RPM_PACKAGE_AUTOREQ 0) set(CPACK_RPM_PACKAGE_AUTOPROV 0) -set(CPACK_DEBIAN_PACKAGE_DEPENDS "irods-server = ${IRODS_VERSION}, irods-runtime = ${IRODS_VERSION}") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "irods-server ( = ${IRODS_VERSION}-1~bionic ), irods-runtime ( = ${IRODS_VERSION}-1~bionic )") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/UtrechtUniversity/irods-uu-microservices") set(CPACK_DEBIAN_PACKAGE_SECTION "contrib/science") diff --git a/vagrant/build/.env b/vagrant/build/.env index 3566805..6f12b3c 100644 --- a/vagrant/build/.env +++ b/vagrant/build/.env @@ -2,8 +2,8 @@ # Tested/supported box names: # - generic/centos7 -# - ubuntu/bionic64 BOXNAME=generic/centos7 +# - ubuntu/focal64 # Amount of memory for VM (MB) MEMORY=2048 @@ -19,14 +19,14 @@ APT_IRODS_REPO_SIGNING_KEY_LOC=https://packages.irods.org/irods-signing-key.asc # since packages for Ubuntu 18.04 aren't available yet. APT_IRODS_REPO_URL=https://packages.irods.org/apt/ APT_IRODS_REPO_ARCHITECTURE=amd64 -APT_IRODS_REPO_DISTRIBUTION=xenial +APT_IRODS_REPO_DISTRIBUTION=bionic APT_IRODS_REPO_COMPONENT=main # Packages to be installed (separated by whitespace). # Dependencies do not have to be listed. They are resolved by the script -APT_GEN_PACKAGES="cmake make gcc rpm libssl-dev libboost-dev libboost-locale libjansson-dev libuuid1" +APT_GEN_PACKAGES="cmake make gcc rpm libssl-dev libboost-dev libboost-locale-dev libjansson-dev libuuid1 libstdc++-10-dev libcurl4-openssl-dev uuid-dev libarchive-dev" APT_IRODS_PACKAGES="irods-runtime irods-dev" -APT_IRODS_EXTERNAL_PACKAGES="irods-externals-cmake3.5.2-0 irods-externals-clang6.0-0" +APT_IRODS_EXTERNAL_PACKAGES="irods-externals-cmake3.11.4-0 irods-externals-clang6.0-0" # Parameters of Yum repository YUM_IRODS_REPO_SIGNING_KEY_LOC=https://packages.irods.org/irods-signing-key.asc diff --git a/vagrant/build/install-microservices-build-env.sh b/vagrant/build/install-microservices-build-env.sh index 6f92a39..39ba8a2 100644 --- a/vagrant/build/install-microservices-build-env.sh +++ b/vagrant/build/install-microservices-build-env.sh @@ -47,9 +47,6 @@ then echo "Installing iRODS UU microservices build environment on Ubuntu." - echo "Installing dependencies ..." - sudo apt-get -y install aptitude - echo "Downloading and installing iRODS repository signing key ..." wget -qO - "$APT_IRODS_REPO_SIGNING_KEY_LOC" | sudo apt-key add - @@ -57,11 +54,36 @@ then cat << ENDAPTREPO | sudo tee /etc/apt/sources.list.d/irods.list deb [arch=${APT_IRODS_REPO_ARCHITECTURE}] $APT_IRODS_REPO_URL $APT_IRODS_REPO_DISTRIBUTION $APT_IRODS_REPO_COMPONENT ENDAPTREPO - sudo apt-get update + sudo apt update + + echo "Installing dependencies ..." + sudo apt-get -y install aptitude libboost-locale-dev + + sudo apt install -y libpython2-stdlib libpython2.7-minimal libpython2.7-stdlib \ + python-is-python2 python-six python2 python2-minimal python2.7 python2.7-minimal \ + python-certifi python-chardet python-idna python-pkg-resources python-setuptools + + PY_URLLIB_PREFIX="http://security.ubuntu.com/ubuntu/pool/main/p/python-urllib3" + PY_URLLIB_FILENAME="python-urllib3_1.22-1ubuntu0.18.04.2_all.deb" + PY_REQUESTS_PREFIX="http://security.ubuntu.com/ubuntu/pool/main/r/requests" + PY_REQUESTS_FILENAME="python-requests_2.18.4-2ubuntu0.1_all.deb" + OPENSSL_PREFIX="http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0" + OPENSSL_FILENAME="libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb" + + wget \ + ${PY_URLLIB_PREFIX}/${PY_URLLIB_FILENAME} \ + ${PY_REQUESTS_PREFIX}/${PY_REQUESTS_FILENAME} \ + ${OPENSSL_PREFIX}/${OPENSSL_FILENAME} + + for package in $PY_URLLIB_FILENAME $PY_REQUESTS_FILENAME $OPENSSL_FILENAME + do echo "Installing package ${package%.*}" + sudo dpkg -i "$package" + rm "$package" + done for package in $APT_IRODS_PACKAGES do echo "Installing package $package and its dependencies" - sudo apt-get -y install "$package=${IRODS_VERSION}" + sudo apt-get -y install "$package=${IRODS_VERSION}-1~bionic" sudo aptitude hold "$package" done