Skip to content

Upgrades Ruby and Dockerfile #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 18, 2019
Merged

Upgrades Ruby and Dockerfile #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd469cb
Upgrades Ruby version
m4rcelotoledo May 21, 2019
0df0368
Upgrades Docker image
m4rcelotoledo May 21, 2019
8d1a2e8
Resolve deps (#181)
filipesperandio Jun 3, 2019
3c7cee1
Fix version when creating version specific channels (#186)
filipesperandio Jun 4, 2019
9d12e25
Include vendor/bundle in .gitignore
m4rcelotoledo Jun 6, 2019
48bf16f
Update ruby-version
m4rcelotoledo Jun 6, 2019
e63f8ea
Update Dockerfile
m4rcelotoledo Jun 6, 2019
8885243
Merge branch 'master' into ruby_and_docker
m4rcelotoledo Jun 6, 2019
00cf1c0
Updates bundler
m4rcelotoledo Jun 6, 2019
b1e1bc9
Merge branch 'ruby_and_docker' of github.com:marcelotoledo5000/codecl…
m4rcelotoledo Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Ignore bundler config.
/.bundle
/vendor/bundle
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.3
2.6.3
11 changes: 7 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
FROM ruby:2.4-alpine
FROM ruby:2.6.3-alpine3.9

LABEL name="Ruby-2.6" \
version="1.0"

WORKDIR /usr/src/app

RUN adduser -u 9000 -D app

COPY Gemfile Gemfile.lock /usr/src/app/

RUN apk add --update build-base && \
RUN apk add --update build-base git && \
gem install bundler && \
bundle install --quiet -j 4 --without=test && \
bundle install --quiet -j 4 && \
chown -R app:app /usr/local/bundle && \
rm -fr ~/.gem ~/.bundle ~/.wh..gem && \
apk del build-base
gem cleanup

COPY . /usr/src/app
RUN chown -R app:app .
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ DEPENDENCIES
safe_yaml

BUNDLED WITH
1.17.3
2.0.1
4 changes: 2 additions & 2 deletions bin/newver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ ed Gemfile <<-EDITS
gem "parser"
.
/gem "rubocop",/c
gem "rubocop", "~> ${NEWVER}", require: false
gem "rubocop", "${NEWVER}", require: false
.
wq
EDITS

make bundle -e BUNDLE_ARGS="update rubocop"
make bundle -e BUNDLE_ARGS="update rubocop rubocop-rspec rubocop-migrations"
make image
make docs
sudo chown -R $(id -u):$(id -g) config
Expand Down