From 38665068446ded67971197c3d91dec483eded79f Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 09:09:38 -0700 Subject: [PATCH 01/20] ruby test matrix --- .gitlab-ci.yml | 2 +- .../provision_test-app-ruby-multialpine.yml | 26 ++++++ ...provision_test-app-ruby-multicontainer.yml | 28 ++++++ .../Dockerfile.reverseproxy | 3 + .../Dockerfile.ruby_2_7-alpine | 51 ++++++++++ .../Dockerfile.ruby_3_0-alpine | 51 ++++++++++ .../Dockerfile.ruby_3_1-alpine | 51 ++++++++++ .../Dockerfile.ruby_3_2-alpine | 51 ++++++++++ .../Dockerfile.ruby_3_3-alpine | 51 ++++++++++ .../Dockerfile.ruby_3_4-alpine | 51 ++++++++++ .../docker-compose.yml | 73 +++++++++++++++ .../ruby/test-app-ruby-multialpine/nginx.conf | 93 +++++++++++++++++++ .../Dockerfile.reverseproxy | 3 + .../Dockerfile.ruby_2_7 | 51 ++++++++++ .../Dockerfile.ruby_3_0 | 51 ++++++++++ .../Dockerfile.ruby_3_1 | 51 ++++++++++ .../Dockerfile.ruby_3_2 | 51 ++++++++++ .../Dockerfile.ruby_3_3 | 51 ++++++++++ .../Dockerfile.ruby_3_4 | 51 ++++++++++ .../docker-compose.yml | 73 +++++++++++++++ .../test-app-ruby-multicontainer/nginx.conf | 93 +++++++++++++++++++ 21 files changed, 1005 insertions(+), 1 deletion(-) create mode 100644 utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multialpine.yml create mode 100644 utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multicontainer.yml create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.reverseproxy create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/nginx.conf create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.reverseproxy create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml create mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/nginx.conf diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bb56bbce9..53dbe8b503 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,7 +216,7 @@ onboarding_ruby: ONBOARDING_FILTER_WEBLOG: [test-app-ruby-container] SCENARIO: [ CONTAINER_AUTO_INJECTION_INSTALL_SCRIPT] - ONBOARDING_FILTER_ENV: [dev, prod] - ONBOARDING_FILTER_WEBLOG: [test-app-ruby,test-app-ruby-container] + ONBOARDING_FILTER_WEBLOG: [test-app-ruby,test-app-ruby-container,test-app-ruby-multicontainer,test-app-ruby-multialpine] SCENARIO: [INSTALLER_AUTO_INJECTION] - ONBOARDING_FILTER_ENV: [dev, prod] ONBOARDING_FILTER_WEBLOG: [test-app-ruby] 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 new file mode 100644 index 0000000000..094aec4cdc --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multialpine.yml @@ -0,0 +1,26 @@ +weblog: + name: test-app-python-multialpine + install: + - os_type: linux + copy_files: + - name: copy-multicontainer-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_multicontainer.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/docker-compose.yml + - name: copy-python-app + local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django + - name: copy-python3_12-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_12-alpine + - name: copy-python3_11-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_11-alpine + - name: copy-python3_10-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_10-alpine + - name: copy-python3_9-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_9-alpine + - name: copy-python3_7-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_7-alpine + - name: copy-reverseproxy-dockerfile + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.reverseproxy + - name: copy-reverseproxy-conf + local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/nginx.conf + remote-command: sh create_and_run_app_multicontainer.sh 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 new file mode 100644 index 0000000000..4eaef0b1ca --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multicontainer.yml @@ -0,0 +1,28 @@ +weblog: + name: test-app-ruby-multicontainer + install: + - os_type: linux + copy_files: + - name: copy-multicontainer-run-script + local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_multicontainer.sh + - name: copy-docker-compose-file + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml + - name: copy-ruby-app + local_path: lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails + - name: copy-ruby3_12-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 + - name: copy-ruby3_11-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 + - name: copy-ruby3_10-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 + - name: copy-ruby3_9-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 + - name: copy-ruby3_8-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 + - name: copy-ruby3_7-app-dockerfile + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 + - name: copy-reverseproxy-dockerfile + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.reverseproxy + - name: copy-reverseproxy-conf + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/nginx.conf + remote-command: sh create_and_run_app_multicontainer.sh diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.reverseproxy b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.reverseproxy new file mode 100644 index 0000000000..82cdb62223 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.reverseproxy @@ -0,0 +1,3 @@ +FROM public.ecr.aws/nginx/nginx:stable-perl + +COPY nginx.conf /etc/nginx/nginx.conf \ No newline at end of file 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 new file mode 100644 index 0000000000..6e97fa2c67 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine @@ -0,0 +1,51 @@ +FROM public.ecr.aws/docker/library/ruby:2.7-alpine + +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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 new file mode 100644 index 0000000000..273d7b7116 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine @@ -0,0 +1,51 @@ +FROM public.ecr.aws/docker/library/ruby:3.0-alpine + +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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 new file mode 100644 index 0000000000..d4f5c79c3a --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine @@ -0,0 +1,51 @@ +FROM public.ecr.aws/docker/library/ruby:3.1-alpine + +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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 new file mode 100644 index 0000000000..9e9d2185f8 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine @@ -0,0 +1,51 @@ +FROM public.ecr.aws/docker/library/ruby:3.2-alpine + +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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 new file mode 100644 index 0000000000..e72cee4472 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine @@ -0,0 +1,51 @@ +FROM public.ecr.aws/docker/library/ruby:3.3-alpine + +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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_4-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine new file mode 100644 index 0000000000..2af4d6fecf --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine @@ -0,0 +1,51 @@ +FROM public.ecr.aws/docker/library/ruby:3.4-alpine + +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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 new file mode 100644 index 0000000000..fb7ce1748b --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml @@ -0,0 +1,73 @@ +version: '2' + +services: + reverseproxy: + image: reverseproxy:latest + ports: + - 5985:8080 + restart: always + build: + context: . + dockerfile: Dockerfile.reverseproxy + healthcheck: + test: "curl -f http://localhost:8080" + + ruby_3_4: + env_file: "scenario_app.env" + image: system-tests/ruby_3_4:latest + restart: always + build: + context: . + dockerfile: Dockerfile.ruby_3_4-alpine + 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" 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 new file mode 100644 index 0000000000..44459c6746 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/nginx.conf @@ -0,0 +1,93 @@ +worker_processes 1; + +events { worker_connections 1024; } + + +http { + + log_format compression '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $upstream_addr ' + '"$http_referer" "$http_user_agent" "$gzip_ratio"'; + + 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; + } + server { + listen 8080; + access_log /var/log/nginx/access.log compression; + + location / { + default_type application/json; + return 200 "{ + 'app_type':'multicontainer', + 'apps':[{ + '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/' + } + + ] + }"; + } + + location /ruby_3_4/ { + 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; + } + } +} diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.reverseproxy b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.reverseproxy new file mode 100644 index 0000000000..82cdb62223 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.reverseproxy @@ -0,0 +1,3 @@ +FROM public.ecr.aws/nginx/nginx:stable-perl + +COPY nginx.conf /etc/nginx/nginx.conf \ No newline at end of file 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 new file mode 100644 index 0000000000..e994cc8aba --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 @@ -0,0 +1,51 @@ +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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 new file mode 100644 index 0000000000..58254ae638 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 @@ -0,0 +1,51 @@ +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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 new file mode 100644 index 0000000000..c6d003bc6b --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 @@ -0,0 +1,51 @@ +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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 new file mode 100644 index 0000000000..8ffadb002c --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 @@ -0,0 +1,51 @@ +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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_3 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 new file mode 100644 index 0000000000..ab780f68fc --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 @@ -0,0 +1,51 @@ +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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_4 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 new file mode 100644 index 0000000000..96aaefa0d5 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 @@ -0,0 +1,51 @@ +FROM public.ecr.aws/docker/library/ruby:3.4 + +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 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 + +# Set language +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en + +# Upgrade RubyGems and Bundler +RUN gem update --system 3.4.1 +RUN gem install bundler -v '~> 2.3.26' +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/docker-compose.yml b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml new file mode 100644 index 0000000000..46ed7f33b8 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml @@ -0,0 +1,73 @@ +version: '2' + +services: + reverseproxy: + image: reverseproxy:latest + ports: + - 5985:8080 + restart: always + build: + context: . + dockerfile: Dockerfile.reverseproxy + healthcheck: + test: "curl -f http://localhost:8080" + + ruby_3_4: + env_file: "scenario_app.env" + image: system-tests/ruby_3_4:latest + restart: always + build: + context: . + dockerfile: Dockerfile.ruby_3_4 + 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" 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 new file mode 100644 index 0000000000..29da2850d8 --- /dev/null +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/nginx.conf @@ -0,0 +1,93 @@ +worker_processes 1; + +events { worker_connections 1024; } + + +http { + + log_format compression '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $upstream_addr ' + '"$http_referer" "$http_user_agent" "$gzip_ratio"'; + + 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; + } + server { + listen 8080; + access_log /var/log/nginx/access.log compression; + + location / { + default_type application/json; + return 200 "{ + 'app_type':'multicontainer', + 'apps':[{ + '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/' + } + + ] + }"; + } + + location /ruby_3_4/ { + 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; + } + } +} From 3b2b25b94e9193a3a93f3c3d999462419396d39b Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 09:17:21 -0700 Subject: [PATCH 02/20] copypasta --- .../provision_test-app-ruby-multialpine.yml | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) 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 094aec4cdc..b6806dfbd1 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 @@ -1,26 +1,28 @@ weblog: - name: test-app-python-multialpine - install: + name: test-app-ruby-multialpine + install: - os_type: linux copy_files: - name: copy-multicontainer-run-script local_path: utils/build/virtual_machine/weblogs/common/create_and_run_app_multicontainer.sh - name: copy-docker-compose-file - local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/docker-compose.yml - - name: copy-python-app - local_path: lib-injection/build/docker/python/dd-lib-python-init-test-django - - name: copy-python3_12-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_12-alpine - - name: copy-python3_11-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_11-alpine - - name: copy-python3_10-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_10-alpine - - name: copy-python3_9-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_9-alpine - - name: copy-python3_7-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.python_3_7-alpine + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml + - name: copy-ruby-app + local_path: lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails + - 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-reverseproxy-dockerfile - local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/Dockerfile.reverseproxy + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.reverseproxy - name: copy-reverseproxy-conf - local_path: utils/build/virtual_machine/weblogs/python/test-app-python-multialpine/nginx.conf + local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/nginx.conf remote-command: sh create_and_run_app_multicontainer.sh From f38a8d9453bd151b70439409f85207bbc6ca86d9 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 09:23:25 -0700 Subject: [PATCH 03/20] only ubuntu24 --- .../weblogs/ruby/provision_test-app-ruby-multialpine.yml | 1 + .../weblogs/ruby/provision_test-app-ruby-multicontainer.yml | 1 + 2 files changed, 2 insertions(+) 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 b6806dfbd1..7d1d384b31 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 @@ -1,5 +1,6 @@ weblog: name: test-app-ruby-multialpine + exact_os_branches: [ubuntu24] install: - os_type: linux copy_files: 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 4eaef0b1ca..26df18f77f 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 @@ -1,5 +1,6 @@ weblog: name: test-app-ruby-multicontainer + exact_os_branches: [ubuntu24] install: - os_type: linux copy_files: From c186c51cefc4d2e8f743808c9aba073b66206f2c Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 10:15:48 -0700 Subject: [PATCH 04/20] 3.4-rc --- .../ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine | 2 +- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine index 2af4d6fecf..ca0bdc245f 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine @@ -1,4 +1,4 @@ -FROM public.ecr.aws/docker/library/ruby:3.4-alpine +FROM public.ecr.aws/docker/library/ruby:3.4-rc-alpine ENV DEBIAN_FRONTEND=noninteractive diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 index 96aaefa0d5..98fe37f513 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 @@ -1,4 +1,4 @@ -FROM public.ecr.aws/docker/library/ruby:3.4 +FROM public.ecr.aws/docker/library/ruby:3.4-rc ENV DEBIAN_FRONTEND=noninteractive From de742e91d20ff2ad8ab537604e81fb313e0c58de Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 10:31:52 -0700 Subject: [PATCH 05/20] more apps --- .../weblogs/ruby/provision_test-app-ruby-multialpine.yml | 2 +- .../weblogs/ruby/provision_test-app-ruby-multicontainer.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7d1d384b31..aa58606f92 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 @@ -9,7 +9,7 @@ weblog: - name: copy-docker-compose-file local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml - name: copy-ruby-app - local_path: lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails + 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 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 26df18f77f..0b8986ff11 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 @@ -9,7 +9,7 @@ weblog: - name: copy-docker-compose-file local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml - name: copy-ruby-app - local_path: lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails + local_path: lib-injection/build/docker/ruby - name: copy-ruby3_12-app-dockerfile local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 - name: copy-ruby3_11-app-dockerfile From 363760643884c0c1f2b639e8b2ebab958fbea7cb Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 10:59:57 -0700 Subject: [PATCH 06/20] try netcat-traditional --- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 8ffadb002c..4e5fa0e06f 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; From d7c13f7141bdf10a61ce5ff1dfd4e1db3ec1e40d Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 11:18:55 -0700 Subject: [PATCH 07/20] netcat traditional --- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 | 2 +- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 | 2 +- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 | 2 +- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 index 58254ae638..6d36364284 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; 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 index c6d003bc6b..966712401b 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; 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 index ab780f68fc..3b4edb29f4 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 index 98fe37f513..b170446446 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; From 7e9ff069725cab62f101607ac37d0effb1efd179 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 12:47:19 -0700 Subject: [PATCH 08/20] netcat traditional --- .../ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine | 2 +- .../ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine | 2 +- .../ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine | 2 +- .../ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine | 2 +- .../ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine | 2 +- .../ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine | 2 +- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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 index 6e97fa2c67..22fd61560b 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; 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 index 273d7b7116..29bcc6890c 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; 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 index d4f5c79c3a..10c52db906 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; 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 index 9e9d2185f8..25a35638e2 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; 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 index e72cee4472..c1dfef5249 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine index ca0bdc245f..c40eea44cf 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; 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 index e994cc8aba..1ad7d32371 100644 --- 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 @@ -16,7 +16,7 @@ RUN set -ex && \ mkdir -p /usr/share/man/man1 && \ apt-get install -y --force-yes --no-install-recommends \ sudo git openssh-client rsync vim \ - net-tools netcat parallel unzip zip bzip2 && \ + net-tools netcat-traditional parallel unzip zip bzip2 && \ \ echo "===> Cleaning up" && \ rm -rf /var/lib/apt/lists/*; From 2fb52fbbe87bdfa3a3772b05d50e00e64bf235c8 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 30 Oct 2024 13:26:01 -0700 Subject: [PATCH 09/20] alpine doesnt have apt --- .../Dockerfile.ruby_2_7-alpine | 19 ------------------- .../Dockerfile.ruby_3_0-alpine | 19 ------------------- .../Dockerfile.ruby_3_1-alpine | 19 ------------------- .../Dockerfile.ruby_3_2-alpine | 19 ------------------- .../Dockerfile.ruby_3_3-alpine | 19 ------------------- .../Dockerfile.ruby_3_4-alpine | 19 ------------------- 6 files changed, 114 deletions(-) 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 index 22fd61560b..2c94713174 100644 --- 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 @@ -2,25 +2,6 @@ FROM public.ecr.aws/docker/library/ruby:2.7-alpine 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 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 index 29bcc6890c..afbc2e7d76 100644 --- 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 @@ -2,25 +2,6 @@ FROM public.ecr.aws/docker/library/ruby:3.0-alpine 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 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 index 10c52db906..8a2868b368 100644 --- 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 @@ -2,25 +2,6 @@ FROM public.ecr.aws/docker/library/ruby:3.1-alpine 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 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 index 25a35638e2..b4df575c54 100644 --- 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 @@ -2,25 +2,6 @@ FROM public.ecr.aws/docker/library/ruby:3.2-alpine 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 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 index c1dfef5249..64fc9f6137 100644 --- 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 @@ -2,25 +2,6 @@ FROM public.ecr.aws/docker/library/ruby:3.3-alpine 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 diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine index c40eea44cf..2c21d57fb2 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine @@ -2,25 +2,6 @@ FROM public.ecr.aws/docker/library/ruby:3.4-rc-alpine 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 From 5b61a1d050b2e15a3ffb0b46284a2acf887f9c31 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Thu, 31 Oct 2024 07:44:25 -0700 Subject: [PATCH 10/20] dont set language --- .../test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine | 5 ----- .../test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine | 5 ----- .../test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine | 5 ----- .../test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine | 5 ----- .../test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine | 5 ----- .../test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine | 5 ----- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 | 5 ----- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 | 5 ----- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1 | 5 ----- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2 | 5 ----- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 | 5 ----- .../ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 | 5 ----- 12 files changed, 60 deletions(-) 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 index 2c94713174..24a5927f11 100644 --- 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 @@ -5,11 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index afbc2e7d76..e159f60fb1 100644 --- 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 @@ -5,11 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index 8a2868b368..27c3167d16 100644 --- 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 @@ -5,11 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index b4df575c54..56dee57412 100644 --- 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 @@ -5,11 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index 64fc9f6137..137ca87122 100644 --- 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 @@ -5,11 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine index 2c21d57fb2..baa06f8437 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine @@ -5,11 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index 1ad7d32371..98804bcc73 100644 --- 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 @@ -24,11 +24,6 @@ RUN set -ex && \ # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index 6d36364284..14ab84a309 100644 --- 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 @@ -24,11 +24,6 @@ RUN set -ex && \ # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index 966712401b..cd538d21ba 100644 --- 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 @@ -24,11 +24,6 @@ RUN set -ex && \ # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index 4e5fa0e06f..353fe878ef 100644 --- 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 @@ -24,11 +24,6 @@ RUN set -ex && \ # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' 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 index 3b4edb29f4..18afedf1b0 100644 --- 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 @@ -24,11 +24,6 @@ RUN set -ex && \ # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' diff --git a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 index b170446446..7598448fe0 100644 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 +++ b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 @@ -24,11 +24,6 @@ RUN set -ex && \ # Set timezone to UTC by default RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime -# Set language -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en - # Upgrade RubyGems and Bundler RUN gem update --system 3.4.1 RUN gem install bundler -v '~> 2.3.26' From 341e84273ec827fa1aa1d9fd122e0b9805cd5978 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 1 Nov 2024 11:12:51 -0700 Subject: [PATCH 11/20] add the missing gem to the gemfile --- lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile b/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile index 494f8fee14..83f11607bb 100644 --- a/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile +++ b/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile @@ -13,6 +13,8 @@ gem "sqlite3", "~> 1.4" # Use the Puma web server [https://github.com/puma/puma] gem "puma", "~> 5.0" +gem 'mutex_m', '~> 0.2.0' + # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ] From 6fced9329801da2488285912862c86f82cc94787 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 1 Nov 2024 12:36:28 -0700 Subject: [PATCH 12/20] add the missing gem to the gemfile --- lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile b/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile index 83f11607bb..8704e59f62 100644 --- a/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile +++ b/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile @@ -14,6 +14,7 @@ gem "sqlite3", "~> 1.4" gem "puma", "~> 5.0" gem 'mutex_m', '~> 0.2.0' +gem 'base64', '~> 0.1.0' # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ] From 6e25da2110625699db05109fdca3e316b3a255ae Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 1 Nov 2024 13:26:14 -0700 Subject: [PATCH 13/20] add the missing gem to the gemfile --- lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile b/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile index 8704e59f62..1d23f77fdf 100644 --- a/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile +++ b/lib-injection/build/docker/ruby/lib_injection_rails_app/Gemfile @@ -15,6 +15,7 @@ gem "puma", "~> 5.0" gem 'mutex_m', '~> 0.2.0' gem 'base64', '~> 0.1.0' +gem 'bigdecimal', '~> 1.2', '>= 1.2.7' # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ] From 8935dda049cbb584d0e0f32a951415b75b3530d6 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Mon, 4 Nov 2024 07:44:55 -0800 Subject: [PATCH 14/20] remove unsupported versions --- .../ruby/provision_test-app-ruby-multialpine.yml | 4 ---- .../ruby/provision_test-app-ruby-multicontainer.yml | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) 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 aa58606f92..8b5a4d76c8 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 @@ -10,10 +10,6 @@ weblog: local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml - name: copy-ruby-app 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 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 0b8986ff11..1381a3adb4 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 @@ -10,17 +10,13 @@ weblog: local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml - name: copy-ruby-app local_path: lib-injection/build/docker/ruby - - name: copy-ruby3_12-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 - - name: copy-ruby3_11-app-dockerfile - local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 - - name: copy-ruby3_10-app-dockerfile + - 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_9-app-dockerfile + - 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_8-app-dockerfile + - name: copy-ruby3_0-app-dockerfile local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0 - - name: copy-ruby3_7-app-dockerfile + - name: copy-ruby2_7-app-dockerfile local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7 - name: copy-reverseproxy-dockerfile local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.reverseproxy From a8d6e8dc2d374d0d7813eb54d8b3f455d4f90898 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Mon, 4 Nov 2024 10:03:24 -0800 Subject: [PATCH 15/20] remove references to unsupported versions --- .../Dockerfile.ruby_3_3-alpine | 27 ----------- .../Dockerfile.ruby_3_4-alpine | 27 ----------- .../docker-compose.yml | 20 -------- .../Dockerfile.ruby_3_3 | 46 ------------------- .../Dockerfile.ruby_3_4 | 46 ------------------- .../docker-compose.yml | 20 -------- .../test-app-ruby-multicontainer/nginx.conf | 22 --------- 7 files changed, 208 deletions(-) delete mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine delete mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine delete mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 delete mode 100644 utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 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 137ca87122..0000000000 --- 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.1 -RUN gem install bundler -v '~> 2.3.26' -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_4-alpine b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine deleted file mode 100644 index baa06f8437..0000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine +++ /dev/null @@ -1,27 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.4-rc-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.1 -RUN gem install bundler -v '~> 2.3.26' -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 fb7ce1748b..864d9125eb 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 @@ -12,26 +12,6 @@ services: healthcheck: test: "curl -f http://localhost:8080" - ruby_3_4: - env_file: "scenario_app.env" - image: system-tests/ruby_3_4:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_4-alpine - 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 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 18afedf1b0..0000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3 +++ /dev/null @@ -1,46 +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.1 -RUN gem install bundler -v '~> 2.3.26' -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_4 b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 deleted file mode 100644 index 7598448fe0..0000000000 --- a/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4 +++ /dev/null @@ -1,46 +0,0 @@ -FROM public.ecr.aws/docker/library/ruby:3.4-rc - -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.1 -RUN gem install bundler -v '~> 2.3.26' -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/docker-compose.yml b/utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml index 46ed7f33b8..c6282f0ea8 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 @@ -12,26 +12,6 @@ services: healthcheck: test: "curl -f http://localhost:8080" - ruby_3_4: - env_file: "scenario_app.env" - image: system-tests/ruby_3_4:latest - restart: always - build: - context: . - dockerfile: Dockerfile.ruby_3_4 - 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 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 29da2850d8..15faeaf75f 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 @@ -9,12 +9,6 @@ http { '"$request" $status $upstream_addr ' '"$http_referer" "$http_user_agent" "$gzip_ratio"'; - 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; } @@ -36,14 +30,6 @@ http { return 200 "{ 'app_type':'multicontainer', 'apps':[{ - '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/' @@ -65,14 +51,6 @@ http { }"; } - location /ruby_3_4/ { - 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; From 4dbb978804b3631dd4ce32abec98a16c1d133b75 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Mon, 4 Nov 2024 10:04:14 -0800 Subject: [PATCH 16/20] remove references to unsupported versions --- .../ruby/test-app-ruby-multialpine/nginx.conf | 22 ------------------- 1 file changed, 22 deletions(-) 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 44459c6746..88ce9b0818 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 @@ -9,12 +9,6 @@ http { '"$request" $status $upstream_addr ' '"$http_referer" "$http_user_agent" "$gzip_ratio"'; - 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; } @@ -36,14 +30,6 @@ http { return 200 "{ 'app_type':'multicontainer', 'apps':[{ - '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/' @@ -65,14 +51,6 @@ http { }"; } - location /ruby_3_4/ { - 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; From df7e837abc1d72b289bb99ea8547408fbbf0d349 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Mon, 4 Nov 2024 10:49:37 -0800 Subject: [PATCH 17/20] disable failing health checks --- .../ruby/test-app-ruby-multicontainer/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 c6282f0ea8..4f451847ff 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 @@ -20,7 +20,7 @@ services: context: . dockerfile: Dockerfile.ruby_3_2 healthcheck: - test: "curl -f http://localhost:18080" + test: "true" ruby_3_1: env_file: "scenario_app.env" @@ -30,7 +30,7 @@ services: context: . dockerfile: Dockerfile.ruby_3_1 healthcheck: - test: "curl -f http://localhost:18080" + test: "true" ruby_3_0: env_file: "scenario_app.env" @@ -40,7 +40,7 @@ services: context: . dockerfile: Dockerfile.ruby_3_0 healthcheck: - test: "curl -f http://localhost:18080" + test: "true" ruby_2_7: env_file: "scenario_app.env" @@ -50,4 +50,4 @@ services: context: . dockerfile: Dockerfile.ruby_2_7 healthcheck: - test: "curl -f http://localhost:18080" + test: "true" From bacda5ceb7527fddbb0a99edc174ac8bfd2cff07 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Mon, 4 Nov 2024 11:06:52 -0800 Subject: [PATCH 18/20] redundant --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53dbe8b503..448c9bf4d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,7 +216,7 @@ onboarding_ruby: ONBOARDING_FILTER_WEBLOG: [test-app-ruby-container] SCENARIO: [ CONTAINER_AUTO_INJECTION_INSTALL_SCRIPT] - ONBOARDING_FILTER_ENV: [dev, prod] - ONBOARDING_FILTER_WEBLOG: [test-app-ruby,test-app-ruby-container,test-app-ruby-multicontainer,test-app-ruby-multialpine] + ONBOARDING_FILTER_WEBLOG: [test-app-ruby,test-app-ruby-multicontainer,test-app-ruby-multialpine] SCENARIO: [INSTALLER_AUTO_INJECTION] - ONBOARDING_FILTER_ENV: [dev, prod] ONBOARDING_FILTER_WEBLOG: [test-app-ruby] From adf662a123b98a310c75aa8727634762981b28ff Mon Sep 17 00:00:00 2001 From: Emmett Butler <723615+emmettbutler@users.noreply.github.com> Date: Wed, 6 Nov 2024 08:00:19 -0800 Subject: [PATCH 19/20] Update provision_test-app-ruby-multialpine.yml --- .../weblogs/ruby/provision_test-app-ruby-multialpine.yml | 1 - 1 file changed, 1 deletion(-) 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 8b5a4d76c8..2e967f5cc6 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 @@ -1,6 +1,5 @@ weblog: name: test-app-ruby-multialpine - exact_os_branches: [ubuntu24] install: - os_type: linux copy_files: From b0efbb1852d2017b70444e3a6ba2a3bc4882ec58 Mon Sep 17 00:00:00 2001 From: Emmett Butler <723615+emmettbutler@users.noreply.github.com> Date: Wed, 6 Nov 2024 08:00:34 -0800 Subject: [PATCH 20/20] Update provision_test-app-ruby-multicontainer.yml --- .../weblogs/ruby/provision_test-app-ruby-multicontainer.yml | 1 - 1 file changed, 1 deletion(-) 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 1381a3adb4..a23781e4e5 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 @@ -1,6 +1,5 @@ weblog: name: test-app-ruby-multicontainer - exact_os_branches: [ubuntu24] install: - os_type: linux copy_files: