From b2463d93797afa87eabb43ea1c9eb403a8f4947d Mon Sep 17 00:00:00 2001 From: averikitsch Date: Wed, 10 Feb 2021 15:46:41 -0800 Subject: [PATCH 1/9] fix: allow gcloud installation on run tests --- spec/kokoro-run-all.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/spec/kokoro-run-all.sh b/spec/kokoro-run-all.sh index e1317a798..5407e11b7 100755 --- a/spec/kokoro-run-all.sh +++ b/spec/kokoro-run-all.sh @@ -96,19 +96,9 @@ if [[ $CHANGED_DIRS =~ "appengine" ]]; then CHANGED_DIRS="${CHANGED_DIRS/appengine/} $AE_CHANGED_DIRS" fi -# The run directory has many subdirectories. Only test the modified ones. -if [[ $CHANGED_DIRS =~ "run" ]]; then - AE_CHANGED_DIRS=$(git --no-pager diff --name-only HEAD $(git merge-base HEAD master) | grep "run/" | cut -d/ -f1,2 | sort | uniq || true) - CHANGED_DIRS="${CHANGED_DIRS/run/} $AE_CHANGED_DIRS" - # Install gcloud for Cloud Run samples if not installing later - if [[ ! -n ${RUN_ALL_TESTS:-} ]]; then - export PATH="$PATH:/tmp/google-cloud-sdk/bin" - ./.kokoro/configure_gcloud.sh - fi -fi - -# Most tests in the appengine directory are E2E or always run E2E tests for Cloud Run -if [[ ($CHANGED_DIRS =~ "appengine" || $CHANGED_DIRS =~ "run") && -n ${RUN_ALL_TESTS:-} ]]; then +# Most tests in the appengine directory are E2E. +SERVERLESS=("appengine" "run") +if [[ "${CHANGED_DIRS}" =~ "${SERVERLESS}" ]]; then E2E="true" fi From 0655a1697105c875bf6a2ad3b52678ec5c9a8dea Mon Sep 17 00:00:00 2001 From: averikitsch Date: Wed, 10 Feb 2021 15:47:18 -0800 Subject: [PATCH 2/9] force run --- run/helloworld/app.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/run/helloworld/app.rb b/run/helloworld/app.rb index 63cee92a0..9cfe1e8c8 100644 --- a/run/helloworld/app.rb +++ b/run/helloworld/app.rb @@ -20,6 +20,7 @@ port = ENV["PORT"] || "8080" set :port, port + get "/" do name = ENV["NAME"] || "World" "Hello #{name}!" From 3f538199d01b7337d5edc7fba22b03cbe8489fc2 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Wed, 10 Feb 2021 16:06:55 -0800 Subject: [PATCH 3/9] fix bash --- spec/kokoro-run-all.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spec/kokoro-run-all.sh b/spec/kokoro-run-all.sh index 5407e11b7..98bf07b57 100755 --- a/spec/kokoro-run-all.sh +++ b/spec/kokoro-run-all.sh @@ -96,9 +96,8 @@ if [[ $CHANGED_DIRS =~ "appengine" ]]; then CHANGED_DIRS="${CHANGED_DIRS/appengine/} $AE_CHANGED_DIRS" fi -# Most tests in the appengine directory are E2E. -SERVERLESS=("appengine" "run") -if [[ "${CHANGED_DIRS}" =~ "${SERVERLESS}" ]]; then +# Most tests in the appengine/run directory are E2E. +if [[ "${CHANGED_DIRS}" =~ "run" || "${CHANGED_DIRS}" =~ "appengine" ]]; then E2E="true" fi From de81a60772309982fee570ffda72a753e2df7b97 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Wed, 10 Feb 2021 16:44:39 -0800 Subject: [PATCH 4/9] add back run all tests --- spec/kokoro-run-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/kokoro-run-all.sh b/spec/kokoro-run-all.sh index 98bf07b57..2faaf7b49 100755 --- a/spec/kokoro-run-all.sh +++ b/spec/kokoro-run-all.sh @@ -97,7 +97,7 @@ if [[ $CHANGED_DIRS =~ "appengine" ]]; then fi # Most tests in the appengine/run directory are E2E. -if [[ "${CHANGED_DIRS}" =~ "run" || "${CHANGED_DIRS}" =~ "appengine" ]]; then +if [[ "${CHANGED_DIRS}" =~ "run" || "${CHANGED_DIRS}" =~ "appengine" || -n ${RUN_ALL_TESTS:-} ]]; then E2E="true" fi From a1d7296034d9b478870d1a29f6930eae318e3f5b Mon Sep 17 00:00:00 2001 From: averikitsch Date: Wed, 10 Feb 2021 18:13:36 -0800 Subject: [PATCH 5/9] downgrade version to work with test infra --- eventarc/generic/Dockerfile | 2 +- eventarc/generic/Gemfile.lock | 2 +- eventarc/pubsub/Dockerfile | 2 +- eventarc/pubsub/Gemfile.lock | 36 +++++++++++++++++------------------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eventarc/generic/Dockerfile b/eventarc/generic/Dockerfile index cd65c4424..81ef08c64 100644 --- a/eventarc/generic/Dockerfile +++ b/eventarc/generic/Dockerfile @@ -16,7 +16,7 @@ # Use the official lightweight Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:2.7-slim +FROM ruby:2.5-slim # Install production dependencies. WORKDIR /usr/src/app diff --git a/eventarc/generic/Gemfile.lock b/eventarc/generic/Gemfile.lock index 0899952b3..fe3299cca 100644 --- a/eventarc/generic/Gemfile.lock +++ b/eventarc/generic/Gemfile.lock @@ -62,4 +62,4 @@ DEPENDENCIES sinatra (~> 2.0) BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/eventarc/pubsub/Dockerfile b/eventarc/pubsub/Dockerfile index 8f45d0ef4..6998d8d5e 100644 --- a/eventarc/pubsub/Dockerfile +++ b/eventarc/pubsub/Dockerfile @@ -16,7 +16,7 @@ # Use the official lightweight Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:2.7-slim +FROM ruby:2.5-slim # Install production dependencies. WORKDIR /usr/src/app diff --git a/eventarc/pubsub/Gemfile.lock b/eventarc/pubsub/Gemfile.lock index 0899952b3..c9fbc4a5e 100644 --- a/eventarc/pubsub/Gemfile.lock +++ b/eventarc/pubsub/Gemfile.lock @@ -9,12 +9,12 @@ GEM domain_name (~> 0.5) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) netrc (0.11.0) rack (2.2.3) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -23,27 +23,27 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) rubysl-securerandom (2.0.0) - sinatra (2.0.8.1) + sinatra (2.1.0) mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack (~> 2.2) + rack-protection (= 2.1.0) tilt (~> 2.0) tilt (2.0.10) unf (0.1.4) @@ -62,4 +62,4 @@ DEPENDENCIES sinatra (~> 2.0) BUNDLED WITH - 2.1.4 + 1.17.3 From 4b852195599f29d5128bd815b06676c3dec2f1d5 Mon Sep 17 00:00:00 2001 From: Averi Kitsch Date: Thu, 11 Feb 2021 08:28:45 -0800 Subject: [PATCH 6/9] remove change --- run/helloworld/app.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/run/helloworld/app.rb b/run/helloworld/app.rb index 9cfe1e8c8..63cee92a0 100644 --- a/run/helloworld/app.rb +++ b/run/helloworld/app.rb @@ -20,7 +20,6 @@ port = ENV["PORT"] || "8080" set :port, port - get "/" do name = ENV["NAME"] || "World" "Hello #{name}!" From f54d1ab273e70d8275c265ff53fbe7123f8bbc39 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Thu, 11 Feb 2021 09:42:55 -0800 Subject: [PATCH 7/9] Run E2E if running all tests --- spec/kokoro-run-all.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/kokoro-run-all.sh b/spec/kokoro-run-all.sh index 2faaf7b49..bbb25c96f 100755 --- a/spec/kokoro-run-all.sh +++ b/spec/kokoro-run-all.sh @@ -96,11 +96,6 @@ if [[ $CHANGED_DIRS =~ "appengine" ]]; then CHANGED_DIRS="${CHANGED_DIRS/appengine/} $AE_CHANGED_DIRS" fi -# Most tests in the appengine/run directory are E2E. -if [[ "${CHANGED_DIRS}" =~ "run" || "${CHANGED_DIRS}" =~ "appengine" || -n ${RUN_ALL_TESTS:-} ]]; then - E2E="true" -fi - # RUN_ALL_TESTS after this point is used to indicate if we should run tests in every directory, # rather than only tests in modified directories. RUN_ALL_TESTS="0" @@ -114,6 +109,11 @@ if [[ $CHANGED_DIRS =~ "spec" || $CHANGED_DIRS =~ ".kokoro" ]]; then RUN_ALL_TESTS="1" fi +# Most tests in the appengine/run directory are E2E. +if [[ "${CHANGED_DIRS}" =~ "run" || "${CHANGED_DIRS}" =~ "appengine" || -n ${RUN_ALL_TESTS:-} ]]; then + E2E="true" +fi + # Start memcached (for appengine/memcache). service memcached start From c990dbd27e6ff33a7a94d0a56893dfd88ecbc796 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Thu, 11 Feb 2021 13:05:06 -0800 Subject: [PATCH 8/9] Revert bundle version to v2 --- eventarc/generic/Dockerfile | 5 +++-- eventarc/generic/Gemfile.lock | 36 +++++++++++++++++------------------ eventarc/pubsub/Dockerfile | 5 +++-- eventarc/pubsub/Gemfile.lock | 2 +- run/helloworld/Dockerfile | 5 +++-- run/helloworld/Gemfile.lock | 36 +++++++++++++++++------------------ 6 files changed, 46 insertions(+), 43 deletions(-) diff --git a/eventarc/generic/Dockerfile b/eventarc/generic/Dockerfile index 81ef08c64..b37e651f2 100644 --- a/eventarc/generic/Dockerfile +++ b/eventarc/generic/Dockerfile @@ -16,13 +16,14 @@ # Use the official lightweight Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:2.5-slim +FROM ruby:2.7-slim # Install production dependencies. WORKDIR /usr/src/app COPY Gemfile Gemfile.lock ./ ENV BUNDLE_FROZEN=true -RUN gem install bundler && bundle install --without test +RUN bundle config set without 'test' +RUN gem install bundler && bundle install # Copy local code to the container image. COPY . ./ diff --git a/eventarc/generic/Gemfile.lock b/eventarc/generic/Gemfile.lock index fe3299cca..eaff7b790 100644 --- a/eventarc/generic/Gemfile.lock +++ b/eventarc/generic/Gemfile.lock @@ -9,12 +9,12 @@ GEM domain_name (~> 0.5) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) netrc (0.11.0) rack (2.2.3) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -23,27 +23,27 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) rubysl-securerandom (2.0.0) - sinatra (2.0.8.1) + sinatra (2.1.0) mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack (~> 2.2) + rack-protection (= 2.1.0) tilt (~> 2.0) tilt (2.0.10) unf (0.1.4) @@ -62,4 +62,4 @@ DEPENDENCIES sinatra (~> 2.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/eventarc/pubsub/Dockerfile b/eventarc/pubsub/Dockerfile index 6998d8d5e..0c68b46c6 100644 --- a/eventarc/pubsub/Dockerfile +++ b/eventarc/pubsub/Dockerfile @@ -16,13 +16,14 @@ # Use the official lightweight Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:2.5-slim +FROM ruby:2.7-slim # Install production dependencies. WORKDIR /usr/src/app COPY Gemfile Gemfile.lock ./ ENV BUNDLE_FROZEN=true -RUN gem install bundler && bundle install --without test +RUN bundle config set without 'test' +RUN gem install bundler && bundle install # Copy local code to the container image. COPY . ./ diff --git a/eventarc/pubsub/Gemfile.lock b/eventarc/pubsub/Gemfile.lock index c9fbc4a5e..eaff7b790 100644 --- a/eventarc/pubsub/Gemfile.lock +++ b/eventarc/pubsub/Gemfile.lock @@ -62,4 +62,4 @@ DEPENDENCIES sinatra (~> 2.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/run/helloworld/Dockerfile b/run/helloworld/Dockerfile index bb831e27a..99ed0457b 100644 --- a/run/helloworld/Dockerfile +++ b/run/helloworld/Dockerfile @@ -17,13 +17,14 @@ # Use the official lightweight Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:2.5-slim +FROM ruby:2.7-slim # Install production dependencies. WORKDIR /usr/src/app COPY Gemfile Gemfile.lock ./ ENV BUNDLE_FROZEN=true -RUN gem install bundler && bundle install --without test +RUN bundle config set without 'test' +RUN gem install bundler && bundle install # Copy local code to the container image. COPY . ./ diff --git a/run/helloworld/Gemfile.lock b/run/helloworld/Gemfile.lock index 12ba4c5c4..eaff7b790 100644 --- a/run/helloworld/Gemfile.lock +++ b/run/helloworld/Gemfile.lock @@ -9,12 +9,12 @@ GEM domain_name (~> 0.5) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) netrc (0.11.0) rack (2.2.3) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -23,27 +23,27 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) rubysl-securerandom (2.0.0) - sinatra (2.0.8.1) + sinatra (2.1.0) mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack (~> 2.2) + rack-protection (= 2.1.0) tilt (~> 2.0) tilt (2.0.10) unf (0.1.4) @@ -62,4 +62,4 @@ DEPENDENCIES sinatra (~> 2.0) BUNDLED WITH - 1.17.3 + 2.1.4 From 5a1c1f70f8b8092d7fcd86698d7d9de2ba69a99a Mon Sep 17 00:00:00 2001 From: averikitsch Date: Thu, 11 Feb 2021 15:21:21 -0800 Subject: [PATCH 9/9] revert changes --- eventarc/generic/Dockerfile | 5 ++--- eventarc/generic/Gemfile.lock | 36 +++++++++++++++++------------------ eventarc/pubsub/Dockerfile | 5 ++--- eventarc/pubsub/Gemfile.lock | 2 +- run/helloworld/Dockerfile | 5 ++--- run/helloworld/Gemfile.lock | 36 +++++++++++++++++------------------ 6 files changed, 43 insertions(+), 46 deletions(-) diff --git a/eventarc/generic/Dockerfile b/eventarc/generic/Dockerfile index b37e651f2..81ef08c64 100644 --- a/eventarc/generic/Dockerfile +++ b/eventarc/generic/Dockerfile @@ -16,14 +16,13 @@ # Use the official lightweight Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:2.7-slim +FROM ruby:2.5-slim # Install production dependencies. WORKDIR /usr/src/app COPY Gemfile Gemfile.lock ./ ENV BUNDLE_FROZEN=true -RUN bundle config set without 'test' -RUN gem install bundler && bundle install +RUN gem install bundler && bundle install --without test # Copy local code to the container image. COPY . ./ diff --git a/eventarc/generic/Gemfile.lock b/eventarc/generic/Gemfile.lock index eaff7b790..fe3299cca 100644 --- a/eventarc/generic/Gemfile.lock +++ b/eventarc/generic/Gemfile.lock @@ -9,12 +9,12 @@ GEM domain_name (~> 0.5) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) + mime-types-data (3.2020.0512) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) netrc (0.11.0) rack (2.2.3) - rack-protection (2.1.0) + rack-protection (2.0.8.1) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -23,27 +23,27 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.2) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.2) rubysl-securerandom (2.0.0) - sinatra (2.1.0) + sinatra (2.0.8.1) mustermann (~> 1.0) - rack (~> 2.2) - rack-protection (= 2.1.0) + rack (~> 2.0) + rack-protection (= 2.0.8.1) tilt (~> 2.0) tilt (2.0.10) unf (0.1.4) @@ -62,4 +62,4 @@ DEPENDENCIES sinatra (~> 2.0) BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/eventarc/pubsub/Dockerfile b/eventarc/pubsub/Dockerfile index 0c68b46c6..6998d8d5e 100644 --- a/eventarc/pubsub/Dockerfile +++ b/eventarc/pubsub/Dockerfile @@ -16,14 +16,13 @@ # Use the official lightweight Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:2.7-slim +FROM ruby:2.5-slim # Install production dependencies. WORKDIR /usr/src/app COPY Gemfile Gemfile.lock ./ ENV BUNDLE_FROZEN=true -RUN bundle config set without 'test' -RUN gem install bundler && bundle install +RUN gem install bundler && bundle install --without test # Copy local code to the container image. COPY . ./ diff --git a/eventarc/pubsub/Gemfile.lock b/eventarc/pubsub/Gemfile.lock index eaff7b790..c9fbc4a5e 100644 --- a/eventarc/pubsub/Gemfile.lock +++ b/eventarc/pubsub/Gemfile.lock @@ -62,4 +62,4 @@ DEPENDENCIES sinatra (~> 2.0) BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/run/helloworld/Dockerfile b/run/helloworld/Dockerfile index 99ed0457b..bb831e27a 100644 --- a/run/helloworld/Dockerfile +++ b/run/helloworld/Dockerfile @@ -17,14 +17,13 @@ # Use the official lightweight Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:2.7-slim +FROM ruby:2.5-slim # Install production dependencies. WORKDIR /usr/src/app COPY Gemfile Gemfile.lock ./ ENV BUNDLE_FROZEN=true -RUN bundle config set without 'test' -RUN gem install bundler && bundle install +RUN gem install bundler && bundle install --without test # Copy local code to the container image. COPY . ./ diff --git a/run/helloworld/Gemfile.lock b/run/helloworld/Gemfile.lock index eaff7b790..12ba4c5c4 100644 --- a/run/helloworld/Gemfile.lock +++ b/run/helloworld/Gemfile.lock @@ -9,12 +9,12 @@ GEM domain_name (~> 0.5) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) + mime-types-data (3.2020.0512) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) netrc (0.11.0) rack (2.2.3) - rack-protection (2.1.0) + rack-protection (2.0.8.1) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -23,27 +23,27 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.2) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.2) rubysl-securerandom (2.0.0) - sinatra (2.1.0) + sinatra (2.0.8.1) mustermann (~> 1.0) - rack (~> 2.2) - rack-protection (= 2.1.0) + rack (~> 2.0) + rack-protection (= 2.0.8.1) tilt (~> 2.0) tilt (2.0.10) unf (0.1.4) @@ -62,4 +62,4 @@ DEPENDENCIES sinatra (~> 2.0) BUNDLED WITH - 2.1.4 + 1.17.3