joshfischer/asf site

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,17 @@ RUN apt-get update && apt-get install -y nodejs
 
 ENV JAVA_HOME /usr/lib/jvm/java-8-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
+      && /tmp/bazel.sh --user
 
-ADD bazelrc /root/.bazelrc
+ADD bazelrc /home/$UNAME/.bazelrc
+ENV PATH="/home/$UNAME/bin:${PATH}"
 

website2/website/scripts/build-site.sh

@@ -23,17 +23,18 @@ VERSION=0.20
 set -x -e
 
 cd ${ROOT_DIR}/website2/website
-#npm install yarn
-npm build
+npm install yarn
+npm run-script build
 
 node ./scripts/replace.js
 
 rm -rf ${ROOT_DIR}/generated-site/content
-mkdir -p ${ROOT_DIR}/generated-site/content
+mkdir -p ${ROOT_DIR}/generated-site/content/api/java
+mkdir -p ${ROOT_DIR}/generated-site/content/api/python
 ## copy generated site
 cp -R build/incubator-heron/* ${ROOT_DIR}/generated-site/content
-## copy java docs website2/website/static/api
-cp -R ${ROOT_DIR}/website2/website/static/api/* ${ROOT_DIR}/generated-site/content/api/java/
+## copy java docs
+cp -R ${ROOT_DIR}/website2/website/public/api/java/* ${ROOT_DIR}/generated-site/content/api/java/
 ## copy pydocs
 cp -R ${ROOT_DIR}/website2/website/static/api/python/* ${ROOT_DIR}/generated-site/content/api/python/
 ## remove bazelrc for dockerfile

website2/website/scripts/compile-docker.sh

@@ -53,11 +53,17 @@ 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 \
+  --build-arg UID=$(id -u ${USER}) \
+  --build-arg GID=$(id -g ${USER}) \
+  -t heron-compiler:$TARGET_PLATFORM -f $DOCKER_FILE .
 
 
 docker run \
   --rm \
-  -v $PROJECT_DIR/..:/dist \
-  -t heron-compiler:$TARGET_PLATFORM  make -C /dist/website2/website/ buildsite
+  -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
 

website2/website/scripts/javadocs.sh

@@ -59,6 +59,7 @@ CLOSURE_CLASSES="$HERON_ROOT_DIR/bazel-bin/storm-compatibility/src/java/_javac/s
 export CLASSPATH=$BIN_JARS:$GEN_JARS:$SCRIBE_JARS:$PROTO_JARS:$CLOSURE_CLASSES
 
 $JAVADOC $FLAGS \
+  -encoding "UTF-8" \
   -windowtitle "Heron Java API" \
   -doctitle "The Heron Java API" \
   -overview $OVERVIEW_HTML_FILE \

website2/website/scripts/publish_site.sh

@@ -16,21 +16,34 @@
 # specific language governing permissions and limitations
 # under the License.
 
+set -e
+
 ROOT_DIR=$(git rev-parse --show-toplevel)
 WORK_DIR=${ROOT_DIR}/generated-site/content
 ME=`basename $0`
 
-# push all of the results to asf-site branch
-git checkout asf-site
-git clean -f -d
-git pull origin asf-site
+ORIGIN_REPO=$(git remote show origin | grep 'Push  URL' | awk -F// '{print $NF}')
+echo "ORIGIN_REPO: $ORIGIN_REPO"
+
+HERON_SITE_TMP=/tmp/heron-site
+(
+
+  cd $ROOT_DIR
+  rm -rf $HERON_SITE_TMP
+  mkdir $HERON_SITE_TMP
+  cd $HERON_SITE_TMP
 
-rm -rf ${ROOT_DIR}/content
-mkdir ${ROOT_DIR}/content
+  git clone "https://$GH_TOKEN@$ORIGIN_REPO" .
+  git config user.name "Heron Site Updater"
+  git config user.email "[email protected]"
+  git checkout asf-site
 
-cp -a $WORK_DIR/* ${ROOT_DIR}/content
-cp -a ${ROOT_DIR}/.htaccess ${ROOT_DIR}/content
+  # copy the generated dir
+  cp -r $WORK_DIR/* $HERON_SITE_TMP/content
+  cp -a ${ROOT_DIR}/.htaccess ${ROOT_DIR}/content
+  # push all of the results to asf-site branch
+  git add -A .
+  git diff-index --quiet HEAD || (git commit -m "git-site-role commit from $ME" && git push -q origin HEAD:asf-site)
+  rm -rf $HERON_SITE_TMP
 
-git add ${ROOT_DIR}/content
-git commit -m "git-site-role commit from $ME"
-git push origin asf-site
+)

website2/website/scripts/python-doc-gen.sh

@@ -18,7 +18,7 @@
 
 set -e
 
-HERONPY_VERSION=$1
+TEMP_HERONPY_VERSION=$1
 HERON_ROOT_DIR=$(git rev-parse --show-toplevel)
 cd ${HERON_ROOT_DIR}
 
@@ -41,7 +41,10 @@ source "$VENV/bin/activate"
 pip install pdoc==0.3.2
 pip install --ignore-installed six
 # Install the heronpy
-pip install $PIP_LOCATION/heronpy-${HERONPY_VERSION}-py2.py3-none-any.whl
+echo "list heronpy location"
+ls $PIP_LOCATION
+pip install $PIP_LOCATION/heronpy-*-py2.py3-none-any.whl
+
 
 mkdir -p static/api && rm -rf static/api/python
 

website2/website/scripts/replace.js

@@ -35,9 +35,9 @@ const versions = getVersions();
 const latestVersion = versions[0];
 
 const bazelVersions = {
-    '0.20.0': '0.14.1',
-    '0.20.1': '0.26',
-    'latest': '0.26',
+    '0.20.0-incubating': '0.14.1',
+    '0.20.1-incubating': '0.26.0',
+    'latest': '0.26.0',
 }
 
 function replaceBazel(version) {