(3.0) Avoid binfmt automount in containers that seems to be causing i…

…ssues (#254)

* (3.0) Avoid binfmt automount in containers that seems to be causing issues

* Fix e2e tests for OnDemand

.github/workflows/e2e.yaml

@@ -162,7 +162,12 @@ jobs:
         run: docker load --input /tmp/ood_packaging-${{ matrix.dist }}.tar.gz
       - name: Clone ${{ matrix.package }}
         run: |
+          if [ "${{ matrix.package }}" = "ondemand" ]; then
+            BRANCH="--branch release_3.0"
+          else
+            BRANCH=""
+          fi
           mkdir -p ./tmp
-          git clone https://github.com/OSC/${{ matrix.package }}.git ./tmp/${{ matrix.package }}
+          git clone $BRANCH https://github.com/OSC/${{ matrix.package }}.git ./tmp/${{ matrix.package }}
       - name: Build ${{ matrix.package }} package
         run: ./bin/ood_packaging -w ./tmp/work -o ./tmp/output -d ${{ matrix.dist }} -V v3.0.0 -T --debug $(pwd)/tmp/${{ matrix.package }}

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ood_packaging (0.6.1)
+    ood_packaging (0.6.2)
       rake (~> 13.0.1)
 
 GEM

lib/ood_packaging/build_box/docker-image/Dockerfile.erb

@@ -39,5 +39,6 @@ RUN apt update -y && apt install -y apt-transport-https ca-certificates \
 RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
 <% end -%>
+RUN ln -s /dev/null /etc/systemd/system/proc-sys-fs-binfmt_misc.automount
 COPY . /build
 RUN /bin/bash /build/install.sh

lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '3.0.0',