Skip to content

Commit

Permalink
main changes
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegPhenomenon committed Oct 7, 2024
1 parent 6eec3f3 commit af88813
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 27 deletions.
Binary file modified .DS_Store
Binary file not shown.
6 changes: 3 additions & 3 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.0
ruby-version: 3.2.2
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: config bundler
run: |
Expand All @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.0
ruby-version: 3.2.2
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: config bundler
run: |
Expand All @@ -49,7 +49,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
ruby: [ '3.2.0' ]
ruby: [ '3.2.2' ]
runs-on: ${{ matrix.os }}
continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.0
3.2.2
32 changes: 13 additions & 19 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@

FROM ruby:3.2.0-slim-buster
FROM internetee/ruby:3.2.2-bullseye

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -

RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \
build-essential=* \
imagemagick=* \
curl \
wget \
gnupg2 \
Expand All @@ -29,7 +32,7 @@ RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /
&& rm -rf /var/lib/apt/lists/*

# add repository for Node.js in the LTS version
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -

RUN apt-get install -y --no-install-recommends > /dev/null \
nodejs=* \
Expand Down Expand Up @@ -57,24 +60,15 @@ RUN apt-get install -y --no-install-recommends > /dev/null \
&& 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 npm install --global yarn
RUN npm install -g yarn@latest

# 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 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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.staging
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# EXPOSE 3000


FROM ruby:3.2.0-slim-buster
FROM ruby:3.2.2-slim-buster

ARG RAILS_ENV
ARG SECRET_KEY_BASE
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.2.0'
ruby '3.2.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem 'rails', '~> 7.1.3'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ DEPENDENCIES
wkhtmltopdf-binary

RUBY VERSION
ruby 3.2.0p0
ruby 3.2.2p0

BUNDLED WITH
2.4.13
2 changes: 1 addition & 1 deletion db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit af88813

Please sign in to comment.