daddy 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a807869b9be324429050f8632ba985428c113056433326f47bba3253ba5ba2bb
-  data.tar.gz: a68b6215e7a4b546c3b031f5cdbdbaa2777f4bc7d7c2f6845b76dc87af513ad9
+  metadata.gz: 1c4518c9655869550af7b7c665d39b171cdc4ec759bb90a2c18756f65fe67eb6
+  data.tar.gz: ff4b0b8cac701ee2e482dcf806d2eea1a99873055fc97173bb6e4ce19c21556c
 SHA512:
-  metadata.gz: 9c34d3c93042748cf5bcb1134ef72c9c7e289f6e56203d375a715d97849763909f42c57ecfd77e959fadb0c2e47c591b052b2f344c50ffb0e62895f6e37bd54d
-  data.tar.gz: 2b02f6fd41ed2ace58aa88ddcf821d5fe361163af71e4dedd956ed50caa3ecb5f7f8111ff37e2e30e4ccc3e493468c921969b2ad9be58ee6ddcde19cc9e3e03e
+  metadata.gz: 180aab04a25c7ebbc809bdd1f797a2e5503ae37d98ab5821dd21ef19b25be9b04f2a844c3ba7a3dcc7a9abf0bc23eef81b64dcda853196e7d8e52ce3dfa84eeb
+  data.tar.gz: c3e6668b7064cfd6198ad3ef82e80ac0967a42a03bf039e5fdb924f335390aeecd345e9943229f14da796832c6344ae03f88dee9f37edcb66d090124c1ca7f5b

data/itamae/cookbooks/redmine.rb

@@ -0,0 +1,6 @@
+require 'daddy/itamae'
+
+include_recipe 'daddy::nginx::stop'
+include_recipe 'daddy::nginx::install'
+include_recipe 'daddy::redmine::install'
+include_recipe 'daddy::nginx::start'

data/itamae/environments/docker/Dockerfile.base

@@ -1,20 +1,29 @@
 FROM centos:7.6.1810
 MAINTAINER ichylinux@gmail.com
 
-RUN yum install -y sudo
+RUN yum -y install sudo
 
-RUN useradd daddy && \
-    echo "daddy ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/daddy && \
+ARG user
+
+RUN useradd $user && \
+    echo "$user ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$user && \
     sudo sed -i "s/\(^Defaults    secure_path = \).*/\1\/sbin:\/bin:\/usr\/sbin:\/usr\/bin:\/usr\/local\/bin/" /etc/sudoers
 
-USER daddy
-WORKDIR /home/daddy
+USER $user
+WORKDIR /home/$user
+
+RUN sudo yum -y reinstall glibc && \
+    sudo yum -y update && \
+    sudo yum clean all
 
 RUN sudo localedef -f UTF-8 -i ja_JP ja_JP && \
     sudo sed -i "s/\(^LANG=\).*/\1ja_JP.UTF-8/" /etc/locale.conf && \
-    . /etc/locale.conf && \
     sudo rm -f /etc/localtime && \
     sudo ln -snf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
+ENV LANG="ja_JP.UTF-8" \
+    LANGUAGE="ja_JP:ja" \
+    LC_ALL="ja_JP.UTF-8"
+
 RUN sudo mkdir -p /var/daddy/tmp && \
-    sudo chown daddy:daddy /var/daddy/tmp
+    sudo chown $user:$user /var/daddy/tmp

data/itamae/environments/docker/image.rb

@@ -1,4 +1,4 @@
 dockerfile = File.join(File.dirname(__FILE__), 'Dockerfile.base')
-execute "docker build -t daddy-base:latest -f #{dockerfile} #{File.dirname(dockerfile)}/" do
+execute "docker build -t daddy-base:latest --build-arg user=#{ENV['USER']} -f #{dockerfile} #{File.dirname(dockerfile)}/" do
   not_if "docker images | grep daddy-base"
 end

data/itamae/environments/nodejs/default.rb

@@ -1,9 +1,15 @@
 template '/etc/yum.repos.d/nodesource-el7.repo' do
   user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
 end
 
 template '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL' do
   user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
 end
 
 package 'nodejs' do
@@ -12,6 +18,9 @@ end
 
 template '/etc/yum.repos.d/yarn.repo' do
   user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
 end
 
 package 'yarn' do

data/itamae/environments/ruby/default.rb

@@ -1,7 +1,7 @@
-version = ENV['RUBY_VERSION'] || '2.5.3'
+version = ENV['RUBY_VERSION'] || '2.6.3'
 short_version = version.split('.')[0..1].join('.')
 
-execute 'download ruby' do
+execute "download ruby-#{version}" do
   cwd '/var/daddy/tmp'
   command <<-EOF
     set -eu
@@ -11,7 +11,7 @@ execute 'download ruby' do
   not_if "echo #{::File.read(::File.join(::File.dirname(__FILE__), "ruby-#{version}.tar.gz_sha256sum.txt")).strip} | sha256sum -c"
 end
 
-execute 'install ruby' do
+execute "install ruby-#{version}" do
   cwd '/var/daddy/tmp'
   command <<-EOF
     set -eu
@@ -25,13 +25,14 @@ execute 'install ruby' do
   not_if "ruby -v | egrep \"ruby #{version}(p[0-9]+) \""
 end
 
-%w[
-  rubygems-update
-  bundler
-  itamae
-  daddy
-].each do |name|
+{
+  'rubygems-update' => nil,
+  'bundler' => '2.0.1',
+  'itamae' => '1.10.3',
+  'daddy' => nil
+}.each do |name, version|
   gem_package name do
     user 'root'
+    version version if version
   end
 end

data/itamae/environments/ruby/ruby-2.5.5.tar.gz_sha256sum.txt

@@ -0,0 +1 @@
+28a945fdf340e6ba04fc890b98648342e3cccfd6d223a48f3810572f11b2514c  ruby-2.5.5.tar.gz

data/itamae/environments/ruby/ruby-2.6.3.tar.gz_sha256sum.txt

@@ -0,0 +1 @@
+577fd3795f22b8d91c1d4e6733637b0394d4082db659fccf224c774a2b1c82fb  ruby-2.6.3.tar.gz

data/lib/daddy.rb

@@ -7,7 +7,6 @@ module Daddy
   def self.config
     if @_config.nil?
       daddy_yml = File.join('config', 'daddy.yml')
-      puts daddy_yml
       if File.exist?(daddy_yml)
         @_config = Daddy::Utils::Config.new(daddy_yml)
       else

data/lib/daddy/version.rb

@@ -1,7 +1,7 @@
 module Daddy
   VERSION = [
     VERSION_MAJOR = '0',
-    VERSION_MINOR = '7',
-    VERSION_REVISION = '9'
+    VERSION_MINOR = '8',
+    VERSION_REVISION = '0'
   ].join('.')
 end

data/lib/tasks/dad.rake

@@ -24,12 +24,17 @@ namespace :dad do
       task role => :environment do
         role_file = "config/itamae/roles/#{role}.rb"
         log_level = ENV['DEBUG'] ? 'debug' : 'info'
-        
-        if ENV['DOCKER']
+        env = "ROLE=#{role}"
+
+         if ENV['DOCKER']
           tag = "#{Daddy.config.application}-#{role}"
-          fail unless system("bundle exec itamae docker --ohai --image daddy-base --tag #{tag} --log-level=#{log_level} #{role_file}")
+          if system("docker images | grep #{tag}")
+            fail unless system("#{env} bundle exec itamae docker --ohai --image #{tag} --tag #{tag} --log-level=#{log_level} #{role_file}")
+          else
+            fail unless system("#{env} bundle exec itamae docker --ohai --image daddy-base --tag #{tag} --log-level=#{log_level} #{role_file}")
+          end
         else
-          fail unless system("bundle exec itamae local --ohai --log-level=#{log_level} #{role_file}")
+          fail unless system("#{env} bundle exec itamae local --ohai --log-level=#{log_level} #{role_file}")
         end
       end
     end

data/lib/tasks/locale/en.yml

@@ -14,7 +14,6 @@ en:
       gitbucket: setting GitBucket as reverse proxy
       jenkins: setting Jenkins as reverse proxy
       rails: setting Passenger for rails app
-    install: install Nginx
   obs_studio:
     install: install OBS-Studio
   sbt:

data/lib/tasks/locale/ja.yml

@@ -14,7 +14,6 @@ ja:
       gitbucket: NginxにGitBucketのリバースプロキシを設定します
       jenkins: NginxにJenkinsのリバースプロキシを設定します
       rails: NginxにRailsアプリを設定します
-    install: Nginxをインストールします
   obs_studio:
     install: OBS-Studioをインストールします
   sbt:

data/lib/tasks/nginx.rake

@@ -2,12 +2,6 @@ require_relative 'task_helper'
 
 namespace :dad do
 
-  desc I18n.t('nginx.install')
-  task :nginx do
-    ask_env('NGINX_VERSION', default: ItamaePluginRecipeDaddy::NGINX_VERSION)
-    run_itamae 'nginx'
-  end
-
   namespace :nginx do
     namespace :config do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -292,6 +292,7 @@ files:
 - itamae/cookbooks/nginx/config/templates/unicorn.conf.erb
 - itamae/cookbooks/obs_studio/install.rb
 - itamae/cookbooks/phantomjs/install.rb
+- itamae/cookbooks/redmine.rb
 - itamae/cookbooks/sbt/install.rb
 - itamae/cookbooks/tensorflow/install.rb
 - itamae/cookbooks/trac/install.rb
@@ -313,6 +314,8 @@ files:
 - itamae/environments/ruby/default.rb
 - itamae/environments/ruby/ruby-2.5.1.tar.gz_sha256sum.txt
 - itamae/environments/ruby/ruby-2.5.3.tar.gz_sha256sum.txt
+- itamae/environments/ruby/ruby-2.5.5.tar.gz_sha256sum.txt
+- itamae/environments/ruby/ruby-2.6.3.tar.gz_sha256sum.txt
 - itamae/locale/en.yml
 - itamae/locale/ja.yml
 - itamae/templates/etc/god/master.conf.erb
@@ -448,8 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: My rails dad