Merge branch 'master' of github.com:akiko-pusu/redmine_theme_kodomo_m…

…idori
akiko-pusu · May 6, 2020 · 51c5515 · 51c5515
2 parents 339b6c8 + 15a5590
commit 51c5515
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -43,8 +43,9 @@ RUN gem update bundler
 RUN bundle config set without 'postgresql rmagick mysql'
 RUN bundle install
 RUN bundle exec rake db:migrate && bundle exec rake generate_secret_token
+RUN bundle exec rails runner public/themes/redmine_theme_kodomo_midori/miscs/sample.rb
 
 WORKDIR /app/redmine
 
 EXPOSE  3000
-CMD ["rails", "server", "-b", "0.0.0.0"]
+CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,8 +8,8 @@ services:
   web:
     build:
       context: .
-    image: redmine_sqlite3
-    container_name: redmine_sqlite3
+    image: redmine_theme_kodomo_midori
+    container_name: redmine_theme_kodomo_midori
     command: >
       bash -c "bundle &&
            bundle exec rake db:migrate &&