client: replace submodule with specific release

.github/workflows/main.yml

@@ -12,143 +12,46 @@ on:
         default: false
 
 jobs:
-  test-misc: # quick, simple checks
-    timeout-minutes: 2
-    runs-on: ubuntu-latest
-    steps:
-    - run: docker --version
-    - run: docker compose version
-    - uses: actions/checkout@v5
-    - run: ./test/check-submodules.sh
-    - run: ./test/test-with-pgenvblock.sh
-    - run: sudo apt-get install shellcheck
-    - run: ./test/check-scripts.sh
-    - run: ./test/check-for-large-files.sh
-    - run: ./test/check-dockerfiles.sh
-    - run: cd test && npm clean-install
-    - run: cd test && npm run lint
-    - run: cd test && npm run test:github-actions
-  test-envsub:
-    timeout-minutes: 2
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v5
-    - run: cd test/envsub && ./run-tests.sh
-  test-nginx:
-    timeout-minutes: 4
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-node@v5
-      with:
-        node-version-file: test/package.json
-    - run: cd test/nginx && npm clean-install
-    - run: cd test/nginx && ./setup-tests.sh
-    - run: cd test/nginx && npm run test:nginx:mocha
-    - run: cd test/nginx && ./lint-config.sh
-
-    - run: cd test/nginx && npx playwright install --with-deps chromium-headless-shell
-    - run: cd test/nginx && npm run test:nginx:playwright
-
-    - if: always()
-      run: cd test/nginx && docker compose -f nginx.test.docker-compose.yml logs --no-log-prefix nginx-ssl-selfsign
-    - if: always()
-      run: cd test/nginx && docker compose -f nginx.test.docker-compose.yml logs --no-log-prefix nginx-ssl-upstream
-    - if: always()
-      run: cd test/nginx && docker compose -f nginx.test.docker-compose.yml logs --no-log-prefix service
-    - if: always()
-      run: cd test/nginx && docker compose -f nginx.test.docker-compose.yml logs --no-log-prefix enketo
-    - if: always()
-      run: cd test/nginx && docker compose -f nginx.test.docker-compose.yml logs --no-log-prefix sentry-mock
-  test-secrets:
-    timeout-minutes: 2
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v5
-    - run: ./test/test-secrets.sh
-  test-service:
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v5
-      with:
-        submodules: true
-    - uses: actions/setup-node@v5
-      with:
-        node-version-file: test/package.json
-    - run: cd test/nginx && npm clean-install
-    - run: cd test/nginx && npm run test:service
   test-images:
     timeout-minutes: 10
-    needs:
-    - test-misc
-    - test-envsub
-    - test-nginx
-    - test-secrets
-    - test-service
-    runs-on: ubuntu-latest # TODO matrix to run on all expected versions?
-    steps:
-    - uses: actions/checkout@v5
-      with:
-        fetch-depth: 0
-        fetch-tags: true
-        submodules: recursive
-    - run: ./test/check-docker-context.sh --min-size 15000 --max-size 25000 --min-count 1400 --max-count 1500
-    - run: ./test/test-images.sh
-    - if: always()
-      run: docker compose logs
-  build-push-image:
-    if: |
-      (github.event_name == 'workflow_dispatch' && inputs.publish_image == true) ||
-      (github.event_name != 'workflow_dispatch' && (
-        github.ref == 'refs/heads/master' ||
-        startsWith(github.ref, 'refs/tags/v')
-      ))
-    needs:
-    - test-images
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
     strategy:
+      fail-fast: false
       matrix:
-        image: [nginx, service]
-    env:
-      REGISTRY: ghcr.io
+        x: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+        y: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+    #needs:
+    #- test-misc
+    #- test-envsub
+    #- test-nginx
+    #- test-secrets
+    #- test-service
+    runs-on: ubuntu-latest # TODO matrix to run on all expected versions?
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v5
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
         fetch-tags: true
         submodules: recursive
-    - name: Log into registry ${{ env.REGISTRY }}
-      uses: docker/login-action@v4
-      with:
-        registry: ${{ env.REGISTRY }}
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Show Docker Context
-      run: ./test/check-docker-context.sh --report
 
-    - name: Extract Docker metadata
-      id: meta
-      uses: docker/metadata-action@v6
-      with:
-        images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/central-${{ matrix.image }}
+    #- run: ./test/check-docker-context.sh --min-size 5000 --max-size 10000 --min-count 600 --max-count 700
 
-    - name: Set up QEMU emulator for multi-arch images
-      uses: docker/setup-qemu-action@v4
+    - name: Extract FRONTEND_VERSION
+      run: |
+           touch .env
+           echo "FRONTEND_VERSION=$(
+             docker compose config --format json | jq -r .services.nginx.build.args.FRONTEND_VERSION
+           )" >> "$GITHUB_ENV"
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4
+    - run: FRONTEND_BUILD_MODE=fetch ./test/test-images.sh
 
-    - name: Build and push ${{ matrix.image }} Docker image
-      uses: docker/build-push-action@v7
-      with:
-        file: ${{ matrix.image }}.dockerfile
-        context: .
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
-        platforms: 'linux/amd64,linux/arm64'
+    # Check out the current frontend version referenced by docker-compose, as it should build OK.
+    - run: |
+           git clone \
+               --depth 1 \
+               --branch "$FRONTEND_VERSION" \
+               https://github.com/alxndrsn/odk-central-frontend.git \
+               client
+    - run: FRONTEND_BUILD_MODE=source ./test/test-images.sh
+
+    - if: always()
+      run: docker compose logs

.gitignore

@@ -2,6 +2,7 @@
 *.swp
 *.swo
 /.env
+/client/
 /docker-compose.override.yml
 /version.txt
 

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "server"]
 	path = server
 	url = https://github.com/getodk/central-backend.git
-[submodule "client"]
-	path = client
-	url = https://github.com/getodk/central-frontend.git

docker-compose.yml

@@ -95,6 +95,9 @@ services:
     build:
       context: .
       dockerfile: nginx.dockerfile
+      args:
+        FRONTEND_BUILD_MODE: ${FRONTEND_BUILD_MODE:-fetch}
+        FRONTEND_VERSION: v2026.2.0-beta.0
     depends_on:
       - service
       - enketo

files/prebuild/build-frontend.sh

@@ -2,10 +2,10 @@
 set -o pipefail
 shopt -s inherit_errexit
 
-cd client
+log() { echo >&2 "[build-frontend] $*"; }
 
-if [[ ${SKIP_FRONTEND_BUILD-} != "" ]]; then
-  echo "[build-frontend] Skipping frontend build."
+if [[ $FRONTEND_BUILD_MODE = test ]]; then
+  log "Building mock frontend..."
 
   # Create minimal fake frontend to allow tests to pass:
   mkdir dist dist/assets dist/fonts dist/apps dist/apps/forms
@@ -39,9 +39,55 @@ if [[ ${SKIP_FRONTEND_BUILD-} != "" ]]; then
   }
 
   generateFile 10k-file.txt 10240
+elif [[ $FRONTEND_BUILD_MODE = source ]]; then
+  log "Building frontend from source..."
+
+  if ! [[ -d client ]]; then
+    log "!!!"
+    log "!!! No frontend repository found at ./client"
+    log "!!!"
+    log "!!! Make sure this directory is present, or change FRONTEND_BUILD_MODE."
+    log "!!!"
+    exit 1
+  fi
+  if ! [[ -f client/package.json ]]; then
+    log "!!!"
+    log "!!! No NodeJS project found in ./client"
+    log "!!!"
+    log "!!! Make sure this file is present, or change FRONTEND_BUILD_MODE."
+    log "!!!"
+    exit 1
+  fi
+
+  cd client
 
-  exit
-else
   npm clean-install --no-audit --fund=false --update-notifier=false
   NODE_OPTIONS="--max-old-space-size=2048" npm run build
+
+  mv dist ..
+elif [[ $FRONTEND_BUILD_MODE = fetch ]]; then
+  log "Fetching pre-built frontend..."
+
+  filename="dist-$FRONTEND_VERSION.tar.gz"
+
+  artifactUrl="https://github.com/getodk/central-frontend/releases/download/$FRONTEND_VERSION/$filename"
+  log "Fetching release artifact from $artifactUrl ..."
+  curl \
+      --connect-timeout 60 \
+      --fail \
+      --retry 5 \
+      --retry-delay 10 \
+      --retry-all-errors \
+      --location "$artifactUrl" \
+      --output "$filename"
+
+  log "Extracting dist bundle..."
+  tar --extract --file "$filename"
+else
+  log "!!!"
+  log "!!! Unrecognised FRONTEND_BUILD_MODE: '$FRONTEND_BUILD_MODE'"
+  log "!!!"
+  exit 1
 fi
+
+log "Completed OK."

files/prebuild/write-version.sh

@@ -2,11 +2,47 @@
 set -o pipefail
 shopt -s inherit_errexit
 
+log() {
+  echo >&2 "[write-version] $*"
+}
+
+print_version() {
+  printf ' %s %s (%s)\n' "$1" "$2" "$3"
+}
+
+git_version() {
+  local path="$1"
+  pushd "$path" >/dev/null
+  commit="$(git rev-parse HEAD)"
+  tag="$(git describe --tags --always)"
+  print_version "$commit" "$path" "$tag"
+  popd >/dev/null
+}
+
 {
   echo "versions:"
   echo "$(git rev-parse HEAD) ($(git describe --tags --always))"
-  git submodule foreach --quiet --recursive \
-    "commit=\$(git rev-parse HEAD); \
-     tag=\$(git describe --tags --always); \
-     printf ' %s %s (%s)\n' \"\$commit\" \"\$path\" \"\$tag\""
+
+  if [[ "$FRONTEND_BUILD_MODE" = fetch ]] || [[ "$FRONTEND_BUILD_MODE" = test ]]; then
+    print_version 0000000000000000000000000000000000000000 client "$FRONTEND_VERSION"
+  elif [[ "$FRONTEND_BUILD_MODE" = source ]]; then
+    if ! [[ -d ./client/.git ]]; then
+      log "!!!"
+      log "!!! No frontend git repository found at ./client/.git"
+      log "!!!"
+      log "!!! Make sure this directory is present, or change FRONTEND_BUILD_MODE."
+      log "!!!"
+      exit 1
+    fi
+
+    git_version client
+  else
+    log "!!!"
+    log "!!! Unrecognised FRONTEND_BUILD_MODE: '$FRONTEND_BUILD_MODE'"
+    log "!!!"
+    exit 1
+  fi
+
+  git_version server
+
 } > /tmp/version.txt

nginx.dockerfile

@@ -1,14 +1,18 @@
 FROM node:24.14.1-slim AS intermediate
 
+ARG FRONTEND_BUILD_MODE
+ARG FRONTEND_VERSION
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl \
         git \
     && rm -rf /var/lib/apt/lists/*
 
 COPY ./ ./
-RUN files/prebuild/write-version.sh
 
-ARG SKIP_FRONTEND_BUILD
+RUN files/prebuild/write-version.sh
 RUN files/prebuild/build-frontend.sh
 
 
@@ -39,7 +43,7 @@ COPY files/nginx/setup-odk.sh \
 COPY files/nginx/redirector.conf /usr/share/odk/nginx/
 COPY files/nginx/common-headers.conf /usr/share/odk/nginx/
 COPY files/nginx/robots.txt /usr/share/nginx/html
-COPY --from=intermediate client/dist/ /usr/share/nginx/html
+COPY --from=intermediate dist/ /usr/share/nginx/html
 COPY --from=intermediate /tmp/version.txt /usr/share/nginx/html
 
 ENTRYPOINT [ "/scripts/setup-odk.sh" ]

test/check-submodules.sh

@@ -11,25 +11,12 @@ not_rel() {
 }
 
 check_submodules() {
-  local actualClientSubmodule
   local actualServerSubmodule
 
-  actualClientSubmodule="$(git config --file .gitmodules --get submodule.client.url)"
   actualServerSubmodule="$(git config --file .gitmodules --get submodule.server.url)"
 
-  local expectedClientSubmodule=https://github.com/getodk/central-frontend.git
   local expectedServerSubmodule=https://github.com/getodk/central-backend.git
 
-  if ! [[ "$actualClientSubmodule" = "$expectedClientSubmodule" ]]; then
-    log "!!!"
-    log "!!! client submodule is pointing to unexpected repo:"
-    log "!!!"
-    log "!!!       actual: $actualClientSubmodule"
-    log "!!!     expected: $expectedClientSubmodule"
-    log "!!!"
-    exit 1
-  fi
-
   if ! [[ "$actualServerSubmodule" = "$expectedServerSubmodule" ]]; then
     log "!!!"
     log "!!! server submodule is pointing to unexpected repo:"

test/nginx/lib.docker-compose.yml

@@ -4,7 +4,8 @@ services:
       context: ../..
       dockerfile: nginx.dockerfile
       args:
-        SKIP_FRONTEND_BUILD: true
+        FRONTEND_BUILD_MODE: test
+        FRONTEND_VERSION: v0.0.0
     depends_on:
       - service
       - enketo