Sutou Kouhei 2019-06-05 18:54:14 +0900 (Wed, 05 Jun 2019) Revision: 27e7902387de47bedd5b6a01f4378057c7fd0f86 https://github.com/ranguba/chupa-text-docker/commit/27e7902387de47bedd5b6a01f4378057c7fd0f86 Message: Use image in docker-compose.yml Modified files: Rakefile docker-compose.yml Modified: Rakefile (+17 -0) =================================================================== --- Rakefile 2019-06-02 17:12:54 +0900 (bc130c9) +++ Rakefile 2019-06-05 18:54:14 +0900 (ee481d5) @@ -6,6 +6,23 @@ dockerfile_content = File.read(dockerfile_path) /#{version_key}=(.+?)$/ =~ dockerfile_content version = $1 +task :default => :run + +desc "Build images" +task :build do + cd("proxy") do + sh("docker", "build", "-t", "ranguba/chupa-text:proxy", ".") + end + cd("chupa-text") do + sh("docker", "build", "-t", "ranguba/chupa-text:latest", ".") + end +end + +desc "Run" +task :run => :build do + sh("docker-compose", "up") +end + namespace :version do desc "Bump version" task :bump do Modified: docker-compose.yml (+2 -6) =================================================================== --- docker-compose.yml 2019-06-02 17:12:54 +0900 (313151b) +++ docker-compose.yml 2019-06-05 18:54:14 +0900 (96cc0b4) @@ -18,8 +18,7 @@ version: "3.3" services: proxy: - build: - context: proxy + image: ranguba/chupa-text:proxy command: - ./start.sh expose: @@ -27,10 +26,7 @@ services: volumes: - /var/log/chupa-text/proxy:/var/log/squid:z chupa-text: - build: - context: chupa-text - # cache_from: - # - groonga/chupa-text:latest + image: ranguba/chupa-text:latest command: - ./start.sh ports: -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190605/72ff790d/attachment-0001.html>
