update baas server: 7.5.1

nec-baas · Dec 11, 2018 · f8a3470 · f8a3470
1 parent 5ea374f
commit f8a3470
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 60 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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