Fix apt source download logic

Signed-off-by: Patrick Foley <psfoley@gmail.com>

Author: psfoley

openfl-docker/Dockerfile.base

@@ -9,6 +9,12 @@ FROM ubuntu:22.04 AS base
 ENV DEBIAN_FRONTEND=noninteractive
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+#Establish base packages before installing anything else
+WORKDIR /repo
+COPY . .
+RUN mkdir -p thirdparty && \
+    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > thirdparty/base_packages.txt
+
 # Install dependencies.
 RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
     apt-get update && \
@@ -43,8 +49,6 @@ RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
     rm -rf /var/lib/apt/lists/*
 
 # Install OpenFL.
-WORKDIR /repo
-COPY . .
 RUN pip install --no-cache-dir . && \
     INSTALL_SOURCES=yes /opt/venv/lib/python3.10/site-packages/openfl-docker/licenses.sh
 

openfl-docker/licenses.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 # Downloads thirdparty licenses.
-# Save the list of installed packages to base_packages.txt
-dpkg --get-selections | grep -v deinstall | awk '{print $1}' > base_packages.txt
+cd thirdparty
 
 # If INSTALL_SOURCES is set to "yes", perform additional operations
 if [ "$INSTALL_SOURCES" = "yes" ]; then
@@ -26,15 +25,12 @@ if [ "$INSTALL_SOURCES" = "yes" ]; then
     done
 
     # Clean up
-    rm -rf ./*packages.txt
     echo "Download source for $(find . | wc -l) third-party packages: $(du -sh)"
 
     # Clean up APT lists again
     rm -rf /var/lib/apt/lists/*
 fi
 
-mkdir -p thirdparty
-cd thirdparty
 
 # If INSTALL_SOURCES is set to "yes", perform additional operations
 if [ "$INSTALL_SOURCES" = "yes" ]; then