[ARVADOS] created: 2.1.0-1302-g33765b48e

[Git user]

        at  33765b48e350abcd844ea9db4c718f006a6a3d7b (commit)


commit 33765b48e350abcd844ea9db4c718f006a6a3d7b
Author: Ward Vandewege <ward at jhvc.com>
Date:   Tue Sep 7 14:06:47 2021 -0400

    18112: Ubuntu 18.04 comes with bundler version 1.16.1, which doesn't handle our
    current Gemfiles properly. Make our Ubuntu 18.04 distribution packages
    for arvados-api-server and arvados-workbench conflict with the
    ruby-bundler package to work around this issue. Our post-install scripts
    install the proper version of bundler.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/apps/workbench/fpm-info.sh b/apps/workbench/fpm-info.sh
index a1de4b2a5..a09638a35 100644
--- 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 22bb06587..d0ddcd6c6 100755
--- 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/services/api/fpm-info.sh b/services/api/fpm-info.sh
index b8ba801ac..570f4601c 100644
--- 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)
         ;;

-----------------------------------------------------------------------


hooks/post-receive
--