From 78fe38414d7374c77c2f4df7275d70359ecb0533 Mon Sep 17 00:00:00 2001
From: Nguyen Thai <tknguyen@linagora.com>
Date: Wed, 15 Feb 2023 18:05:08 +0700
Subject: [PATCH] Switched to a dedicated flutter base image

---
 Dockerfile | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 581888d75..a79459f6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,6 @@
-#Stage 1 - Install dependencies and build the app
-FROM debian:latest AS build-env
-
-ENV FLUTTER_CHANNEL="stable"
-ENV FLUTTER_VERSION="3.7.5"
-ENV FLUTTER_URL="https://storage.googleapis.com/flutter_infra_release/releases/$FLUTTER_CHANNEL/linux/flutter_linux_$FLUTTER_VERSION-$FLUTTER_CHANNEL.tar.xz"
-ENV FLUTTER_HOME="/opt/flutter"
-
-ENV PATH "$PATH:$FLUTTER_HOME/bin"
-
-# Prerequisites
-RUN apt update && apt install -y curl git unzip xz-utils zip gzip libglu1-mesa \
- && mkdir -p $FLUTTER_HOME \
- && git config --global --add safe.directory /opt/flutter \
- && curl -o flutter.tar.xz $FLUTTER_URL \
- && tar xf flutter.tar.xz -C /opt \
- && rm flutter.tar.xz \
- && flutter doctor \
- && rm -rf /var/lib/{apt,dpkg,cache,log}
+# Stage 1 - Install dependencies and build the app
+# This matches the flutter version on our CI/CD pipeline on Github
+FROM cirrusci/flutter:3.7.5 AS build-env
 
 # Set directory to Copy App
 WORKDIR /app
@@ -36,4 +20,4 @@ COPY --from=build-env /app/build/web /usr/share/nginx/html
 EXPOSE 80
 
 # Before stating NGinx, re-zip all the content to ensure customizations are propagated
-CMD gzip -k -r /usr/share/nginx/html/ && nginx -g 'daemon off;'
+CMD gzip -k -r -f /usr/share/nginx/html/ && nginx -g 'daemon off;'