From bc81cb0988b18c72fac1a0462ebdab4f386222eb Mon Sep 17 00:00:00 2001
From: Sambo Chea <sombochea@cubetiqs.com>
Date: Mon, 11 Apr 2022 10:29:25 +0700
Subject: [PATCH] Updated build scripts

---
 .drone.yml                                  | 4 ++--
 api/src/main/resources/application-demo.yml | 2 ++
 api/src/main/resources/application-dev.yml  | 2 --
 apps/demo/build.sh                          | 2 +-
 build-demo.sh                               | 3 +++
 5 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 api/src/main/resources/application-demo.yml
 delete mode 100644 api/src/main/resources/application-dev.yml
 create mode 100755 build-demo.sh

diff --git a/.drone.yml b/.drone.yml
index b6f8a17..26ba048 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,11 +4,11 @@ name: ci
 
 steps:
   - name: submodules
-    image: d.ctdn.net/alpine/git
+    image: alpine/git
     commands:
         - git submodule update --init --recursive
   - name: test
-    image: d.ctdn.net/cubetiq/openjdk:11u-ubuntu
+    image: cubetiq/openjdk:11u-ubuntu
     commands:
       - apt-get update && apt-get install git -y
       - sh gradlew bootJar
\ No newline at end of file
diff --git a/api/src/main/resources/application-demo.yml b/api/src/main/resources/application-demo.yml
new file mode 100644
index 0000000..d814c5a
--- /dev/null
+++ b/api/src/main/resources/application-demo.yml
@@ -0,0 +1,2 @@
+server:
+  port: ${APP_PORT:8080}
\ No newline at end of file
diff --git a/api/src/main/resources/application-dev.yml b/api/src/main/resources/application-dev.yml
deleted file mode 100644
index 47fbb02..0000000
--- a/api/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-server:
-  port: 8080
\ No newline at end of file
diff --git a/apps/demo/build.sh b/apps/demo/build.sh
index 158c6e3..7367aa5 100644
--- a/apps/demo/build.sh
+++ b/apps/demo/build.sh
@@ -13,7 +13,7 @@ echo "===> Moving App File <==="
 bash "$SCRIPT_DIR"/move-file.sh
 
 echo "===> Gradle Building Application <==="
-bash gradlew build -x test
+bash gradlew bootJar
 
 echo "===> Docker Building Image <==="
 docker build . -t "$ROOT_HUB"
diff --git a/build-demo.sh b/build-demo.sh
new file mode 100755
index 0000000..6d00264
--- /dev/null
+++ b/build-demo.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+bash apps/demo/build.sh
\ No newline at end of file