From: whitestar <whitestar@users.osdn.me>
Date: Sat, 23 Feb 2019 05:16:43 +0000 (+0900)
Subject: rename image.
X-Git-Tag: minim-server-0.3.0^0
X-Git-Url: http://git.osdn.net/view?p=metasearch%2Fgrid-chef-repo.git;a=commitdiff_plain;h=0c42954ea847282e57c00ceee175bc691ca120e1

rename image.
---

diff --git a/cookbooks/minim-server/CHANGELOG.md b/cookbooks/minim-server/CHANGELOG.md
index 29c0f4b..6a30cb8 100644
--- a/cookbooks/minim-server/CHANGELOG.md
+++ b/cookbooks/minim-server/CHANGELOG.md
@@ -1,5 +1,10 @@
 # minim-server CHANGELOG
 
+0.3.0
+-----
+- rename image.
+- separate Dockerfile.
+
 0.2.0
 -----
 - adds autopilot features.
diff --git a/cookbooks/minim-server/attributes/default.rb b/cookbooks/minim-server/attributes/default.rb
index 0ce3024..357917f 100644
--- a/cookbooks/minim-server/attributes/default.rb
+++ b/cookbooks/minim-server/attributes/default.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: minim-server
 # Attributes:: default
 #
-# Copyright 2018, whitestar
+# Copyright 2018-2019, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,11 +24,11 @@ download_url = nil
 
 case node['kernel']['machine']
 when 'x86_64'
-  image_name = 'docker-minimserver'
+  image_name = 'minimserver'
   base_image = 'java:8-jre'
   download_url = "http://jminim.com/cada/MinimServer-#{minim_ver}-linux-intel.tar.gz"
 when 'armv7l'
-  image_name = 'docker-minimserver-armhf'
+  image_name = 'minimserver-armhf'
   base_image = 'arm32v7/openjdk:8-jre'
   download_url = "http://jminim.com/cada/MinimServer-#{minim_ver}-linux-armhf.tar.gz"
 end
diff --git a/cookbooks/minim-server/recipes/docker-compose.rb b/cookbooks/minim-server/recipes/docker-compose.rb
index 7008cbe..7cfe01f 100644
--- a/cookbooks/minim-server/recipes/docker-compose.rb
+++ b/cookbooks/minim-server/recipes/docker-compose.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: minim-server
 # Recipe:: docker-compose
 #
-# Copyright 2018, whitestar
+# Copyright 2018-2019, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,7 +51,6 @@ force_override_config_srvs['minim-server']['environment'] = envs unless envs.emp
 override_config_srvs['minim-server']['volumes'] = vols unless vols.empty?
 
 [
-  'Dockerfile',
   '.env',
   'docker-compose.yml',
   'minimserver.config',
@@ -64,6 +63,15 @@ override_config_srvs['minim-server']['volumes'] = vols unless vols.empty?
   end
 }
 
+dockerfile_tpl = 'Dockerfile'
+dockerfile_tpl = 'Dockerfile.armhf' if node['kernel']['machine'] == 'armv7l'
+template "#{app_dir}/Dockerfile" do
+  source "opt/docker-compose/app/minim-server/#{dockerfile_tpl}"
+  owner 'root'
+  group 'root'
+  mode '0644'
+end
+
 # autopilot
 srv = 'minim-server'
 template "/etc/cron.d/#{srv}-local" do
diff --git a/cookbooks/minim-server/templates/default/opt/docker-compose/app/minim-server/Dockerfile.armhf b/cookbooks/minim-server/templates/default/opt/docker-compose/app/minim-server/Dockerfile.armhf
new file mode 100644
index 0000000..eb6384c
--- /dev/null
+++ b/cookbooks/minim-server/templates/default/opt/docker-compose/app/minim-server/Dockerfile.armhf
@@ -0,0 +1,19 @@
+FROM <%= node['minim-server']['Dockerfile']['FROM'] %>
+
+ARG url=http://jminim.com/cada/MinimServer-0.8.5.2-linux-armhf.tar.gz
+
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends wget && \
+    wget -O /opt/MinimServer.tar.gz ${url} && \
+    cd /opt && \
+    tar xf MinimServer.tar.gz && \
+    rm MinimServer.tar.gz && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY ./minimserver.config /opt/minimserver/data/minimserver.config
+
+EXPOSE 9790 9791
+
+ENTRYPOINT [ "/opt/minimserver/bin/startc" ]
diff --git a/cookbooks/minim-server/version b/cookbooks/minim-server/version
index 0ea3a94..0d91a54 100644
--- a/cookbooks/minim-server/version
+++ b/cookbooks/minim-server/version
@@ -1 +1 @@
-0.2.0
+0.3.0