From 474000503c45da3a0c0f5610c1846741248606d7 Mon Sep 17 00:00:00 2001 From: Daniel Llewellyn Date: Thu, 5 Nov 2020 21:22:08 +0000 Subject: [PATCH] Fix PYTHONPATH environment var in Dockerfiles My previous evolution of the Dockerfiles grouped the `ENV` entries into a single definition to reduce the number of intermediate Docker image layers. Unfortunately I didn't account for the duplicate `PYTHONPATH` definition so only the second was being applied correctly. This commit fixes that. * Combine multiple `ENV PYTHONPATH=` to a single definition. Signed-off-by: Daniel Llewellyn --- Dockerfile | 6 ++---- portable.Dockerfile | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index f5320ae0..36fb33b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,7 @@ FROM ubuntu:18.04 AS builder # Env variables ENV DEBIAN_FRONTEND=noninteractive \ - PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages" \ - PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm" \ + PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages:/code/SuperBuild/src/opensfm" \ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" # Prepare directories @@ -44,8 +43,7 @@ FROM ubuntu:18.04 # Env variables ENV DEBIAN_FRONTEND=noninteractive \ - PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages" \ - PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm" \ + PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages:/code/SuperBuild/src/opensfm" \ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" WORKDIR /code diff --git a/portable.Dockerfile b/portable.Dockerfile index ae6530f0..fa036840 100644 --- a/portable.Dockerfile +++ b/portable.Dockerfile @@ -2,8 +2,7 @@ FROM ubuntu:18.04 AS builder # Env variables ENV DEBIAN_FRONTEND=noninteractive \ - PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages" \ - PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm" \ + PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages:/code/SuperBuild/src/opensfm" \ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" # Prepare directories @@ -44,8 +43,7 @@ FROM ubuntu:18.04 # Env variables ENV DEBIAN_FRONTEND=noninteractive \ - PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages" \ - PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm" \ + PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.6/dist-packages:/code/SuperBuild/src/opensfm" \ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" WORKDIR /code