Skip to content

Commit 67140fd

Browse files
author
Dirk de Kok
committed
ruby 2.6.2, postgres 10, bundler 2.0
1 parent 661dc62 commit 67140fd

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
FROM ruby:2.5.1-slim
1+
FROM ruby:2.6.2-slim
22
ARG precompileassets
33

4+
RUN apt-get update && apt-get install -y curl gnupg
5+
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgdg.list
6+
RUN curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
7+
48
RUN apt-get -y update && \
59
apt-get install --fix-missing --no-install-recommends -qq -y \
610
build-essential \
@@ -9,7 +13,7 @@ RUN apt-get -y update && \
913
git-all \
1014
curl \
1115
ssh \
12-
postgresql-client libpq5 libpq-dev -y && \
16+
postgresql-client-10 libpq5 libpq-dev -y && \
1317
wget -qO- https://deb.nodesource.com/setup_9.x | bash - && \
1418
apt-get install -y nodejs && \
1519
wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby '2.5.1'
4+
ruby '2.6.2'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
77
gem 'rails', '~> 5.2.1'

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,4 @@ RUBY VERSION
200200
ruby 2.5.1p57
201201

202202
BUNDLED WITH
203-
1.16.6
203+
2.0.0

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.0'
22
services:
33
db:
4-
image: postgres:9
4+
image: postgres:10
55
ports:
66
- 5432:5432
77
environment:

0 commit comments

Comments
 (0)