From f8a3470cdf3cb1c6ddb0af8dcb4348561c898ff7 Mon Sep 17 00:00:00 2001
From: Takuya Murakami <murakami@da.jp.nec.com>
Date: Tue, 11 Dec 2018 16:11:12 +0900
Subject: [PATCH] update baas server: 7.5.1

---
 ChangeLog.md       |  5 +++++
 Dockerfile.api     |  9 +++------
 Dockerfile.both    | 10 ++++------
 Dockerfile.console |  9 +++------
 Dockerfile.in      | 30 ------------------------------
 Makefile           | 11 -----------
 download.sh        |  2 +-
 7 files changed, 16 insertions(+), 60 deletions(-)
 delete mode 100644 Dockerfile.in

diff --git a/ChangeLog.md b/ChangeLog.md
index b81f040..9e6465d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,11 @@
 ChangeLog
 =========
 
+2018-12-11 : ver 7.5.1
+----------------------
+
+* Update baas server: 7.5.1
+
 2018-11-21 : ver 7.5.0
 ----------------------
 
diff --git a/Dockerfile.api b/Dockerfile.api
index df4c7c4..355fd73 100644
--- a/Dockerfile.api
+++ b/Dockerfile.api
@@ -1,12 +1,9 @@
 FROM necbaas/tomcat
 
 # Install BaaS Server
-ENV BAAS_VERSION 7.5.0
-RUN cd /opt \
-    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
-    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
-    && cp baas-server-$BAAS_VERSION/server/api.war /opt/tomcat/webapps/ \
-    && /bin/rm -rf baas-server-$BAAS_VERSION*
+ENV BAAS_VERSION 7.5.1
+RUN cd /opt/tomcat/webapps \
+    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/api.war
 
 # Add config files
 RUN mkdir /etc/baas /var/log/baas
diff --git a/Dockerfile.both b/Dockerfile.both
index ebf8f38..eef85b9 100644
--- a/Dockerfile.both
+++ b/Dockerfile.both
@@ -1,12 +1,10 @@
 FROM necbaas/tomcat
 
 # Install BaaS Server
-ENV BAAS_VERSION 7.5.0
-RUN cd /opt \
-    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
-    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
-    && cp baas-server-$BAAS_VERSION/server/*.war /opt/tomcat/webapps/ \
-    && /bin/rm -rf baas-server-$BAAS_VERSION*
+ENV BAAS_VERSION 7.5.1
+RUN cd /opt/tomcat/webapps \
+    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/api.war \
+    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/console.war
 
 # Add config files
 RUN mkdir /etc/baas /var/log/baas
diff --git a/Dockerfile.console b/Dockerfile.console
index 042b007..2d1ba19 100644
--- a/Dockerfile.console
+++ b/Dockerfile.console
@@ -1,12 +1,9 @@
 FROM necbaas/tomcat
 
 # Install BaaS Server
-ENV BAAS_VERSION 7.5.0
-RUN cd /opt \
-    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
-    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
-    && cp baas-server-$BAAS_VERSION/server/console.war /opt/tomcat/webapps/ \
-    && /bin/rm -rf baas-server-$BAAS_VERSION*
+ENV BAAS_VERSION 7.5.1
+RUN cd /opt/tomcat/webapps \
+    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/console.war
 
 # Add config files
 RUN mkdir /etc/baas /var/log/baas
diff --git a/Dockerfile.in b/Dockerfile.in
deleted file mode 100644
index 27d7fa7..0000000
--- a/Dockerfile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM necbaas/tomcat
-
-# Install BaaS Server
-ENV BAAS_VERSION 7.5.0
-RUN cd /opt \
-    && wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz \
-    && tar xzf baas-server-$BAAS_VERSION.tar.gz \
-    && cp baas-server-$BAAS_VERSION/server/%%SERVER_TYPE%%.war /opt/tomcat/webapps/ \
-    && /bin/rm -rf baas-server-$BAAS_VERSION*
-
-# Add config files
-RUN mkdir /etc/baas /var/log/baas
-ADD properties.template.xml /etc/baas/
-ADD logback.template.properties /etc/baas/
-ADD server.template.xml /
-
-# Fix permission
-RUN chmod -R ugo+rwx /etc/baas /var/log/baas
-
-# Add startup script
-ADD bootstrap.sh /
-RUN chmod +x /bootstrap.sh
-
-# Volume options
-VOLUME ["/opt/tomcat/logs","/var/log/baas"]
- 
-# Open Tomcat port
-EXPOSE 8080
-
-CMD ["/bootstrap.sh"]
diff --git a/Makefile b/Makefile
index 7ec1945..4d15115 100644
--- a/Makefile
+++ b/Makefile
@@ -13,17 +13,6 @@ all: api console both
 #download:
 #	@./download.sh
 
-update: Dockerfile.api Dockerfile.console Dockerfile.both
-
-Dockerfile.api: Dockerfile.in
-	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/api/" > $@
-
-Dockerfile.console: Dockerfile.in
-	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/console/" > $@
-
-Dockerfile.both: Dockerfile.in
-	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/*/" > $@
-
 api:
 	docker image build -t $(NAME_API) -f Dockerfile.api .
 
diff --git a/download.sh b/download.sh
index df67480..6fcb52b 100755
--- a/download.sh
+++ b/download.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-BAAS_VERSION=7.5.0
+BAAS_VERSION=7.5.1
 
 if [ ! -e files/baas-server-$BAAS_VERSION ]; then
     wget --no-check-certificate https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/baas-server-$BAAS_VERSION.tar.gz