[incubator-heron] branch master updated: Joshfischer/update site build (#3509)

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joshfischer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new 32d3051  Joshfischer/update site build (#3509)
32d3051 is described below

commit 32d3051ae9fff10a5ed0838b57b13f3f23c29e34
Author: Josh Fischer <jo...@joshfischer.io>
AuthorDate: Mon Apr 13 16:35:47 2020 -0500

    Joshfischer/update site build (#3509)
    
    * remove user params
    
    * adjust user settings
    
    * adjust user settings
    
    * adjust path
    
    * clean up whitespace
---
 website2/website/scripts/Dockerfile.ubuntu18.04 | 11 ++---------
 website2/website/scripts/compile-docker.sh      |  8 --------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/website2/website/scripts/Dockerfile.ubuntu18.04 b/website2/website/scripts/Dockerfile.ubuntu18.04
index 9d16f48..11aab58 100644
--- a/website2/website/scripts/Dockerfile.ubuntu18.04
+++ b/website2/website/scripts/Dockerfile.ubuntu18.04
@@ -52,17 +52,10 @@ 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 /root/.bazelrc
+ENV PATH="/root/bin:${PATH}"
 
diff --git a/website2/website/scripts/compile-docker.sh b/website2/website/scripts/compile-docker.sh
index 2a63e91..b4ba2e3 100755
--- a/website2/website/scripts/compile-docker.sh
+++ b/website2/website/scripts/compile-docker.sh
@@ -42,8 +42,6 @@ copy_bazel_rc_to() {
   cp $PROJECT_DIR/../tools/docker/bazel.rc $1
 }
 
-
-
 TARGET_PLATFORM="ubuntu18.04"
 DOCKER_FILE=$(dockerfile_path_for_platform $TARGET_PLATFORM)
 verify_dockerfile_exists $DOCKER_FILE
@@ -54,16 +52,10 @@ 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