Fix ruby test examples after TeamCity docker image changes

JetBrains/teamcity-docker-minimal-agent#39
cburgmer · Apr 25, 2022 · f526aed · f526aed
1 parent 5d0e825
commit f526aed
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/examples/teamcity/Dockerfile b/examples/teamcity/Dockerfile
@@ -0,0 +1,9 @@
+FROM jetbrains/teamcity-minimal-agent:2021.2.3
+
+USER root
+
+RUN apt-get update && apt-get -qy install ruby
+
+RUN gem install rake -v 13 && gem install rspec -v 3.11 && gem install rspec_junit_formatter
+
+USER buildagent
diff --git a/examples/teamcity/docker-compose.yml b/examples/teamcity/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "8111:8111"
 
   agent:
-    image: jetbrains/teamcity-minimal-agent:2021.2.3
+    build: .
     restart: unless-stopped
     environment:
       SERVER_URL: "http://server:8111"
diff --git a/examples/teamcity/projects/SimpleSetup/buildTypes/SimpleSetup_RSpec.xml b/examples/teamcity/projects/SimpleSetup/buildTypes/SimpleSetup_RSpec.xml
@@ -29,15 +29,7 @@ EOF
 }
 
 mkdir -p spec
-rspecTest > spec/example_spec.rb
-
-if ! type gem &> /dev/null; then
-  apt-get update
-  apt-get -qy install ruby
-fi
-
-gem install rake -v 11
-gem install rspec -v 3.5]]></param>
+rspecTest > spec/example_spec.rb]]></param>
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
         </parameters>

diff --git a/examples/teamcity/projects/SimpleSetup/buildTypes/SimpleSetup_RSpecJUnitXml.xml b/examples/teamcity/projects/SimpleSetup/buildTypes/SimpleSetup_RSpecJUnitXml.xml
@@ -42,16 +42,7 @@ EOF
 
 mkdir -p spec
 rspecTest > spec/example_spec.rb
-anotherRspecTest > spec/another_spec.rb
-
-if ! type gem &> /dev/null; then
-  apt-get update
-  apt-get -qy install ruby
-fi
-
-gem install rake
-gem install rspec -v 3.1.0
-gem install rspec_junit_formatter]]></param>
+anotherRspecTest > spec/another_spec.rb]]></param>
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
         </parameters>
@@ -85,4 +76,3 @@ end]]></param>
     <cleanup />
   </settings>
 </build-type>
-