From 627e72c6dd0231eeb7ef0f8a7692a128c4dfdb83 Mon Sep 17 00:00:00 2001 From: Fred Cox Date: Mon, 13 May 2024 14:31:41 +0100 Subject: [PATCH] fix: ruby cmd --- 32-emulator/Dockerfile | 5 +++-- 32-jdk17/Dockerfile | 5 +++-- 32-ndk/Dockerfile | 5 +++-- 32-stf-client/Dockerfile | 5 +++-- 32/Dockerfile | 5 +++-- 33-emulator/Dockerfile | 5 +++-- 33-jdk17/Dockerfile | 5 +++-- 33-ndk/Dockerfile | 5 +++-- 33-stf-client/Dockerfile | 5 +++-- 33/Dockerfile | 5 +++-- 34-emulator/Dockerfile | 5 +++-- 34-jdk11/Dockerfile | 5 +++-- 34-ndk/Dockerfile | 5 +++-- 34-stf-client/Dockerfile | 5 +++-- 34/Dockerfile | 5 +++-- Dockerfile.template | 5 +++-- 16 files changed, 48 insertions(+), 32 deletions(-) diff --git a/32-emulator/Dockerfile b/32-emulator/Dockerfile index 7254805..bf7f1e8 100644 --- a/32-emulator/Dockerfile +++ b/32-emulator/Dockerfile @@ -108,6 +108,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/32-jdk17/Dockerfile b/32-jdk17/Dockerfile index daea6bd..10ed83d 100644 --- a/32-jdk17/Dockerfile +++ b/32-jdk17/Dockerfile @@ -87,6 +87,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/32-ndk/Dockerfile b/32-ndk/Dockerfile index 5be051c..29872dd 100644 --- a/32-ndk/Dockerfile +++ b/32-ndk/Dockerfile @@ -93,6 +93,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/32-stf-client/Dockerfile b/32-stf-client/Dockerfile index 5ebbaf5..f39b0f2 100644 --- a/32-stf-client/Dockerfile +++ b/32-stf-client/Dockerfile @@ -106,6 +106,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/32/Dockerfile b/32/Dockerfile index 67b9e58..8f7bd85 100644 --- a/32/Dockerfile +++ b/32/Dockerfile @@ -87,6 +87,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/33-emulator/Dockerfile b/33-emulator/Dockerfile index 2cc79b6..89bba11 100644 --- a/33-emulator/Dockerfile +++ b/33-emulator/Dockerfile @@ -108,6 +108,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/33-jdk17/Dockerfile b/33-jdk17/Dockerfile index 96873b1..6286627 100644 --- a/33-jdk17/Dockerfile +++ b/33-jdk17/Dockerfile @@ -87,6 +87,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/33-ndk/Dockerfile b/33-ndk/Dockerfile index 390df15..4e21a02 100644 --- a/33-ndk/Dockerfile +++ b/33-ndk/Dockerfile @@ -93,6 +93,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/33-stf-client/Dockerfile b/33-stf-client/Dockerfile index 7cf4877..7d20812 100644 --- a/33-stf-client/Dockerfile +++ b/33-stf-client/Dockerfile @@ -106,6 +106,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/33/Dockerfile b/33/Dockerfile index 829a65d..d0bd7d8 100644 --- a/33/Dockerfile +++ b/33/Dockerfile @@ -87,6 +87,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/34-emulator/Dockerfile b/34-emulator/Dockerfile index 7cd6f79..ed5c32a 100644 --- a/34-emulator/Dockerfile +++ b/34-emulator/Dockerfile @@ -108,6 +108,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/34-jdk11/Dockerfile b/34-jdk11/Dockerfile index 34e932f..7dcc2fa 100644 --- a/34-jdk11/Dockerfile +++ b/34-jdk11/Dockerfile @@ -87,6 +87,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/34-ndk/Dockerfile b/34-ndk/Dockerfile index b09bc3a..e70b3f5 100644 --- a/34-ndk/Dockerfile +++ b/34-ndk/Dockerfile @@ -93,6 +93,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/34-stf-client/Dockerfile b/34-stf-client/Dockerfile index 84c1f33..f176c3e 100644 --- a/34-stf-client/Dockerfile +++ b/34-stf-client/Dockerfile @@ -106,6 +106,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/34/Dockerfile b/34/Dockerfile index ec8fe84..6fd6966 100644 --- a/34/Dockerfile +++ b/34/Dockerfile @@ -87,6 +87,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] #### diff --git a/Dockerfile.template b/Dockerfile.template index 6d096a6..ef0b7cd 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -133,6 +133,7 @@ RUN apt-get update \ && 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 \ && source /usr/local/rvm/scripts/rvm \ - && gem install bundler:1.17.3 --force --no-document -SHELL [ "/bin/bash", "-l", "-c" ] + && gem install bundler -v '~> 1.0' --force --no-document --default +SHELL [ "/bin/bash", "-lc" ] +CMD [ "/bin/bash", "-lc" ] ####