This is an automated email from the ASF dual-hosted git repository. joshfischer pushed a commit to branch joshfischer/update-site-build in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 7c292bd77fadabd77fcf04090510239c5a471f10 Author: Josh Fischer <[email protected]> AuthorDate: Sat Apr 11 20:01:24 2020 -0500 remove user params --- website2/website/scripts/Dockerfile.ubuntu18.04 | 10 ++-------- website2/website/scripts/compile-docker.sh | 5 ----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/website2/website/scripts/Dockerfile.ubuntu18.04 b/website2/website/scripts/Dockerfile.ubuntu18.04 index 9d16f48..6e7f0b6 100644 --- a/website2/website/scripts/Dockerfile.ubuntu18.04 +++ b/website2/website/scripts/Dockerfile.ubuntu18.04 @@ -52,17 +52,11 @@ RUN apt-get update && apt-get install -y nodejs ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -ARG UNAME -ARG UID -ARG GID -RUN groupadd -g $GID -o $UNAME -RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME -USER $UNAME RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh --user -ADD bazelrc /home/$UNAME/.bazelrc -ENV PATH="/home/$UNAME/bin:${PATH}" +ADD bazelrc /home/$USER/.bazelrc +ENV PATH="/home/$USER/bin:${PATH}" diff --git a/website2/website/scripts/compile-docker.sh b/website2/website/scripts/compile-docker.sh index 2a63e91..1e96fb3 100755 --- a/website2/website/scripts/compile-docker.sh +++ b/website2/website/scripts/compile-docker.sh @@ -54,16 +54,11 @@ echo $DOCKER_FILE echo "Building heron-compiler container" docker build \ - --build-arg UNAME=$USER \ - --build-arg UID=$(id -u ${USER}) \ - --build-arg GID=$(id -g ${USER}) \ -t heron-compiler:$TARGET_PLATFORM -f $DOCKER_FILE . docker run \ --rm \ - -u `id -u`:`id -g` \ -v $PROJECT_DIR/..:/home/$USER/heron \ - -v /etc/passwd:/etc/passwd \ -t heron-compiler:$TARGET_PLATFORM make -C /home/$USER/heron/website2/website/ buildsite
