docker: Build and run as a non-privileged user

docker/00-add_local_path.sh → docker/set_apt_proxy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-
-# Copyright (C) 2021 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
+#
+# Copyright (C) 2020 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,13 +17,11 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-# Global functions
-add_local_path () {
-    case ":${PATH:=$1}:" in
-        *:"$1":*) ;;
-        *) PATH="$1:$PATH" ;;
-    esac;
+if [ -n "$http_proxy" ]; then
+    cat << EOF > /etc/apt/apt.conf.d/proxy.conf
+Acquire {
+    HTTP::proxy "$http_proxy";
+    HTTPS::proxy "$http_proxy";
 }
-
-export -f add_local_path
-
+EOF
+fi

scripts/docker_build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Copyright (C) 2020 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
 #
@@ -21,12 +21,13 @@ DOCKER_ARGS=$@
 
 GIT_ROOT=$(git rev-parse --show-toplevel)
 GIT_REVISION=$(git describe --abbrev=10 --always --tags --dirty --match=[0-9]*)
+PLATFORM="${PLATFORM:-linux/$(arch)}"
 
 echo "Setting ORT_VERSION to $GIT_REVISION."
 docker buildx build \
     -f "$GIT_ROOT/Dockerfile" \
     -t "${ORT_DOCKER_TAG:-ort}" \
     --build-arg ORT_VERSION="$GIT_REVISION" \
-    --platform linux/amd64 \
+    --platform "$PLATFORM" \
     $DOCKER_ARGS \
     "$GIT_ROOT"