From f26d96d1b635dc81e80f5f41284763069306134b Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Sun, 2 Jan 2022 19:30:01 +0800
Subject: [PATCH] updated Dockerfiles

---
 .gitignore                     | 23 +++++++++++++++++++++++
 admin/Dockerfile               |  2 +-
 myems-aggregation/Dockerfile   |  2 +-
 myems-api/Dockerfile           |  2 +-
 myems-cleaning/Dockerfile      |  2 +-
 myems-modbus-tcp/Dockerfile    |  2 +-
 myems-normalization/Dockerfile |  2 +-
 web/Dockerfile                 |  2 +-
 8 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31b9053f..23755ad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,26 @@ Thumbs.db
 
 # Folder config file
 Desktop.ini
+
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
diff --git a/admin/Dockerfile b/admin/Dockerfile
index 171f5b7f..a9301477 100644
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.21.4
+FROM nginx:latest
 
 # remove the default config
 RUN rm /etc/nginx/conf.d/default.conf && \
diff --git a/myems-aggregation/Dockerfile b/myems-aggregation/Dockerfile
index da6c1c9a..69944ef2 100644
--- a/myems-aggregation/Dockerfile
+++ b/myems-aggregation/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.6
+FROM python:slim
 WORKDIR /code
 
 COPY . /code
diff --git a/myems-api/Dockerfile b/myems-api/Dockerfile
index a9098c12..599fa8a9 100644
--- a/myems-api/Dockerfile
+++ b/myems-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.6
+FROM python:slim
 WORKDIR /code
 
 # todo: share upload folder with admin container on Docker
diff --git a/myems-cleaning/Dockerfile b/myems-cleaning/Dockerfile
index da6c1c9a..69944ef2 100644
--- a/myems-cleaning/Dockerfile
+++ b/myems-cleaning/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.6
+FROM python:slim
 WORKDIR /code
 
 COPY . /code
diff --git a/myems-modbus-tcp/Dockerfile b/myems-modbus-tcp/Dockerfile
index da6c1c9a..69944ef2 100644
--- a/myems-modbus-tcp/Dockerfile
+++ b/myems-modbus-tcp/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.6
+FROM python:slim
 WORKDIR /code
 
 COPY . /code
diff --git a/myems-normalization/Dockerfile b/myems-normalization/Dockerfile
index da6c1c9a..69944ef2 100644
--- a/myems-normalization/Dockerfile
+++ b/myems-normalization/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.6
+FROM python:slim
 WORKDIR /code
 
 COPY . /code
diff --git a/web/Dockerfile b/web/Dockerfile
index f1d31812..a0641776 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.21.4
+FROM nginx:latest
 
 # remove the default config
 RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf