tools: try to be better caching container layers

Signed-off-by: Ramon Roche <[email protected]>

Author: mrpollo

Tools/setup/Dockerfile

@@ -9,30 +9,25 @@ ENV DISPLAY=:99
 ENV TERM=xterm
 ENV TZ=UTC
 ENV QEMU_CPU=max,pauth-impdef=on
+ENV RUNS_IN_DOCKER=true
 
 # SITL UDP PORTS
 EXPOSE 14556/udp
 EXPOSE 14557/udp
 
-# Set Up Caching of APT packages
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-	--mount=type=cache,target=/var/lib/apt,sharing=locked \
-	rm -f /etc/apt/apt.conf.d/docker-clean && \
-	echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache && \
-	apt-get --quiet -y update
-
 # Install Shell Script Entrypoint
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 
 # Install PX4 Requirements
 COPY requirements.txt /tmp/requirements.txt
 COPY ubuntu.sh /tmp/ubuntu.sh
-RUN touch /.dockerenv
+
 RUN bash /tmp/ubuntu.sh --no-sim-tools
 
+# Make sure git is ok with your local copy
 RUN git config --global --add safe.directory '*'
 
-# create user with id 1001 (jenkins docker workflow default)
+# Create user with id 1001 (jenkins docker workflow default)
 RUN useradd --shell /bin/bash -u 1001 -c "" -m user && usermod -a -G dialout user
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

Tools/setup/ubuntu.sh

@@ -28,10 +28,10 @@ do
 done
 
 echo "[ubuntu.sh] Starting..."
-echo "[ubuntu.sh] arch: ${GREEN}$INSTALL_ARCH${NC}"
+echo "[ubuntu.sh] arch: $INSTALL_ARCH"
 
 # detect if running in docker
-if [ -f /.dockerenv ]; then
+if [ -z "$RUNS_IN_DOCKER" ]; then
 	echo "[ubuntu.sh] Running within docker, installing initial dependencies";
 	apt-get --quiet -y update && DEBIAN_FRONTEND=noninteractive apt-get --quiet -y install \
 		ca-certificates \
@@ -58,7 +58,7 @@ fi
 # check ubuntu version
 # otherwise warn and point to docker?
 UBUNTU_RELEASE="`lsb_release -rs`"
-echo "[ubuntu.sh] Ubuntu ${GREEN}${UBUNTU_RELEASE}${NC}"
+echo "[ubuntu.sh] Ubuntu ${UBUNTU_RELEASE}"
 echo "[ubuntu.sh] Installing PX4 general dependencies"
 
 sudo apt-get update -y --quiet