18112: Merge branch 'main' into 18112-ubuntu1804-bundler-fix

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/apps/workbench/fpm-info.sh b/apps/workbench/fpm-info.sh
index a1de4b2a5fc058ee3ab6112347c08107d1d486c3..a09638a35e1add08cc66a4bf140403b988043622 100644 (file)
--- a/apps/workbench/fpm-info.sh
+++ b/apps/workbench/fpm-info.sh
@@ -6,6 +6,10 @@ case "$TARGET" in
     centos*)
         fpm_depends+=(git bison make automake gcc gcc-c++ graphviz shared-mime-info)
         ;;
+    ubuntu1804)
+        fpm_depends+=(git g++ bison zlib1g-dev make graphviz shared-mime-info)
+        fpm_conflicts+=(ruby-bundler)
+        ;;
     debian* | ubuntu*)
         fpm_depends+=(git g++ bison zlib1g-dev make graphviz shared-mime-info)
         ;;

diff --git a/build/run-library.sh b/build/run-library.sh
index 22bb065872e357aae2db7fc0437203d949c452df..d0ddcd6c6705ae9d66adbcf1adc574a11d78a746 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -912,6 +912,7 @@ fpm_build () {
   declare -a fpm_args=()
   declare -a build_depends=()
   declare -a fpm_depends=()
+  declare -a fpm_conflicts=()
   declare -a fpm_exclude=()
   if [[ ! -d "$SRC_DIR" ]]; then
       echo >&2 "BUG: looking in wrong dir for fpm-info.sh: $pkgdir"
@@ -947,6 +948,9 @@ fpm_build () {
   for i in "${fpm_depends[@]}"; do
     COMMAND_ARR+=('--depends' "$i")
   done
+  for i in "${fpm_conflicts[@]}"; do
+    COMMAND_ARR+=('--conflicts' "$i")
+  done
   for i in "${fpm_exclude[@]}"; do
     COMMAND_ARR+=('--exclude' "$i")
   done

diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 3c3211b61dc7c73f698547259474f9db4d6c497d..399ec35d2b75f381d0aed546e4d44e2ee10216a2 100644 (file)
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -35,10 +35,14 @@ TODO: extract this information based on git commit messages and generate changel
 <div class="releasenotes">
 </notextile>
 
-h2(#main). development main (as of 2021-09-02)
+h2(#main). development main (as of 2021-09-07)
 
 "Upgrading from 2.2.0":#v2_2_0
 
+h3. Ubuntu 18.04 packages for arvados-api-server and arvados-workbench now conflict with ruby-bundler
+
+Ubuntu 18.04 ships with Bundler version 1.16.1, which is no longer compatible with the Gemfiles in the Arvados packages (made with Bundler 2.2.19). The Ubuntu 18.04 packages for arvados-api-server and arvados-workbench now conflict with the ruby-bundler package to work around this issue. The post-install scripts for arvados-api-server and arvados-workbench install the proper version of Bundler as a gem.
+
 h3. Removed unused @update_uuid@ endpoint for users.
 
 The @update_uuid@ endpoint was superseded by the "link accounts feature":{{site.baseurl}}/admin/link-accounts.html, so it's no longer available.

diff --git a/services/api/fpm-info.sh b/services/api/fpm-info.sh
index b8ba801aca5ab443c89f6ea93dee4a901e241200..570f4601c5d9bdeaf7220c6b4676be25a316875d 100644 (file)
--- a/services/api/fpm-info.sh
+++ b/services/api/fpm-info.sh
@@ -8,6 +8,10 @@ case "$TARGET" in
     centos*)
         fpm_depends+=(libcurl-devel postgresql-devel bison make automake gcc gcc-c++ postgresql shared-mime-info)
         ;;
+    ubuntu1804)
+        fpm_depends+=(libcurl-ssl-dev libpq-dev g++ bison zlib1g-dev make postgresql-client shared-mime-info)
+        fpm_conflicts+=(ruby-bundler)
+        ;;
     debian* | ubuntu*)
         fpm_depends+=(libcurl-ssl-dev libpq-dev g++ bison zlib1g-dev make postgresql-client shared-mime-info)
         ;;