mirror of
https://github.com/TracksApp/tracks.git
synced 2025-09-22 05:50:47 +02:00
Move to Ruby 2.7 for the default Docker version as well as the default target for alternative DB's. Fix the Ruby image version with three digits because the most recent versions seem to be somehow broken.
This commit is contained in:
parent
f9bae12c31
commit
0b2eec4f82
8 changed files with 17 additions and 17 deletions
8
.github/workflows/continuous-integration.yml
vendored
8
.github/workflows/continuous-integration.yml
vendored
|
@ -22,17 +22,17 @@ jobs:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- run: bash -x script/cibuild 2.7 mysql
|
- run: bash -x script/cibuild 2.7 mysql
|
||||||
|
|
||||||
test26postgres:
|
test27postgres:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- run: bash -x script/cibuild 2.6 postgres
|
- run: bash -x script/cibuild 2.7 postgres
|
||||||
|
|
||||||
test26sqlite:
|
test27sqlite:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- run: bash -x script/cibuild 2.6 sqlite
|
- run: bash -x script/cibuild 2.7 sqlite
|
||||||
|
|
||||||
# - run: bash -x script/cibuild 2.5 postgres
|
# - run: bash -x script/cibuild 2.5 postgres
|
||||||
# - run: bash -x script/cibuild 2.7 postgres
|
# - run: bash -x script/cibuild 2.7 postgres
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:2.6
|
FROM ruby:2.7.1
|
||||||
|
|
||||||
# throw errors if Gemfile has been modified since Gemfile.lock
|
# throw errors if Gemfile has been modified since Gemfile.lock
|
||||||
RUN bundle config --global frozen 1
|
RUN bundle config --global frozen 1
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:2.5
|
FROM ruby:2.5.7
|
||||||
|
|
||||||
# throw errors if Gemfile has been modified since Gemfile.lock
|
# throw errors if Gemfile has been modified since Gemfile.lock
|
||||||
RUN bundle config --global frozen 1
|
RUN bundle config --global frozen 1
|
||||||
|
@ -7,14 +7,14 @@ WORKDIR /app
|
||||||
|
|
||||||
RUN touch /etc/app-env
|
RUN touch /etc/app-env
|
||||||
|
|
||||||
COPY Gemfile* /app/
|
|
||||||
RUN gem install bundler
|
|
||||||
RUN bundle install --jobs 4
|
|
||||||
|
|
||||||
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
||||||
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
||||||
RUN apt-get update && apt-get install -y yarn
|
RUN apt-get update && apt-get install -y yarn
|
||||||
|
|
||||||
|
COPY Gemfile* /app/
|
||||||
|
RUN gem install bundler
|
||||||
|
RUN bundle install --jobs 4
|
||||||
|
|
||||||
RUN mkdir /app/log
|
RUN mkdir /app/log
|
||||||
|
|
||||||
COPY . /app/
|
COPY . /app/
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:2.7
|
FROM ruby:2.6.5
|
||||||
|
|
||||||
# throw errors if Gemfile has been modified since Gemfile.lock
|
# throw errors if Gemfile has been modified since Gemfile.lock
|
||||||
RUN bundle config --global frozen 1
|
RUN bundle config --global frozen 1
|
||||||
|
@ -7,14 +7,14 @@ WORKDIR /app
|
||||||
|
|
||||||
RUN touch /etc/app-env
|
RUN touch /etc/app-env
|
||||||
|
|
||||||
COPY Gemfile* /app/
|
|
||||||
RUN gem install bundler
|
|
||||||
RUN bundle install --jobs 4
|
|
||||||
|
|
||||||
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
||||||
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
||||||
RUN apt-get update && apt-get install -y yarn
|
RUN apt-get update && apt-get install -y yarn
|
||||||
|
|
||||||
|
COPY Gemfile* /app/
|
||||||
|
RUN gem install bundler
|
||||||
|
RUN bundle install --jobs 4
|
||||||
|
|
||||||
RUN mkdir /app/log
|
RUN mkdir /app/log
|
||||||
|
|
||||||
COPY . /app/
|
COPY . /app/
|
|
@ -10,7 +10,7 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile-2.6
|
||||||
environment:
|
environment:
|
||||||
# These are set in script/ci-build, so we need to pass-thru them.
|
# These are set in script/ci-build, so we need to pass-thru them.
|
||||||
RAILS_ENV: $RAILS_ENV
|
RAILS_ENV: $RAILS_ENV
|
||||||
|
|
|
@ -10,7 +10,7 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: Dockerfile-2.7
|
dockerfile: Dockerfile
|
||||||
environment:
|
environment:
|
||||||
# These are set in script/ci-build, so we need to pass-thru them.
|
# These are set in script/ci-build, so we need to pass-thru them.
|
||||||
RAILS_ENV: $RAILS_ENV
|
RAILS_ENV: $RAILS_ENV
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue