Skip to content
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

Update Docker Compose setup #49

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update Docker Compose setup #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5018cf1
Update Docker image to ruby:2.6.5-alpine
jasmaa Jun 26, 2021
4d654f0
Replace yanked mimemagic 0.3.3 with 0.3.9
jasmaa Jun 26, 2021
2d12618
Update database environment variables in compose file
jasmaa Jun 26, 2021
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: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
FROM ruby:2.2-alpine
FROM ruby:2.6.5-alpine

ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8

RUN apk add --update --no-cache nodejs build-base libxml2-dev libxslt-dev
RUN apk add --update --no-cache postgresql-client postgresql-dev ruby-json libcurl tzdata
RUN apk add shared-mime-info

RUN mkdir /app
WORKDIR /app
Expand Down
4 changes: 3 additions & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ GEM
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mimemagic (0.3.9)
nokogiri (~> 1)
rake
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
ports:
- 3000:3000
environment:
DATABASE_HOST: postgres
DATABASE_URL: postgresql://postgres:postgres@postgres/postgres
depends_on:
- postgres
postgres:
Expand All @@ -22,6 +22,7 @@ services:
- postgres:/var/lib/postgresql-9/data
environment:
LC_ALL: C.UTF-8
POSTGRES_HOST_AUTH_METHOD: trust # Only allow in development

volumes:
postgres: