update: Update baas-server 7.5.4, latest tomcat/openjdk

nec-baas · Sep 5, 2021 · 1031483 · 1031483
1 parent c7c138f
commit 1031483
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,17 +1,22 @@
-ChangeLog
-=========
+# ChangeLog
 
-2020-02-28 : ver 7.5.3
-----------------------
+## 2021-09-05 : ver 7.5.4
 
-* Update baas server: 7.5.3
+- Update baas server: 7.5.4
+- Update tomcat 9.0.52
 
-2018-12-11 : ver 7.5.1
-----------------------
+## 2020-02-28 : ver 7.5.3
 
-* Update baas server: 7.5.1
+- Update baas server: 7.5.3
 
-2018-11-21 : ver 7.5.0
-----------------------
+## 2020-02-28 : ver 7.5.3
 
-* Initial release
+- Update baas server: 7.5.3
+
+## 2018-12-11 : ver 7.5.1
+
+- Update baas server: 7.5.1
+
+## 2018-11-21 : ver 7.5.0
+
+- Initial release
diff --git a/Dockerfile.api b/Dockerfile.api
@@ -1,7 +1,7 @@
-FROM necbaas/tomcat:latest
+FROM necbaas/tomcat:9.0.52
 
 # Install BaaS Server
-ENV BAAS_VERSION 7.5.3
+ENV BAAS_VERSION 7.5.4
 RUN cd /opt/tomcat/webapps \
     && aria2c -x10 --check-certificate=false https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/api.war
 

diff --git a/Dockerfile.both b/Dockerfile.both
@@ -1,7 +1,7 @@
-FROM necbaas/tomcat:latest
+FROM necbaas/tomcat:9.0.52
 
 # Install BaaS Server
-ENV BAAS_VERSION 7.5.3
+ENV BAAS_VERSION 7.5.4
 RUN cd /opt/tomcat/webapps \
     && aria2c -x10 --check-certificate=false https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/api.war \
     && aria2c -x10 --check-certificate=false https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/console.war

diff --git a/Dockerfile.console b/Dockerfile.console
@@ -1,7 +1,7 @@
-FROM necbaas/tomcat:latest
+FROM necbaas/tomcat:9.0.52
 
 # Install BaaS Server
-ENV BAAS_VERSION 7.5.3
+ENV BAAS_VERSION 7.5.4
 RUN cd /opt/tomcat/webapps \
     && aria2c -x10 --check-certificate=false https://github.com/nec-baas/baas-server/releases/download/v$BAAS_VERSION/console.war
 

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ PORT_OPTS = -p 28080:8080
 
 VOLUME_OPTS = -v $(PWD)/logs:/opt/tomcat/logs:rw
 
-VERSION = 7.5.3
+VERSION = 7.5.4
 
 NAME_API     = necbaas/api-server:$(VERSION)
 NAME_CONSOLE = necbaas/console-server:$(VERSION)

diff --git a/download.sh b/download.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-BAAS_VERSION=7.5.3
+BAAS_VERSION=7.5.4
 
 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