This is an automated email from the ASF dual-hosted git repository.
joshfischer pushed a commit to branch joshfischer/asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/joshfischer/asf-site by this
push:
new 734b426 attempting to add host user
734b426 is described below
commit 734b4261b8f9467a496ae97b9570db0c74fb4551
Author: Josh Fischer <[email protected]>
AuthorDate: Tue Nov 12 22:09:16 2019 -0600
attempting to add host user
---
website2/website/scripts/Dockerfile.ubuntu18.04 | 11 +++++++++--
website2/website/scripts/compile-docker.sh | 4 +++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/website2/website/scripts/Dockerfile.ubuntu18.04
b/website2/website/scripts/Dockerfile.ubuntu18.04
index 218d4c0..0a154d7 100644
--- a/website2/website/scripts/Dockerfile.ubuntu18.04
+++ b/website2/website/scripts/Dockerfile.ubuntu18.04
@@ -21,6 +21,7 @@ FROM ubuntu:18.04
ENV TARGET_PLATFORM ubuntu
ENV bazelVersion 0.26.0
+
RUN apt-get update && apt-get -y install \
g++ \
cmake \
@@ -51,9 +52,15 @@ RUN apt-get update && apt-get install -y nodejs
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ARG UNAME=siteuser
+
+
+
+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
+ && /tmp/bazel.sh --user
-ADD bazelrc /root/.bazelrc
+ADD bazelrc /$UNAME/.bazelrc
diff --git a/website2/website/scripts/compile-docker.sh
b/website2/website/scripts/compile-docker.sh
index d70bba6..d30403d 100755
--- a/website2/website/scripts/compile-docker.sh
+++ b/website2/website/scripts/compile-docker.sh
@@ -53,7 +53,9 @@ echo "docker file"
echo $DOCKER_FILE
echo "Building heron-compiler container"
-docker build -t heron-compiler:$TARGET_PLATFORM -f $DOCKER_FILE .
+docker build \
+ --build-arg UNAME=$USER \
+ -t heron-compiler:$TARGET_PLATFORM -f $DOCKER_FILE .
docker run \
