Fix the Docker Compose configuration and remove the database config from VCS

Fixes #2248.
This commit is contained in:
Jyri-Petteri Paloposki 2020-07-19 17:34:11 +03:00
parent 4d65a8f761
commit 2e40879123
3 changed files with 2 additions and 34 deletions

View file

@ -5,8 +5,6 @@ RUN bundle config --global frozen 1
WORKDIR /app WORKDIR /app
RUN touch /etc/app-env
COPY Gemfile* /app/ COPY Gemfile* /app/
RUN gem install bundler RUN gem install bundler
RUN bundle install --jobs 4 RUN bundle install --jobs 4

View file

@ -1,32 +0,0 @@
development:
adapter: mysql2
database: tracks
# set this if you are storing utf8 in your mysql database to handle strings
# like "Réné". Not needed for sqlite. For PostgreSQL use encoding: unicode
# encoding: utf8
host: db
username: root
password:
test:
adapter: mysql2
database: tracks_test
# set this if you are storing utf8 in your mysql database to handle strings
# like "Réné". Not needed for sqlite. For PostgreSQL use encoding: unicode
# encoding: utf8
host: db
username: root
password:
# Production config is disabled by default
#
# production:
# adapter: mysql2
# database: tracks
# # set this if you are storing utf8 in your mysql database to handle strings
# # like "Réné".Not needed for sqlite. For PostgreSQL use encoding: unicode
# # encoding: utf8
# host: localhost
# username: root
# password:

View file

@ -9,6 +9,8 @@ services:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql
web: web:
build: . build: .
environment:
DATABASE_USERNAME: root
volumes: volumes:
- ${VOLUME:-.:/app} - ${VOLUME:-.:/app}
ports: ports: