Optimize images (#74)

* Optimize linux-slim image * Fix lint * Optimize windows image --------- Co-authored-by: Fedor Batonogov <[email protected]>
batonogov · Mar 23, 2024 · 5db9b1f · 5db9b1f
1 parent f5eff36
commit 5db9b1f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/docker-image-linux-ghcr.yml b/.github/workflows/docker-image-linux-ghcr.yml
@@ -7,7 +7,7 @@ name: Docker Image CI Linux ghcr.io
 
 on:
   push:
-    tags: 
+    tags:
       - "v*.*.*"
     branches:
       - "main"

diff --git a/.github/workflows/docker-image-linux.yml b/.github/workflows/docker-image-linux.yml
@@ -2,7 +2,7 @@ name: Docker Image CI Linux docker.io
 
 on:
   push:
-    tags: 
+    tags:
       - "v*.*.*"
     branches:
       - "main"

diff --git a/.github/workflows/docker-image-osx-ghcr.yml b/.github/workflows/docker-image-osx-ghcr.yml
@@ -7,7 +7,7 @@ name: Docker Image CI OSX ghcr.io
 
 on:
   push:
-    tags: 
+    tags:
       - "v*.*.*"
     branches:
       - "main"

diff --git a/.github/workflows/docker-image-osx.yml b/.github/workflows/docker-image-osx.yml
@@ -2,7 +2,7 @@ name: Docker Image CI OSX docker.io
 
 on:
   push:
-    tags: 
+    tags:
       - "v*.*.*"
     branches:
       - "main"

diff --git a/.github/workflows/docker-image-windows-ghcr.yml b/.github/workflows/docker-image-windows-ghcr.yml
@@ -7,7 +7,7 @@ name: Docker Image CI Windows ghcr.io
 
 on:
   push:
-    tags: 
+    tags:
       - "v*.*.*"
     branches:
       - "main"

diff --git a/.github/workflows/docker-image-windows.yml b/.github/workflows/docker-image-windows.yml
@@ -2,7 +2,7 @@ name: Docker Image CI Windows docker.io
 
 on:
   push:
-    tags: 
+    tags:
       - "v*.*.*"
     branches:
       - "main"

diff --git a/Dockerfile-py3-linux-slim b/Dockerfile-py3-linux-slim
@@ -15,7 +15,10 @@ RUN apt update \
         binutils \
         gcc \
         zlib1g-dev \
-    && rm -rf /var/lib/apt/lists/* \
+    && apt clean \
+    && rm -rf \
+        /var/lib/apt/lists/* \
+        /var/cache/* \
     && pip3 install \
         pyinstaller==$PYINSTALLER_VERSION \
     && pip3 cache purge \

diff --git a/Dockerfile-py3-windows b/Dockerfile-py3-windows
@@ -12,13 +12,24 @@ ARG PYINSTALLER_VERSION=6.5.0
 RUN set -x \
     && dpkg --add-architecture i386 \
     && apt update -qy \
-    && apt install --no-install-recommends -qfy apt-transport-https software-properties-common wget gpg-agent rename \
+    && apt install --no-install-recommends -qfy \
+        apt-transport-https \
+        software-properties-common \
+        wget \
+        gpg-agent \
+        rename \
     && wget -nv https://dl.winehq.org/wine-builds/winehq.key \
     && apt-key add winehq.key \
     && add-apt-repository 'https://dl.winehq.org/wine-builds/ubuntu/' \
     && apt update -qy \
-    && apt install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \
-    && rm -rf /var/lib/apt/lists/* \
+    && apt install --no-install-recommends -qfy \
+        $WINE_VERSION \
+        winbind  \
+        cabextract \
+    && apt clean \
+    && rm -rf \
+        /var/lib/apt/lists/* \
+        /var/cache/* \
     && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
     && chmod +x winetricks \
     && mv winetricks /usr/local/bin
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ name: Docker Image CI Linux ghcr.io @@
     on:
       push:
-        tags:
+        tags:
           - "v*.*.*"
         branches:
           - "main"
@@ Expand Down @@