From a943d5f08e0763033079551d5f2d27e12a2441c8 Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Wed, 22 Dec 2021 19:37:32 +0200 Subject: [PATCH 1/2] added new certs --- .gitignore | 0 README.MD | 0 base_images/README.MD | 0 base_images/ruby_2_4/Dockerfile | 0 base_images/ruby_2_5/Dockerfile | 0 base_images/ruby_2_6/Dockerfile | 0 base_images/ruby_2_7/Dockerfile | 0 base_images/ruby_3_0/Dockerfile | 0 base_images/ruby_3_0/releaseable/Dockerfile | 0 docker-compose.yml | 0 nginx/nginx.conf | 0 nginx/sites-enabled/auction.test | 0 nginx/sites-enabled/registrar.test | 0 nginx/sites-enabled/registry.test | 0 nginx/sites-enabled/rest-whois.test | 0 setup.sh | 0 shared/ca/certs/.gitkeep | 0 shared/ca/crl/.gitkeep | 0 shared/ca/csrs/.gitkeep | 0 shared/ca/newcerts/.gitkeep | 0 shared/ca/openssl.cnf | 0 shared/ca/private/.gitkeep | 0 shared/ca/server.csr.cnf | 0 shared/ca/v3.ext | 0 24 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 README.MD mode change 100644 => 100755 base_images/README.MD mode change 100644 => 100755 base_images/ruby_2_4/Dockerfile mode change 100644 => 100755 base_images/ruby_2_5/Dockerfile mode change 100644 => 100755 base_images/ruby_2_6/Dockerfile mode change 100644 => 100755 base_images/ruby_2_7/Dockerfile mode change 100644 => 100755 base_images/ruby_3_0/Dockerfile mode change 100644 => 100755 base_images/ruby_3_0/releaseable/Dockerfile mode change 100644 => 100755 docker-compose.yml mode change 100644 => 100755 nginx/nginx.conf mode change 100644 => 100755 nginx/sites-enabled/auction.test mode change 100644 => 100755 nginx/sites-enabled/registrar.test mode change 100644 => 100755 nginx/sites-enabled/registry.test mode change 100644 => 100755 nginx/sites-enabled/rest-whois.test mode change 100644 => 100755 setup.sh mode change 100644 => 100755 shared/ca/certs/.gitkeep mode change 100644 => 100755 shared/ca/crl/.gitkeep mode change 100644 => 100755 shared/ca/csrs/.gitkeep mode change 100644 => 100755 shared/ca/newcerts/.gitkeep mode change 100644 => 100755 shared/ca/openssl.cnf mode change 100644 => 100755 shared/ca/private/.gitkeep mode change 100644 => 100755 shared/ca/server.csr.cnf mode change 100644 => 100755 shared/ca/v3.ext diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.MD b/README.MD old mode 100644 new mode 100755 diff --git a/base_images/README.MD b/base_images/README.MD old mode 100644 new mode 100755 diff --git a/base_images/ruby_2_4/Dockerfile b/base_images/ruby_2_4/Dockerfile old mode 100644 new mode 100755 diff --git a/base_images/ruby_2_5/Dockerfile b/base_images/ruby_2_5/Dockerfile old mode 100644 new mode 100755 diff --git a/base_images/ruby_2_6/Dockerfile b/base_images/ruby_2_6/Dockerfile old mode 100644 new mode 100755 diff --git a/base_images/ruby_2_7/Dockerfile b/base_images/ruby_2_7/Dockerfile old mode 100644 new mode 100755 diff --git a/base_images/ruby_3_0/Dockerfile b/base_images/ruby_3_0/Dockerfile old mode 100644 new mode 100755 diff --git a/base_images/ruby_3_0/releaseable/Dockerfile b/base_images/ruby_3_0/releaseable/Dockerfile old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 diff --git a/nginx/nginx.conf b/nginx/nginx.conf old mode 100644 new mode 100755 diff --git a/nginx/sites-enabled/auction.test b/nginx/sites-enabled/auction.test old mode 100644 new mode 100755 diff --git a/nginx/sites-enabled/registrar.test b/nginx/sites-enabled/registrar.test old mode 100644 new mode 100755 diff --git a/nginx/sites-enabled/registry.test b/nginx/sites-enabled/registry.test old mode 100644 new mode 100755 diff --git a/nginx/sites-enabled/rest-whois.test b/nginx/sites-enabled/rest-whois.test old mode 100644 new mode 100755 diff --git a/setup.sh b/setup.sh old mode 100644 new mode 100755 diff --git a/shared/ca/certs/.gitkeep b/shared/ca/certs/.gitkeep old mode 100644 new mode 100755 diff --git a/shared/ca/crl/.gitkeep b/shared/ca/crl/.gitkeep old mode 100644 new mode 100755 diff --git a/shared/ca/csrs/.gitkeep b/shared/ca/csrs/.gitkeep old mode 100644 new mode 100755 diff --git a/shared/ca/newcerts/.gitkeep b/shared/ca/newcerts/.gitkeep old mode 100644 new mode 100755 diff --git a/shared/ca/openssl.cnf b/shared/ca/openssl.cnf old mode 100644 new mode 100755 diff --git a/shared/ca/private/.gitkeep b/shared/ca/private/.gitkeep old mode 100644 new mode 100755 diff --git a/shared/ca/server.csr.cnf b/shared/ca/server.csr.cnf old mode 100644 new mode 100755 diff --git a/shared/ca/v3.ext b/shared/ca/v3.ext old mode 100644 new mode 100755 From 30b42363972b2fd8a90364577f29cd0a500dea31 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Tue, 15 Aug 2023 15:22:02 +0300 Subject: [PATCH 2/2] added regactor version of ruby 3.2.2 --- base_images/ruby_3_2_2_r/Dockerfile | 86 +++++++++++++++++++++++++++++ base_images/ruby_3_2_2_r/build.sh | 1 + base_images/ruby_3_2_2_r/push.sh | 4 ++ 3 files changed, 91 insertions(+) create mode 100644 base_images/ruby_3_2_2_r/Dockerfile create mode 100755 base_images/ruby_3_2_2_r/build.sh create mode 100755 base_images/ruby_3_2_2_r/push.sh diff --git a/base_images/ruby_3_2_2_r/Dockerfile b/base_images/ruby_3_2_2_r/Dockerfile new file mode 100644 index 0000000..f783070 --- /dev/null +++ b/base_images/ruby_3_2_2_r/Dockerfile @@ -0,0 +1,86 @@ +ARG RUBY_VER=3.2.2 + +FROM ruby:$RUBY_VER-slim-buster as base + +ARG NODE_VER=14 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] +RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \ + build-essential=* \ + imagemagick=* \ + curl \ + wget \ + gnupg2 \ + git \ + apt-utils \ + && apt-get dist-upgrade -yf\ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales +RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen +RUN sed -i -e 's/# et_EE.UTF-8 UTF-8/et_EE.UTF-8 UTF-8/' /etc/locale.gen && \ + dpkg-reconfigure --frontend=noninteractive locales && \ + update-locale LANG=et_EE.UTF-8 + +FROM base as build + +ENV LANG et_EE.UTF-8 +RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc -s | apt-key add - +RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list' +RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \ + postgresql-client-13=* \ + libpq-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +# add repository for Node.js in the LTS version +RUN curl -sL https://deb.nodesource.com/setup_${NODE_VER}.x | bash - + +RUN apt-get install -y --no-install-recommends > /dev/null \ + nodejs=* \ + qt5-default=* \ + libqt5webkit5-dev=* \ + gstreamer1.0-plugins-base=* \ + libappindicator3-1=* \ + gstreamer1.0-tools=* \ + qtdeclarative5-dev=* \ + fonts-liberation=* \ + gstreamer1.0-x=* \ + libasound2=* \ + libnspr4=* \ + libnss3=* \ + libxss1=* \ + libxtst6=* \ + xdg-utils=* \ + qtdeclarative5-dev=* \ + fonts-liberation=* \ + gstreamer1.0-x=* \ + wkhtmltopdf \ + libxslt1-dev \ + libxml2-dev \ + python-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN curl https://chromedriver.storage.googleapis.com/2.46/chromedriver_linux64.zip -o /chromedriver_linux64.zip +RUN apt-get update > /dev/null \ + && apt-get install -yf --no-install-recommends > /dev/null unzip=* \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* +RUN unzip chromedriver_linux64.zip -d /usr/local/bin +RUN rm /chromedriver_linux64.zip + + +RUN curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb +RUN dpkg -i /chrome.deb || apt-get update > /dev/null \ + && apt-get install -yf --no-install-recommends > /dev/null && apt-get clean \ + && rm -rf /var/lib/apt/lists/* +RUN dpkg -i /chrome.deb +RUN rm /chrome.deb +RUN sed -i 's/SECLEVEL=2/SECLEVEL=1/' /etc/ssl/openssl.cnf + +RUN mkdir -p /opt/webapps/app/tmp/pids +WORKDIR /opt/webapps/app + +EXPOSE 3000 diff --git a/base_images/ruby_3_2_2_r/build.sh b/base_images/ruby_3_2_2_r/build.sh new file mode 100755 index 0000000..c23469c --- /dev/null +++ b/base_images/ruby_3_2_2_r/build.sh @@ -0,0 +1 @@ +docker build --pull . --no-cache -t internetee/ruby:3.2.2-refactor -t internetee/ruby:3.2.2-bullseye-refactor -t internetee/ruby:3.2.2.$(date +'%Y.%m.%d')-refactor diff --git a/base_images/ruby_3_2_2_r/push.sh b/base_images/ruby_3_2_2_r/push.sh new file mode 100755 index 0000000..f9a0c43 --- /dev/null +++ b/base_images/ruby_3_2_2_r/push.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +docker push internetee/ruby:3.2.2-refactor +docker push internetee/ruby:3.2.2-bullseye-refactor +docker push internetee/ruby:3.2.2.$(date +'%Y.%m.%d')-refactor