docker/build: Improvements (#511)

- add rebuild script
- improve user mapping
- improve dockerfile
- remove local context

Signed-off-by: Ryan Northey <[email protected]>

Author: phlax

build-website.sh

@@ -1,9 +1,15 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-set -o pipefail
+set -e -o pipefail
 
 BAZEL="${BAZEL:-bazel}"
 OUTPUT_DIR="${1:-_site}"
+
+if ! command -v "$BAZEL" &> /dev/null; then
+    echo "bazel not found, exiting" >&2
+    exit 1
+fi
+
 OUTPUT_BASE="$($BAZEL info output_base 2>/dev/null)"
 
 

docker-compose.yml

@@ -1,79 +1,106 @@
+# NOTE: you must `export UID` before building
+
 services:
-  live:
+  build:
     build:
-      context: docker
-      dockerfile: Dockerfile
-    ports:
-    - 4000:4000
-    command: bazel run //site:live
-    volumes:
+      context: &context https://github.com/envoyproxy/toolshed.git#f89fb5df8defa4b7daf9a19a899dbdfbbf3b8d62:docker/bazel
+      args:
+        USER_NAME: "${USER}"
+        USER_ID: &uid "${UID}"
+        GROUP_ID: &gid "${GID:-}"
+        APT_PKGS: &apt_pkgs >-
+          autoconf
+          automake
+          bison
+          build-essential
+          gawk
+          git
+          gnupg2
+          libffi-dev
+          libgdbm-dev
+          libgmp-dev
+          libncurses5-dev
+          libreadline-dev
+          libsqlite3-dev
+          libssl-dev
+          libtool
+          libyaml-dev
+          pkg-config
+          sqlite3
+          zlib1g-dev
+    command: ./build-website.sh
+    user: ${UID:-1000}:${GID:-}
+    volumes: &volumes
     - .:/src/workspace/envoy-website
-    - ~/.cache/bazel:/$HOME/.cache/bazel
-    - ~/.cache/bazelisk:/$HOME/.cache/bazelisk
+    - ~/.cache/bazel:$HOME/.cache/bazel
+    - ~/.cache/bazelisk:$HOME/.cache/bazelisk
     working_dir: /src/workspace/envoy-website
     environment:
-      LOCAL_UID: ${UID:?"`UID` must be set, try `export UID`"}
-      LOCAL_USER_NAME: $USERNAME
-      LOCAL_USER_HOME: $HOME
+      BAZEL_BUILD_OPTIONS: &bazel_options ${BAZEL_BUILD_OPTIONS:-}
 
-  live_docs:
+  live:
     build:
-      context: docker
-      dockerfile: Dockerfile
-    ports:
-    - 4000:4000
-    command: |
-      bash -c '\
-          bazel run --action_env=ENVOY_COMMIT="$$(bazel run //docs:latest_version)" \
-              //site:live_docs'
-    volumes:
-    - .:/src/workspace/envoy-website
-    - ~/.cache/bazel:/$HOME/.cache/bazel
-    - ~/.cache/bazelisk:/$HOME/.cache/bazelisk
+      context: *context
+      target: extra
+      args:
+        USER_NAME: ${USER}
+        USER_ID: *uid
+        GROUP_ID: *gid
+        APT_PKGS: *apt_pkgs
+        EXTRA_APT_PKGS: >-
+          inotify-tools
+    command: ./rebuild.sh
+    user: ${UID:?"`UID` must be set, try `export UID`"}:${GID:-}
+    volumes: *volumes
     working_dir: /src/workspace/envoy-website
     environment:
-      LOCAL_UID: ${UID:?"`UID` must be set, try `export UID`"}
-      LOCAL_USER_NAME: $USERNAME
-      LOCAL_USER_HOME: $HOME
+      BAZEL_BUILD_OPTIONS: *bazel_options
+      DEBUG: ${DEBUG:-}
+      RUN_ON_START: ${RUN_ON_START:-1}
+      WATCH_COMMAND: inotify
 
-  build:
-    build:
-      context: docker
-      dockerfile: Dockerfile
-    command: ./build-website.sh
+  website:
+    image: nginx
+    depends_on:
+    - ${BUILDER:-build}
+    command:
+    - /bin/sh
+    - -c
+    - |
+      cat <<EOF > /etc/nginx/conf.d/default.conf
+      server {
+          listen       8000;
+          listen  [::]:8000;
+          server_name  localhost;
+          location / {
+              root   /usr/share/nginx/html;
+              index  index.html index.htm;
+          }
+      }
+      EOF
+      nginx -g 'daemon off;'
     volumes:
-    - .:/src/workspace/envoy-website
-    - ~/.cache/bazel:/$HOME/.cache/bazel
-    - ~/.cache/bazelisk:/$HOME/.cache/bazelisk
-    working_dir: /src/workspace/envoy-website
-    environment:
-      BAZEL_BUILD_OPTIONS: $BAZEL_BUILD_OPTIONS
-      LOCAL_UID: ${UID:?"`UID` must be set, try `export UID`"}
-      LOCAL_USER_NAME: $USERNAME
-      LOCAL_USER_HOME: $HOME
+    - ./_site:/usr/share/nginx/html:z
+    ports:
+    - 8000:8000
 
   update:
     build:
       context: docker
       dockerfile: Dockerfile
+      args:
+        USER_NAME: "${USERNAME}"
+        USER_ID: "${UID}"
+        GROUP_ID: "${GID:-}"
     command: ./sync_envoy.sh
+    user: "${UID:-1000}:${GID:-1000}"
     volumes:
     - .:/src/workspace/envoy-website
     - ${ENVOY_SRC_DIR:-../envoy}:/src/workspace/envoy
     - ~/.cache/bazel:/$HOME/.cache/bazel
     - ~/.cache/bazelisk:/$HOME/.cache/bazelisk
     working_dir: /src/workspace/envoy-website
     environment:
-      LOCAL_UID: ${UID:?"`UID` must be set, try `export UID`"}
-      LOCAL_USER_NAME: $USERNAME
-      LOCAL_USER_HOME: $HOME
       ENVOY_SRC_DIR: ../envoy
-      COMMITTER_NAME: ${COMMITTER_NAME}
-      COMMITTER_EMAIL: ${COMMITTER_EMAIL}
-
-  static:
-    image: nginx
-    volumes:
-    - ./_site:/usr/share/nginx/html:z
-    ports:
-    - 7000:80
+      COMMITTER_NAME: ${COMMITTER_NAME:-}
+      COMMITTER_EMAIL: ${COMMITTER_EMAIL:-}

docker/Dockerfile

@@ -0,0 +1,42 @@
+#!/bin/bash -e
+
+set -o pipefail
+
+REBUILD_SCRIPT="https://raw.githubusercontent.com/envoyproxy/toolshed/refs/heads/main/sh/watch.sh"
+
+
+# X-platform implementaion of working `realpath`
+get_realpath() {
+    if command -v realpath >/dev/null 2>&1; then
+        realpath "$1" 2>/dev/null || echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+    else
+        echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+    fi
+}
+
+
+REBUILD="~/.cache/envoy-website/watch.sh)"
+CURRENT_DIR="$(get_realpath $(dirname "${BASH_SOURCE[0]}"))"
+BUILD_SCRIPT="${CURRENT_DIR}/build-website.sh"
+
+
+download_script () {
+    if [[ -e "$REBUILD" ]]; then
+        echo "Using cached watch.sh ($REBUILD)"
+        return
+    fi
+    rebuild_dir="$(dirname "$REBUILD")"
+    mkdir -p "$rebuild_dir"
+    echo "Downloading: ${REBUILD_SCRIPT}"
+    curl -sL "$REBUILD_SCRIPT" > "$REBUILD"
+    chmod +x "$REBUILD"
+}
+
+
+rebuild () {
+    download_script
+    "$REBUILD" "${CURRENT_DIR}/site" "$BUILD_SCRIPT"
+}
+
+
+rebuild