Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Commit 32d3051

Browse files
Joshfischer/update site build (#3509)
* remove user params * adjust user settings * adjust user settings * adjust path * clean up whitespace
1 parent c024da2 commit 32d3051

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

website2/website/scripts/Dockerfile.ubuntu18.04

+2-9
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,10 @@ RUN apt-get update && apt-get install -y nodejs
5252

5353
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
5454

55-
ARG UNAME
56-
ARG UID
57-
ARG GID
58-
RUN groupadd -g $GID -o $UNAME
59-
RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
60-
USER $UNAME
61-
6255
RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \
6356
&& chmod +x /tmp/bazel.sh \
6457
&& /tmp/bazel.sh --user
6558

66-
ADD bazelrc /home/$UNAME/.bazelrc
67-
ENV PATH="/home/$UNAME/bin:${PATH}"
59+
ADD bazelrc /root/.bazelrc
60+
ENV PATH="/root/bin:${PATH}"
6861

website2/website/scripts/compile-docker.sh

-8
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ copy_bazel_rc_to() {
4242
cp $PROJECT_DIR/../tools/docker/bazel.rc $1
4343
}
4444

45-
46-
4745
TARGET_PLATFORM="ubuntu18.04"
4846
DOCKER_FILE=$(dockerfile_path_for_platform $TARGET_PLATFORM)
4947
verify_dockerfile_exists $DOCKER_FILE
@@ -54,16 +52,10 @@ echo $DOCKER_FILE
5452

5553
echo "Building heron-compiler container"
5654
docker build \
57-
--build-arg UNAME=$USER \
58-
--build-arg UID=$(id -u ${USER}) \
59-
--build-arg GID=$(id -g ${USER}) \
6055
-t heron-compiler:$TARGET_PLATFORM -f $DOCKER_FILE .
6156

62-
6357
docker run \
6458
--rm \
65-
-u `id -u`:`id -g` \
6659
-v $PROJECT_DIR/..:/home/$USER/heron \
67-
-v /etc/passwd:/etc/passwd \
6860
-t heron-compiler:$TARGET_PLATFORM make -C /home/$USER/heron/website2/website/ buildsite
6961

0 commit comments

Comments
 (0)