diff --git a/Dockerfile b/Dockerfile index 4719150..2f3bbbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.0 +FROM ruby:3.0.0 RUN mkdir /app WORKDIR /app diff --git a/Gemfile.lock b/Gemfile.lock index bc03efb..0eca751 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,6 +107,8 @@ GEM nio4r (2.5.8) nokogiri (1.12.5-x86_64-darwin) racc (~> 1.4) + nokogiri (1.12.5-x86_64-linux) + racc (~> 1.4) parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) @@ -224,6 +226,7 @@ GEM PLATFORMS x86_64-darwin-19 + x86_64-linux DEPENDENCIES bootsnap (>= 1.4.2) @@ -252,4 +255,4 @@ RUBY VERSION ruby 3.0.0p0 BUNDLED WITH - 2.2.30 + 2.2.3 diff --git a/docker-compose.yml b/docker-compose.yml index 539b137..88c432b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ services: image: postgres ports: - 5434:5432 + environment: + POSTGRES_PASSWORD: password web: image: nginx volumes: @@ -21,6 +23,6 @@ services: ports: - 3000:3000 environment: - - DATABASE_URL=postgres://postgres@db + - DATABASE_URL=postgres://postgres:password@db links: - db