Merge pull request #6 from 6mb/dev

Dev

Dockerfile

@@ -1,12 +1,20 @@
-FROM logr/oracle-jre8
-
+FROM maven:3.5-jdk-8-alpine AS build
 MAINTAINER mjj
 
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:UTF-8
 ENV LC_ALL en_US.UTF-8
 
-# 下载license
-RUN wget -P . "https://github.com/6mb/Microsoft-365-Admin/releases/download/v1.3/microsoft-0.0.1-SNAPSHOT.jar"
+WORKDIR /src
+RUN apk add --no-cache git \
+    && git clone https://github.com/6mb/Microsoft-365-Admin.git \
+    && cd Microsoft-365-Admin \
+    && mvn package -Dmaven.test.skip=true
+
+# microsoft
+FROM logr/8-jre-alpine
+COPY --from=build /src/Microsoft-365-Admin/target/microsoft-0.0.1-SNAPSHOT.jar .
 RUN mv microsoft-0.0.1-SNAPSHOT.jar microsoft.jar
-CMD java -jar microsoft.jar
+
+#执行
+CMD java -jar microsoft.jar --spring.profile.active=dev

src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: Microsoft 365 Admin
   profiles: # 默认的profile为dev
-    active: cit
+    active: dev
 
 logging:
   level: