Skip to content

Commit 315e27e

Browse files
mcfedrmcfedr
committed
fix: i think fixes the rvm include
1 parent 23e75b4 commit 315e27e

File tree

16 files changed

+16
-48
lines changed

16 files changed

+16
-48
lines changed

‎32-emulator/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ RUN apt-get update \
106106
&& rm -rf /var/lib/apt/lists/* \
107107
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
108108
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
109-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
109+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
110110
&& source /usr/local/rvm/scripts/rvm \
111111
&& gem install bundler -v '~> 1.0' --force --no-document --default
112-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
113-
CMD [ "/bin/bash", "-l" ]
114112
##</ruby-bundler>##

‎32-jdk17/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ RUN apt-get update \
8585
&& rm -rf /var/lib/apt/lists/* \
8686
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
8787
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
88-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
88+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
8989
&& source /usr/local/rvm/scripts/rvm \
9090
&& gem install bundler -v '~> 1.0' --force --no-document --default
91-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
92-
CMD [ "/bin/bash", "-l" ]
9391
##</ruby-bundler>##

‎32-ndk/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ RUN apt-get update \
9191
&& rm -rf /var/lib/apt/lists/* \
9292
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
9393
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
94-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
94+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
9595
&& source /usr/local/rvm/scripts/rvm \
9696
&& gem install bundler -v '~> 1.0' --force --no-document --default
97-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
98-
CMD [ "/bin/bash", "-l" ]
9997
##</ruby-bundler>##

‎32-stf-client/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,7 @@ RUN apt-get update \
104104
&& rm -rf /var/lib/apt/lists/* \
105105
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
106106
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
107-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
107+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
108108
&& source /usr/local/rvm/scripts/rvm \
109109
&& gem install bundler -v '~> 1.0' --force --no-document --default
110-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
111-
CMD [ "/bin/bash", "-l" ]
112110
##</ruby-bundler>##

‎32/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ RUN apt-get update \
8585
&& rm -rf /var/lib/apt/lists/* \
8686
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
8787
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
88-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
88+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
8989
&& source /usr/local/rvm/scripts/rvm \
9090
&& gem install bundler -v '~> 1.0' --force --no-document --default
91-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
92-
CMD [ "/bin/bash", "-l" ]
9391
##</ruby-bundler>##

‎33-emulator/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ RUN apt-get update \
106106
&& rm -rf /var/lib/apt/lists/* \
107107
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
108108
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
109-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
109+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
110110
&& source /usr/local/rvm/scripts/rvm \
111111
&& gem install bundler -v '~> 1.0' --force --no-document --default
112-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
113-
CMD [ "/bin/bash", "-l" ]
114112
##</ruby-bundler>##

‎33-jdk17/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ RUN apt-get update \
8585
&& rm -rf /var/lib/apt/lists/* \
8686
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
8787
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
88-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
88+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
8989
&& source /usr/local/rvm/scripts/rvm \
9090
&& gem install bundler -v '~> 1.0' --force --no-document --default
91-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
92-
CMD [ "/bin/bash", "-l" ]
9391
##</ruby-bundler>##

‎33-ndk/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ RUN apt-get update \
9191
&& rm -rf /var/lib/apt/lists/* \
9292
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
9393
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
94-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
94+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
9595
&& source /usr/local/rvm/scripts/rvm \
9696
&& gem install bundler -v '~> 1.0' --force --no-document --default
97-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
98-
CMD [ "/bin/bash", "-l" ]
9997
##</ruby-bundler>##

‎33-stf-client/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,7 @@ RUN apt-get update \
104104
&& rm -rf /var/lib/apt/lists/* \
105105
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
106106
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
107-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
107+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
108108
&& source /usr/local/rvm/scripts/rvm \
109109
&& gem install bundler -v '~> 1.0' --force --no-document --default
110-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
111-
CMD [ "/bin/bash", "-l" ]
112110
##</ruby-bundler>##

‎33/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ RUN apt-get update \
8585
&& rm -rf /var/lib/apt/lists/* \
8686
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
8787
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
88-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
88+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
8989
&& source /usr/local/rvm/scripts/rvm \
9090
&& gem install bundler -v '~> 1.0' --force --no-document --default
91-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
92-
CMD [ "/bin/bash", "-l" ]
9391
##</ruby-bundler>##

‎34-emulator/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ RUN apt-get update \
106106
&& rm -rf /var/lib/apt/lists/* \
107107
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
108108
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
109-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
109+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
110110
&& source /usr/local/rvm/scripts/rvm \
111111
&& gem install bundler -v '~> 1.0' --force --no-document --default
112-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
113-
CMD [ "/bin/bash", "-l" ]
114112
##</ruby-bundler>##

‎34-jdk11/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ RUN apt-get update \
8585
&& rm -rf /var/lib/apt/lists/* \
8686
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
8787
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
88-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
88+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
8989
&& source /usr/local/rvm/scripts/rvm \
9090
&& gem install bundler -v '~> 1.0' --force --no-document --default
91-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
92-
CMD [ "/bin/bash", "-l" ]
9391
##</ruby-bundler>##

‎34-ndk/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ RUN apt-get update \
9191
&& rm -rf /var/lib/apt/lists/* \
9292
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
9393
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
94-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
94+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
9595
&& source /usr/local/rvm/scripts/rvm \
9696
&& gem install bundler -v '~> 1.0' --force --no-document --default
97-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
98-
CMD [ "/bin/bash", "-l" ]
9997
##</ruby-bundler>##

‎34-stf-client/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,7 @@ RUN apt-get update \
104104
&& rm -rf /var/lib/apt/lists/* \
105105
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
106106
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
107-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
107+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
108108
&& source /usr/local/rvm/scripts/rvm \
109109
&& gem install bundler -v '~> 1.0' --force --no-document --default
110-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
111-
CMD [ "/bin/bash", "-l" ]
112110
##</ruby-bundler>##

‎34/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ RUN apt-get update \
8585
&& rm -rf /var/lib/apt/lists/* \
8686
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
8787
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
88-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
88+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
8989
&& source /usr/local/rvm/scripts/rvm \
9090
&& gem install bundler -v '~> 1.0' --force --no-document --default
91-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
92-
CMD [ "/bin/bash", "-l" ]
9391
##</ruby-bundler>##

‎Dockerfile.template

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ RUN apt-get update \
131131
&& rm -rf /var/lib/apt/lists/* \
132132
&& gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
133133
&& curl -sSL https://get.rvm.io | bash -s stable --ruby --without-gems="rvm rubygems-bundler" \
134-
&& echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc \
134+
&& echo -e "source /usr/local/rvm/scripts/rvm\n$(cat /etc/bash.bashrc)" >/etc/bash.bashrc \
135135
&& source /usr/local/rvm/scripts/rvm \
136136
&& gem install bundler -v '~> 1.0' --force --no-document --default
137-
SHELL [ "/bin/bash", "-o", "pipefail", "-lc" ]
138-
CMD [ "/bin/bash", "-l" ]
139137
##</ruby-bundler>##

0 commit comments

Comments
 (0)