From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 5 Jul 2020 17:04:30 +0000 (+0200)
Subject: Sort environment variables passed to docker container
X-Git-Tag: v4.0~357
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6cfc7d7302a317f6de66545a193eecb460fc635;p=thirdparty%2Fccache.git

Sort environment variables passed to docker container
---

diff --git a/misc/build-in-docker b/misc/build-in-docker
index 4a3f4a910..c0c6ba031 100755
--- a/misc/build-in-docker
+++ b/misc/build-in-docker
@@ -35,18 +35,18 @@ docker run --rm \
     --volume "$PWD/build-in-docker/docker-ccache:/ccache" \
     --tmpfs /builddir:rw,exec \
     --workdir /builddir \
+    --env ASAN_OPTIONS="${ASAN_OPTIONS:-}" \
+    --env BUILDEXTRAFLAGS="${BUILDEXTRAFLAGS:-}" \
     --env CC="${CC:-}" \
+    --env CCACHE_DIR=/ccache \
+    --env CCACHE_LOC="/source" \
     --env CFLAGS="${CFLAGS:-}" \
+    --env CMAKE_PARAMS="${CMAKE_PARAMS:-}" \
     --env CXX="${CXX:-}" \
     --env CXXFLAGS="${CXXFLAGS:-}" \
     --env LDFLAGS="${LDFLAGS:-}" \
-    --env ASAN_OPTIONS="${ASAN_OPTIONS:-}" \
-    --env CCACHE_LOC="/source" \
-    --env SPECIAL="${SPECIAL:-}" \
-    --env SCAN_BUILD="${SCAN_BUILD:-}" \
-    --env CMAKE_PARAMS="${CMAKE_PARAMS:-}" \
-    --env BUILDEXTRAFLAGS="${BUILDEXTRAFLAGS:-}" \
     --env NO_TEST="${NO_TEST:-}" \
-    --env CCACHE_DIR=/ccache \
+    --env SCAN_BUILD="${SCAN_BUILD:-}" \
+    --env SPECIAL="${SPECIAL:-}" \
     "$tag" \
     /source/ci/build "$@"