From 03f8b842d76daa9f54c07d567297dc2bfccdfe8b Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Sat, 7 Oct 2023 12:03:25 -0400 Subject: [PATCH] (3.0) Avoid binfmt automount in containers that seems to be causing issues --- Gemfile.lock | 2 +- lib/ood_packaging/build_box/docker-image/Dockerfile.erb | 1 + lib/ood_packaging/version.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f0af189a..fa1a618b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - ood_packaging (0.6.1) + ood_packaging (0.6.2) rake (~> 13.0.1) GEM diff --git a/lib/ood_packaging/build_box/docker-image/Dockerfile.erb b/lib/ood_packaging/build_box/docker-image/Dockerfile.erb index f57b86d4..ba2dd7d4 100644 --- a/lib/ood_packaging/build_box/docker-image/Dockerfile.erb +++ b/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 diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb index 83d075c4..2c0a40a5 100644 --- a/lib/ood_packaging/version.rb +++ b/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',