diff --git a/docker/build/Dockerfile-deploy b/docker/build/Dockerfile-deploy index d01b505f41..ac1fb5b4e0 100644 --- a/docker/build/Dockerfile-deploy +++ b/docker/build/Dockerfile-deploy @@ -1,7 +1,7 @@ FROM --platform=linux/amd64 ubuntu:20.04 ARG GOLANG_VERSION -RUN apt-get update && apt-get install -y git wget autoconf jq bsdmainutils shellcheck +RUN apt-get update && apt-get install -y git wget autoconf jq bsdmainutils shellcheck make python3 libtool g++ WORKDIR /root RUN wget --quiet https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz && tar -xvf go${GOLANG_VERSION}.linux-amd64.tar.gz && mv go /usr/local ENV GOROOT=/usr/local/go \ diff --git a/scripts/upload_config.sh b/scripts/upload_config.sh index 6ada497d2b..e075cccfdc 100755 --- a/scripts/upload_config.sh +++ b/scripts/upload_config.sh @@ -34,6 +34,9 @@ SRCPATH=${SCRIPTPATH}/.. export CHANNEL=$2 export FULLVERSION=$($SRCPATH/scripts/compute_build_number.sh -f) +# prevent ._* files from being included in the tarball +export COPYFILE_DISABLE=true + TEMPDIR=$(mktemp -d -t "upload_config.tmp.XXXXXX") TARFILE=${TEMPDIR}/config_${CHANNEL}_${FULLVERSION}.tar.gz