diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 00000000..d0e66815 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches-ignore: + - develop + - staging + - main + pull_request: + +jobs: + build-image: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag pmpidam:$(date +%s) diff --git a/.ruby-version b/.ruby-version index e4604e3a..be94e6f5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.1 +3.2.2 diff --git a/.travis.yml b/.travis.yml index ef7dbccd..b0ce60e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: bionic language: ruby rvm: - — 3.2.1 + — 3.2.2 deploy: edge: true provider: cloudfoundry diff --git a/Dockerfile b/Dockerfile index 660e29db..dc43806d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,16 @@ -FROM ruby:3.2.1 +FROM ruby:3.2.2 + +ARG NODE_MAJOR=16 WORKDIR /app -RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ +RUN apt-get update && \ + apt-get install -y ca-certificates curl gnupg && \ + mkdir -p /etc/apt/keyrings && \ + curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \ apt-get update && \ - apt-get install -y nodejs && \ + apt-get install -y nodejs npm && \ npm install -g yarn@1.22.19 COPY Gemfile Gemfile.lock ./ diff --git a/Gemfile b/Gemfile index 922e9996..03f52924 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '3.2.1' +ruby '3.2.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 7.0.8' diff --git a/Gemfile.lock b/Gemfile.lock index 288ce1ef..99134f71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -401,7 +401,7 @@ DEPENDENCIES webpacker (~> 5.4, >= 5.4.4) RUBY VERSION - ruby 3.2.1p31 + ruby 3.2.2p53 BUNDLED WITH 2.4.6