From 315e27ef395243ee8c06a11cb78428bea3b79f11 Mon Sep 17 00:00:00 2001 From: Fred Cox Date: Thu, 16 May 2024 14:44:40 +0100 Subject: [PATCH] fix: i think fixes the rvm include --- 32-emulator/Dockerfile | 4 +--- 32-jdk17/Dockerfile | 4 +--- 32-ndk/Dockerfile | 4 +--- 32-stf-client/Dockerfile | 4 +--- 32/Dockerfile | 4 +--- 33-emulator/Dockerfile | 4 +--- 33-jdk17/Dockerfile | 4 +--- 33-ndk/Dockerfile | 4 +--- 33-stf-client/Dockerfile | 4 +--- 33/Dockerfile | 4 +--- 34-emulator/Dockerfile | 4 +--- 34-jdk11/Dockerfile | 4 +--- 34-ndk/Dockerfile | 4 +--- 34-stf-client/Dockerfile | 4 +--- 34/Dockerfile | 4 +--- Dockerfile.template | 4 +--- 16 files changed, 16 insertions(+), 48 deletions(-) diff --git a/32-emulator/Dockerfile b/32-emulator/Dockerfile index 907484f..175d83e 100644 --- a/32-emulator/Dockerfile +++ b/32-emulator/Dockerfile @@ -106,9 +106,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/32-jdk17/Dockerfile b/32-jdk17/Dockerfile index 67b1c2e..58acdfe 100644 --- a/32-jdk17/Dockerfile +++ b/32-jdk17/Dockerfile @@ -85,9 +85,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/32-ndk/Dockerfile b/32-ndk/Dockerfile index e044d5e..9bf7a9e 100644 --- a/32-ndk/Dockerfile +++ b/32-ndk/Dockerfile @@ -91,9 +91,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/32-stf-client/Dockerfile b/32-stf-client/Dockerfile index d1e1334..2494bb0 100644 --- a/32-stf-client/Dockerfile +++ b/32-stf-client/Dockerfile @@ -104,9 +104,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/32/Dockerfile b/32/Dockerfile index 559b43e..e324952 100644 --- a/32/Dockerfile +++ b/32/Dockerfile @@ -85,9 +85,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/33-emulator/Dockerfile b/33-emulator/Dockerfile index 8eff61e..f11f8e2 100644 --- a/33-emulator/Dockerfile +++ b/33-emulator/Dockerfile @@ -106,9 +106,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/33-jdk17/Dockerfile b/33-jdk17/Dockerfile index 43a28b1..53a0cf2 100644 --- a/33-jdk17/Dockerfile +++ b/33-jdk17/Dockerfile @@ -85,9 +85,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/33-ndk/Dockerfile b/33-ndk/Dockerfile index 44cb0d2..faf29e4 100644 --- a/33-ndk/Dockerfile +++ b/33-ndk/Dockerfile @@ -91,9 +91,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/33-stf-client/Dockerfile b/33-stf-client/Dockerfile index 331b733..066be20 100644 --- a/33-stf-client/Dockerfile +++ b/33-stf-client/Dockerfile @@ -104,9 +104,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/33/Dockerfile b/33/Dockerfile index 35fec09..6f266cc 100644 --- a/33/Dockerfile +++ b/33/Dockerfile @@ -85,9 +85,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/34-emulator/Dockerfile b/34-emulator/Dockerfile index 19a56f9..bdb92c7 100644 --- a/34-emulator/Dockerfile +++ b/34-emulator/Dockerfile @@ -106,9 +106,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/34-jdk11/Dockerfile b/34-jdk11/Dockerfile index a1a60e8..6f48537 100644 --- a/34-jdk11/Dockerfile +++ b/34-jdk11/Dockerfile @@ -85,9 +85,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/34-ndk/Dockerfile b/34-ndk/Dockerfile index 36cab7b..7d52a22 100644 --- a/34-ndk/Dockerfile +++ b/34-ndk/Dockerfile @@ -91,9 +91,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/34-stf-client/Dockerfile b/34-stf-client/Dockerfile index 817a641..0db5ab8 100644 --- a/34-stf-client/Dockerfile +++ b/34-stf-client/Dockerfile @@ -104,9 +104,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/34/Dockerfile b/34/Dockerfile index e5a6fc6..57825ee 100644 --- a/34/Dockerfile +++ b/34/Dockerfile @@ -85,9 +85,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] #### diff --git a/Dockerfile.template b/Dockerfile.template index 6f50c1e..f9bb04f 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -131,9 +131,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \ && curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \ - && echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \ + && echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \ && source /usr/local/rvm/scripts/rvm \ && gem install bundler -v '~> 1.0' --force --no-document --default -SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ] -CMD [ "/bin/bash", "-l" ] ####