Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/Dockerfile b/Dockerfile
- index c8a0500..d6c7835 100644
- --- a/Dockerfile
- +++ b/Dockerfile
- @@ -16,11 +16,8 @@ WORKDIR $APP_HOME
- ADD Gemfile* $APP_HOME/
- RUN bundle install
- -ADD . $APP_HOME
- -RUN chmod +x $APP_HOME/docker-entrypoint.sh
- -RUN chmod +x $APP_HOME/docker-entrypoint-test.sh
- -RUN chmod +x $APP_HOME/wait-for-it.sh
- -
- EXPOSE 3000
- -ENTRYPOINT ./wait-for-it.sh db:5432 -- ./docker-entrypoint.sh
- +ENTRYPOINT ./wait-for-it.sh db:5432 mysql:3306 -- ./docker-entrypoint.sh
- +
- +ADD . $APP_HOME
- diff --git a/config/database_vilnius.yml b/config/database_vilnius.yml
- index ab8ff04..5926e88 100644
- --- a/config/database_vilnius.yml
- +++ b/config/database_vilnius.yml
- @@ -2,10 +2,10 @@ default: &default
- adapter: mysql2
- encoding: utf8
- pool: 5
- - host: <%= ENV['TVARKAU_VILNIU_DB_HOST'] || localhost %>
- + host: <%= ENV['TVARKAU_VILNIU_DB_HOST'] || 'localhost' %>
- port: <%= ENV['TVARKAU_VILNIU_DB_PORT'] || 3306 %>
- - username: <%= ENV['TVARKAU_VILNIU_DB_USER'] || vilnius %>
- - password: <%= ENV['TVARKAU_VILNIU_DB_PASSWORD'] || vilnius %>
- + username: <%= ENV['TVARKAU_VILNIU_DB_USER'] || 'root' %>
- + password: <%= ENV['TVARKAU_VILNIU_DB_PASSWORD'] || 'a' %>
- development:
- <<: *default
- diff --git a/db/seeds.rb b/db/seeds.rb
- index 1be9385..a839b73 100644
- --- a/db/seeds.rb
- +++ b/db/seeds.rb
- @@ -23,5 +23,5 @@
- 'Želdynų priežiūra (medžių ir krūmų genėjimas bei kirtimas' => false
- }
- .each do |key, value|
- - ReportType.create!(title: key, validate_plate: value)
- -end
- \ No newline at end of file
- + # ReportType.create!(title: key, validate_plate: value)
- +end
- diff --git a/docker-compose.yml b/docker-compose.yml
- index ce46d7e..9139dfa 100644
- --- a/docker-compose.yml
- +++ b/docker-compose.yml
- @@ -8,6 +8,8 @@ version: '2'
- services:
- app:
- build: .
- + volumes:
- + - .:/opt/tvarkau-vilniu
- ports:
- - "3000:3000"
- links:
- @@ -37,6 +39,8 @@ services:
- environment:
- MYSQL_DATABASE: tvarkau_miesta_development
- MYSQL_ROOT_PASSWORD: a
- + volumes:
- + - ./db_vilnius:/docker-entrypoint-initdb.d
- volumes:
- postgresql-data:
- driver: local
- diff --git a/docker-entrypoint-test.sh b/docker-entrypoint-test.sh
- old mode 100644
- new mode 100755
- diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
- old mode 100644
- new mode 100755
- diff --git a/wait-for-it.sh b/wait-for-it.sh
- old mode 100644
- new mode 100755
Add Comment
Please, Sign In to add comment