You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by jo...@apache.org on 2019/11/27 01:42:43 UTC

[incubator-heron] branch joshfischer/asf-site updated: correcting user gropus

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 50f11ee  correcting user gropus
50f11ee is described below

commit 50f11ee2dd93ec6492815702a99f7fc0c8a71b23
Author: Josh Fischer <jo...@joshfischer.io>
AuthorDate: Wed Nov 27 01:26:49 2019 +0000

    correcting user gropus
---
 website2/website/scripts/Dockerfile.ubuntu18.04 | 6 +++---
 website2/website/scripts/compile-docker.sh      | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/website2/website/scripts/Dockerfile.ubuntu18.04 b/website2/website/scripts/Dockerfile.ubuntu18.04
index a7587fb..0f8d2c1 100644
--- a/website2/website/scripts/Dockerfile.ubuntu18.04
+++ b/website2/website/scripts/Dockerfile.ubuntu18.04
@@ -52,9 +52,9 @@ RUN apt-get update && apt-get install -y nodejs
 
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 
-ARG UNAME=siteuser
-ARG UID=1000
-ARG GID=1000
+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
diff --git a/website2/website/scripts/compile-docker.sh b/website2/website/scripts/compile-docker.sh
index d30403d..b93d016 100755
--- a/website2/website/scripts/compile-docker.sh
+++ b/website2/website/scripts/compile-docker.sh
@@ -55,6 +55,8 @@ 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 .