diff --git a/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multialpine.yml b/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multialpine.yml index 662bec684df..91d0389a46c 100644 --- a/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multialpine.yml +++ b/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multialpine.yml @@ -12,16 +12,6 @@ weblog: local_path: lib-injection/build/docker/ruby - name: copy-ruby3_4-app-dockerfile local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine - - name: copy-ruby3_3-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine - - name: copy-ruby3_2-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine - - name: copy-ruby3_1-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine - - name: copy-ruby3_0-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine - - name: copy-ruby2_7-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine - name: copy-ruby2_6-app-dockerfile local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_6-alpine - name: copy-reverseproxy-dockerfile diff --git a/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multicontainer.yml b/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multicontainer.yml index 0d635e93839..cf7e195c35e 100644 --- a/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multicontainer.yml +++ b/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multicontainer.yml @@ -12,16 +12,6 @@ weblog: local_path: lib-injection/build/docker/ruby - name: copy-ruby3_4-app-dockerfile local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 - - name: copy-ruby3_3-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 - - name: copy-ruby3_2-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 - - name: copy-ruby3_1-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 - - name: copy-ruby3_0-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 - - name: copy-ruby2_7-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 - name: copy-ruby2_6-app-dockerfile local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_6 - name: copy-reverseproxy-dockerfile diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine deleted file mode 100644 index 07bc60f1b6e..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine +++ /dev/null @@ -1,27 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:2.7-alpine - -ENV DEBIAN_FRONTEND=noninteractive - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine deleted file mode 100644 index 66aa47ab6c2..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine +++ /dev/null @@ -1,27 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.0-alpine - -ENV DEBIAN_FRONTEND=noninteractive - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine deleted file mode 100644 index 6b4d6a21063..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine +++ /dev/null @@ -1,27 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.1-alpine - -ENV DEBIAN_FRONTEND=noninteractive - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine deleted file mode 100644 index 751504fa595..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine +++ /dev/null @@ -1,27 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.2-alpine - -ENV DEBIAN_FRONTEND=noninteractive - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine deleted file mode 100644 index c3ddf2ff956..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine +++ /dev/null @@ -1,27 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.3-alpine - -ENV DEBIAN_FRONTEND=noninteractive - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml index d49cfecc2b9..d29d2317ac4 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml @@ -22,56 +22,6 @@ services: healthcheck: test: "curl -f http://localhost:18080" - ruby_3_3: - env_file: "scenario_app.env" - image: system-tests/ruby_3_3:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_3-alpine - healthcheck: - test: "curl -f http://localhost:18080" - - ruby_3_2: - env_file: "scenario_app.env" - image: system-tests/ruby_3_2:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_2-alpine - healthcheck: - test: "curl -f http://localhost:18080" - - ruby_3_1: - env_file: "scenario_app.env" - image: system-tests/ruby_3_1:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_1-alpine - healthcheck: - test: "curl -f http://localhost:18080" - - ruby_3_0: - env_file: "scenario_app.env" - image: system-tests/ruby_3_0:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_0-alpine - healthcheck: - test: "curl -f http://localhost:18080" - - ruby_2_7: - env_file: "scenario_app.env" - image: system-tests/ruby_2_7:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_2_7-alpine - healthcheck: - test: "curl -f http://localhost:18080" - ruby_2_6: env_file: "scenario_app.env" image: system-tests/ruby_2_6:latest diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/nginx.conf b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/nginx.conf index 9c8591b9260..0d70b07dc33 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/nginx.conf +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/nginx.conf @@ -12,21 +12,6 @@ http { upstream ruby_3_4_app { server ruby_3_4:18080; } - upstream ruby_3_3_app { - server ruby_3_2:18080; - } - upstream ruby_3_2_app { - server ruby_3_2:18080; - } - upstream ruby_3_1_app { - server ruby_3_1:18080; - } - upstream ruby_3_0_app { - server ruby_3_0:18080; - } - upstream ruby_2_7_app { - server ruby_2_7:18080; - } upstream ruby_2_6_app { server ruby_2_6:18080; } @@ -42,26 +27,6 @@ http { 'runtime':'3.4', 'type':'alpine', 'url':'/ruby_3_4/' - },{ - 'runtime':'3.3', - 'type':'alpine', - 'url':'/ruby_3_3/' - },{ - 'runtime':'3.2', - 'type':'alpine', - 'url':'/ruby_3_2/' - },{ - 'runtime':'3.1', - 'type':'alpine', - 'url':'/ruby_3_1/' - },{ - 'runtime':'3.0', - 'type':'alpine', - 'url':'/ruby_3_0/' - },{ - 'runtime':'2.7', - 'type':'alpine', - 'url':'/ruby_2_7/' },{ 'runtime':'2.6', 'type':'alpine', @@ -76,26 +41,6 @@ http { proxy_pass http://ruby_3_4_app/; proxy_redirect off; } - location /ruby_3_3/ { - proxy_pass http://ruby_3_3_app/; - proxy_redirect off; - } - location /ruby_3_2/ { - proxy_pass http://ruby_3_2_app/; - proxy_redirect off; - } - location /ruby_3_1/ { - proxy_pass http://ruby_3_1_app/; - proxy_redirect off; - } - location /ruby_3_0/ { - proxy_pass http://ruby_3_0_app/; - proxy_redirect off; - } - location /ruby_2_7/ { - proxy_pass http://ruby_2_7_app/; - proxy_redirect off; - } location /ruby_2_6/ { proxy_pass http://ruby_2_6_app/; proxy_redirect off; diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 deleted file mode 100644 index 227c1dbf089..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 +++ /dev/null @@ -1,46 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:2.7 - -ENV DEBIAN_FRONTEND=noninteractive - -# Install prerequisites -RUN set -ex && \ - echo "===> Installing dependencies" && \ - apt-get -y update && \ - apt-get install -y --force-yes --no-install-recommends \ - curl wget tar gzip gnupg apt-transport-https ca-certificates tzdata locales && \ - \ - echo "===> Installing database libraries" && \ - apt-get install -y --force-yes --no-install-recommends sqlite3 && \ - \ - echo "===> Installing dev tools" && \ - mkdir -p /usr/share/man/man1 && \ - apt-get install -y --force-yes --no-install-recommends \ - sudo git openssh-client rsync vim \ - net-tools netcat-traditional parallel unzip zip bzip2 && \ - \ - echo "===> Cleaning up" && \ - rm -rf /var/lib/apt/lists/*; - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 deleted file mode 100644 index 506d00090f8..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 +++ /dev/null @@ -1,46 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.0 - -ENV DEBIAN_FRONTEND=noninteractive - -# Install prerequisites -RUN set -ex && \ - echo "===> Installing dependencies" && \ - apt-get -y update && \ - apt-get install -y --force-yes --no-install-recommends \ - curl wget tar gzip gnupg apt-transport-https ca-certificates tzdata locales && \ - \ - echo "===> Installing database libraries" && \ - apt-get install -y --force-yes --no-install-recommends sqlite3 && \ - \ - echo "===> Installing dev tools" && \ - mkdir -p /usr/share/man/man1 && \ - apt-get install -y --force-yes --no-install-recommends \ - sudo git openssh-client rsync vim \ - net-tools netcat-traditional parallel unzip zip bzip2 && \ - \ - echo "===> Cleaning up" && \ - rm -rf /var/lib/apt/lists/*; - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 deleted file mode 100644 index 00024e6ff53..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 +++ /dev/null @@ -1,46 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.1 - -ENV DEBIAN_FRONTEND=noninteractive - -# Install prerequisites -RUN set -ex && \ - echo "===> Installing dependencies" && \ - apt-get -y update && \ - apt-get install -y --force-yes --no-install-recommends \ - curl wget tar gzip gnupg apt-transport-https ca-certificates tzdata locales && \ - \ - echo "===> Installing database libraries" && \ - apt-get install -y --force-yes --no-install-recommends sqlite3 && \ - \ - echo "===> Installing dev tools" && \ - mkdir -p /usr/share/man/man1 && \ - apt-get install -y --force-yes --no-install-recommends \ - sudo git openssh-client rsync vim \ - net-tools netcat-traditional parallel unzip zip bzip2 && \ - \ - echo "===> Cleaning up" && \ - rm -rf /var/lib/apt/lists/*; - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 deleted file mode 100644 index 3f0d765c3cd..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 +++ /dev/null @@ -1,51 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.2 - -ENV DEBIAN_FRONTEND=noninteractive - -# Install prerequisites -RUN set -ex && \ - echo "===> Installing dependencies" && \ - apt-get -y update && \ - apt-get install -y --force-yes --no-install-recommends \ - curl wget tar gzip gnupg apt-transport-https ca-certificates tzdata locales && \ - \ - echo "===> Installing database libraries" && \ - apt-get install -y --force-yes --no-install-recommends sqlite3 && \ - \ - echo "===> Installing dev tools" && \ - mkdir -p /usr/share/man/man1 && \ - apt-get install -y --force-yes --no-install-recommends \ - sudo git openssh-client rsync vim \ - net-tools netcat-traditional parallel unzip zip bzip2 && \ - \ - echo "===> Cleaning up" && \ - rm -rf /var/lib/apt/lists/*; - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Replace the incompatible bigdecimal version constraint -RUN sed -i "s|gem 'bigdecimal', '~> 1.2', '>= 1.2.7'|gem 'bigdecimal', '>= 3.1.0'|" Gemfile -# Add/replace nio4r constraint -RUN grep -q "gem 'nio4r'" Gemfile || echo "gem 'nio4r', '>= 2.5.9'" >> Gemfile - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 deleted file mode 100644 index 106207ea041..00000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 +++ /dev/null @@ -1,51 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.3 - -ENV DEBIAN_FRONTEND=noninteractive - -# Install prerequisites -RUN set -ex && \ - echo "===> Installing dependencies" && \ - apt-get -y update && \ - apt-get install -y --force-yes --no-install-recommends \ - curl wget tar gzip gnupg apt-transport-https ca-certificates tzdata locales && \ - \ - echo "===> Installing database libraries" && \ - apt-get install -y --force-yes --no-install-recommends sqlite3 && \ - \ - echo "===> Installing dev tools" && \ - mkdir -p /usr/share/man/man1 && \ - apt-get install -y --force-yes --no-install-recommends \ - sudo git openssh-client rsync vim \ - net-tools netcat-traditional parallel unzip zip bzip2 && \ - \ - echo "===> Cleaning up" && \ - rm -rf /var/lib/apt/lists/*; - -# Set timezone to UTC by default -RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime - -# Upgrade RubyGems and Bundler -RUN gem update --system 3.4.22 -RUN gem install bundler -v '~> 2.4.22' -RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" -ENV BUNDLE_SILENCE_ROOT_WARNING 1 - -# Setup directory -RUN mkdir /app -WORKDIR /app - -# Add files -COPY lib_injection_rails_app /app - -# Replace the incompatible bigdecimal version constraint -RUN sed -i "s|gem 'bigdecimal', '~> 1.2', '>= 1.2.7'|gem 'bigdecimal', '>= 3.1.0'|" Gemfile -# Add/replace nio4r constraint -RUN grep -q "gem 'nio4r'" Gemfile || echo "gem 'nio4r', '>= 2.5.9'" >> Gemfile - -# Install gems -RUN bundle install - -# Set entrypoint -ENTRYPOINT ["/bin/bash", "-c"] - -CMD ["bin/rails server -b 0.0.0.0 -p 18080"] diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml index 1687a60be42..6400a5e403f 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml @@ -22,56 +22,6 @@ services: healthcheck: test: "curl -f http://localhost:18080/" - ruby_3_3: - env_file: "scenario_app.env" - image: system-tests/ruby_3_3:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_3 - healthcheck: - test: "curl -f http://localhost:18080/" - - ruby_3_2: - env_file: "scenario_app.env" - image: system-tests/ruby_3_2:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_2 - healthcheck: - test: "curl -f http://localhost:18080/" - - ruby_3_1: - env_file: "scenario_app.env" - image: system-tests/ruby_3_1:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_1 - healthcheck: - test: "curl -f http://localhost:18080/" - - ruby_3_0: - env_file: "scenario_app.env" - image: system-tests/ruby_3_0:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_0 - healthcheck: - test: "curl -f http://localhost:18080/" - - ruby_2_7: - env_file: "scenario_app.env" - image: system-tests/ruby_2_7:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_2_7 - healthcheck: - test: "curl -f http://localhost:18080/" - ruby_2_6: env_file: "scenario_app.env" image: system-tests/ruby_2_6:latest diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/nginx.conf b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/nginx.conf index b23e186aeeb..50fa26bf311 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/nginx.conf +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/nginx.conf @@ -12,21 +12,6 @@ http { upstream ruby_3_4_app { server ruby_3_4:18080; } - upstream ruby_3_3_app { - server ruby_3_3:18080; - } - upstream ruby_3_2_app { - server ruby_3_2:18080; - } - upstream ruby_3_1_app { - server ruby_3_1:18080; - } - upstream ruby_3_0_app { - server ruby_3_0:18080; - } - upstream ruby_2_7_app { - server ruby_2_7:18080; - } upstream ruby_2_6_app { server ruby_2_6:18080; } @@ -42,26 +27,6 @@ http { 'runtime':'3.4', 'type':'container', 'url':'/ruby_3_4/' - },{ - 'runtime':'3.3', - 'type':'container', - 'url':'/ruby_3_3/' - },{ - 'runtime':'3.2', - 'type':'container', - 'url':'/ruby_3_2/' - },{ - 'runtime':'3.1', - 'type':'container', - 'url':'/ruby_3_1/' - },{ - 'runtime':'3.0', - 'type':'container', - 'url':'/ruby_3_0/' - },{ - 'runtime':'2.7', - 'type':'container', - 'url':'/ruby_2_7/' },{ 'runtime':'2.6', 'type':'container', @@ -76,26 +41,6 @@ http { proxy_pass http://ruby_3_4_app/; proxy_redirect off; } - location /ruby_3_3/ { - proxy_pass http://ruby_3_3_app/; - proxy_redirect off; - } - location /ruby_3_2/ { - proxy_pass http://ruby_3_2_app/; - proxy_redirect off; - } - location /ruby_3_1/ { - proxy_pass http://ruby_3_1_app/; - proxy_redirect off; - } - location /ruby_3_0/ { - proxy_pass http://ruby_3_0_app/; - proxy_redirect off; - } - location /ruby_2_7/ { - proxy_pass http://ruby_2_7_app/; - proxy_redirect off; - } location /ruby_2_6/ { proxy_pass http://ruby_2_6_app/; proxy_redirect off;