diff --git a/Dockerfile b/Dockerfile index 08e473f1..d0062ab3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,6 @@ RUN bundle config --global frozen 1 WORKDIR /app -RUN touch /etc/app-env - COPY Gemfile* /app/ RUN gem install bundler RUN bundle install --jobs 4 diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 757be5fe..00000000 --- a/config/database.yml +++ /dev/null @@ -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: - diff --git a/docker-compose.yml b/docker-compose.yml index dc2b55cf..55a832ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,8 @@ services: - db-data:/var/lib/mysql web: build: . + environment: + DATABASE_USERNAME: root volumes: - ${VOLUME:-.:/app} ports: