From b8bbbf3cbcb9b8795a1a5c951c170069d45ee224 Mon Sep 17 00:00:00 2001
From: Cal Heldenbrand <cal@fbsdata.com>
Date: Wed, 22 Feb 2023 12:13:49 -0600
Subject: [PATCH] Remove comments, alpha-sort package names for easier
 maintenance

---
 Dockerfile | 65 ++++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4969b3ded..7864390f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,3 @@
-# Build Bambu Slicer in a container
-#
-# Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md):
-# rm -rf build; podman build . -t bambu-studio-builder && podman run --rm localhost/bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
-#
-# Troubleshooting the build container:
-# podman run -it --name bambu-studio-builder localhost/bambu-studio-builder /bin/bash
-#
-# Debugging the resulting AppImage:
-#   1) Install `gdb`
-#   2) In a terminal in the same directory as the AppImage, start it with following:
-#      echo -e "run\nbt\nquit" | gdb ./BambuStudio_ubu64.AppImage
-#   3) Find related issue using backtrace output for clues and add backtrace to it on github
-#
-# Docker alternative AppImage build syntax (use this if you can't install podman):
-# rm -rf build; docker build . --file Containerfile -t bambu-studio-builder; docker run --rm bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
-#
-#
-# TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work.
-
 FROM docker.io/ubuntu:20.04
 LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
 
@@ -30,27 +10,40 @@ RUN echo deb-src http://archive.ubuntu.com/ubuntu \
     $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list 
 
 RUN apt-get update && apt-get install  -y \
-    git \
+    autoconf \
     build-essential \
-    autoconf pkgconf m4 \
-    cmake extra-cmake-modules \
-    libglu1-mesa-dev libglu1-mesa-dev \
-    libwayland-dev libxkbcommon-dev wayland-protocols \
-    eglexternalplatform-dev libglew-dev \
-    libgtk-3-dev \
-    libdbus-1-dev \
+    cmake \
+    curl \
+    eglexternalplatform-dev \
+    extra-cmake-modules \
+    file \
+    git \
     libcairo2-dev \
-    libgtk-3-dev libwebkit2gtk-4.0-dev \
-    libsoup2.4-dev \
-    libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev libgstreamerd-3-dev \
+    libcurl4-openssl-dev \
+    libdbus-1-dev \
+    libglew-dev \ 
+    libglu1-mesa-dev \
+    libglu1-mesa-dev \
+    libgstreamer1.0-dev \
+    libgstreamerd-3-dev \ 
+    libgstreamer-plugins-base1.0-dev \
+    libgstreamer-plugins-good1.0-dev \
+    libgtk-3-dev \
+    libgtk-3-dev \
     libmspack-dev \
     libosmesa6-dev \
-    libssl-dev libcurl4-openssl-dev libsecret-1-dev \
+    libsecret-1-dev \
+    libsoup2.4-dev \
+    libssl-dev \
     libudev-dev \
-    curl \
-    wget \
-    file \
-    sudo
+    libwayland-dev \
+    libwebkit2gtk-4.0-dev \
+    libxkbcommon-dev \
+    m4 \
+    pkgconf \
+    sudo \
+    wayland-protocols \
+    wget 
 
 COPY ./ BambuStudio