Sutou Kouhei 2019-06-12 11:45:20 +0900 (Wed, 12 Jun 2019) Revision: fce7b0481883b347ddcb78c519244422de34f791 https://github.com/ranguba/chupa-text-docker/commit/fce7b0481883b347ddcb78c519244422de34f791 Message: Add an image based on Debian stretch It works on CentOS 6. Copied files: chupa-text/debian/Dockerfile (from chupa-text/Dockerfile) chupa-text/debian/etc/sudoers.d/no-password (from chupa-text/etc/sudoers.d/no-password) chupa-text/debian/home/chupa-text/chupa-text-http-server/Gemfile.local (from chupa-text/home/chupa-text/chupa-text-http-server/Gemfile.local) chupa-text/debian/home/chupa-text/chupa-text-http-server/start.sh (from chupa-text/home/chupa-text/chupa-text-http-server/start.sh) Modified files: Rakefile Renamed files: chupa-text/ubuntu/Dockerfile (from chupa-text/Dockerfile) chupa-text/ubuntu/etc/sudoers.d/no-password (from chupa-text/etc/sudoers.d/no-password) chupa-text/ubuntu/home/chupa-text/chupa-text-http-server/Gemfile.local (from chupa-text/home/chupa-text/chupa-text-http-server/Gemfile.local) chupa-text/ubuntu/home/chupa-text/chupa-text-http-server/start.sh (from chupa-text/home/chupa-text/chupa-text-http-server/start.sh) Modified: Rakefile (+14 -8) =================================================================== --- Rakefile 2019-06-10 14:48:13 +0900 (ee481d5) +++ Rakefile 2019-06-12 11:45:20 +0900 (dcfb095) @@ -1,8 +1,11 @@ # -*- ruby -*- version_key = "CHUPA_TEXT_DOCKER_VERSION" -dockerfile_path = "chupa-text/Dockerfile" -dockerfile_content = File.read(dockerfile_path) +dockerfile_paths = [ + "chupa-text/ubuntu/Dockerfile", + "chupa-text/debian/Dockerfile", +] +dockerfile_content = File.read(dockerfile_paths[0]) /#{version_key}=(.+?)$/ =~ dockerfile_content version = $1 @@ -28,12 +31,15 @@ namespace :version do task :bump do new_version = ENV["VERSION"] raise "No ENV['VERSION']" if new_version.nil? - new_dockerfile_content = - dockerfile_content - .gsub(/#{version_key}=.+?$/, - "#{version_key}=#{new_version}") - File.open(dockerfile_path, "w") do |dockerfile| - dockerfile.print(new_dockerfile_content) + dockerfile_paths.each do |dockerfile_path| + dockerfile_content = File.read(dockerfile_path) + new_dockerfile_content = + dockerfile_content + .gsub(/#{version_key}=.+?$/, + "#{version_key}=#{new_version}") + File.open(dockerfile_path, "w") do |dockerfile| + dockerfile.print(new_dockerfile_content) + end end end end Copied: chupa-text/debian/Dockerfile (+9 -4) 90% =================================================================== --- chupa-text/Dockerfile 2019-06-10 14:48:13 +0900 (abad8a0) +++ chupa-text/debian/Dockerfile 2019-06-12 11:45:20 +0900 (a5e6db7) @@ -14,7 +14,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -FROM ubuntu:19.04 +FROM debian:stretch MAINTAINER groonga RUN \ @@ -22,6 +22,10 @@ RUN \ debconf-set-selections RUN \ + echo "deb http://deb.debian.org/debian stretch-backports main" > \ + /etc/apt/sources.list.d/backports.list + +RUN \ apt update && \ apt install -y -V \ apache2 \ @@ -34,14 +38,15 @@ RUN \ libaprutil1-dev \ libreoffice \ make \ - nodejs \ - npm \ ruby \ ruby-dev \ sudo \ tzdata \ xvfb \ zlib1g-dev && \ + apt install -y -V -t stretch-backports \ + nodejs \ + npm && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/archives/* @@ -66,7 +71,7 @@ WORKDIR /home/chupa-text ENV \ RAILS_ENV=production \ - PATH=/var/lib/gems/2.5.0/bin:$PATH + PATH=/var/lib/gems/2.3.0/bin:$PATH ENV CHUPA_TEXT_DOCKER_VERSION=2019.06.10.1 RUN git clone --depth 1 https://github.com/ranguba/chupa-text-http-server.git Copied: chupa-text/debian/etc/sudoers.d/no-password (+0 -0) 100% =================================================================== Copied: chupa-text/debian/home/chupa-text/chupa-text-http-server/Gemfile.local (+0 -0) 100% =================================================================== Copied: chupa-text/debian/home/chupa-text/chupa-text-http-server/start.sh (+0 -0) 100% =================================================================== Renamed: chupa-text/ubuntu/Dockerfile (+0 -0) 100% =================================================================== Renamed: chupa-text/ubuntu/etc/sudoers.d/no-password (+0 -0) 100% =================================================================== Renamed: chupa-text/ubuntu/home/chupa-text/chupa-text-http-server/Gemfile.local (+0 -0) 100% =================================================================== Renamed: chupa-text/ubuntu/home/chupa-text/chupa-text-http-server/start.sh (+0 -0) 100% =================================================================== -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190612/d65a82a0/attachment-0001.html>
