20240324 update1

neko0xff · Mar 23, 2024 · 267b740 · 267b740
1 parent 3b9acb5
commit 267b740
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/demo/viewapp_master/.Dockerfile.env.kate-swp b/src/demo/viewapp_master/.Dockerfile.env.kate-swp
diff --git a/src/demo/viewapp_master/Dockerfile.env b/src/demo/viewapp_master/Dockerfile.env
@@ -1,5 +1,5 @@
 # 第一階段-建置編譯環境
-FROM ubuntu:latest AS build-env
+FROM debian:latest AS build-env
 
 # 時區
 ENV TZ=Asia/Taipei
@@ -27,9 +27,9 @@ RUN flutter doctor -v
 RUN mkdir /app
 COPY . /app
 WORKDIR /app
-RUN flutter clean \
-    flutter pub get \
-    flutter build web
+RUN flutter clean && \
+    flutter pub get
+RUN flutter build web
 
 # 第二階段-建立提供實時運作的服務
 FROM nginx:alpine
@@ -44,3 +44,4 @@ RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
 
 # 連結埠
 EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/src/demo/viewapp_user/Dockerfile.env b/src/demo/viewapp_user/Dockerfile.env
@@ -1,14 +1,14 @@
 # 第一階段-建置編譯環境
-FROM ubuntu:latest AS build-env
+FROM debian:latest AS build-env
 
 # 時區
 ENV TZ=Asia/Taipei
 RUN echo "${TZ}" > /etc/timezone
 RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
 
 # 安裝 Flutter 相依套件
-RUN apt-get update
-RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback lib32stdc++6 python3 sed \
+RUN apt-get update && \
+    apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback lib32stdc++6 python3 sed \
     clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev && \
     apt-get clean
 
@@ -27,8 +27,8 @@ RUN flutter doctor -v
 RUN mkdir /app
 COPY . /app
 WORKDIR /app
-RUN flutter clean
-RUN flutter pub get
+RUN flutter clean && \
+    flutter pub get
 RUN flutter build web
 
 # 第二階段-建立提供實時運作的服務
@@ -44,3 +44,4 @@ RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
 
 # 連結埠
 EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]