From 2e0a809327dda5b3fe422e30d12c63a2725cdc0a Mon Sep 17 00:00:00 2001
From: Sarah German <sgerman@gitlab.com>
Date: Wed, 14 Feb 2024 17:34:11 -0600
Subject: [PATCH] Build all single version images with Lunr

---
 .gitlab/ci/docker-images.gitlab-ci.yml | 5 -----
 dockerfiles/single.Dockerfile          | 8 +++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml
index af0a16aea..dbb8289cd 100644
--- a/.gitlab/ci/docker-images.gitlab-ci.yml
+++ b/.gitlab/ci/docker-images.gitlab-ci.yml
@@ -172,8 +172,6 @@ image:docs-single:
     - docker buildx build
              --build-arg NANOC_ENV=${NANOC_ENV}
              --build-arg VER=${CI_COMMIT_REF_NAME}
-             --build-arg SEARCH_BACKEND="google"
-             --build-arg GOOGLE_SEARCH_KEY=${GOOGLE_SEARCH_KEY}
              --tag $IMAGE_NAME
              --file $DOCKERFILE .
              --push
@@ -201,7 +199,6 @@ test:image:docs-single:
     - docker buildx build
              --build-arg NANOC_ENV=${NANOC_ENV}
              --build-arg VER=${GITLAB_VERSION}
-             --build-arg SEARCH_BACKEND="google"
              --tag $IMAGE_NAME
              --file $DOCKERFILE .
              --load
@@ -236,7 +233,6 @@ image:docs-single-lunrjs:
     - docker buildx build
              --build-arg NANOC_ENV=${NANOC_ENV}
              --build-arg VER=${CI_COMMIT_REF_NAME}
-             --build-arg SEARCH_BACKEND="lunr"
              --tag $IMAGE_NAME
              --file $DOCKERFILE .
              --push
@@ -263,7 +259,6 @@ test:image:docs-single-lunrjs:
     - docker buildx build
              --build-arg NANOC_ENV=${NANOC_ENV}
              --build-arg VER=${GITLAB_VERSION}
-             --build-arg SEARCH_BACKEND="lunr"
              --tag $IMAGE_NAME
              --file $DOCKERFILE .
              --load
diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile
index 259896801..ad07f376f 100644
--- a/dockerfiles/single.Dockerfile
+++ b/dockerfiles/single.Dockerfile
@@ -6,14 +6,11 @@ FROM ruby:3.2.2-alpine3.18 as builder
 
 # Set versions as build args to fetch corresponding branches
 ARG VER
-ARG SEARCH_BACKEND
-ARG GOOGLE_SEARCH_KEY
 ARG NANOC_ENV
 
 ENV CI_COMMIT_REF_NAME=$VER
-ENV SEARCH_BACKEND=$SEARCH_BACKEND
-ENV GOOGLE_SEARCH_KEY=$GOOGLE_SEARCH_KEY
 ENV NANOC_ENV=$NANOC_ENV
+ENV SEARCH_BACKEND="lunr"
 
 # Install Nanoc dependencies and tools that
 # are needed to build the docs site and run the tests.
@@ -65,7 +62,8 @@ RUN yarn install --immutable                          \
     && yarn compile:css                               \
     && yarn compile:js
 
-RUN if [ "$SEARCH_BACKEND" = "lunr" ]; then make build-lunr-index; fi
+# Build the offline search index
+RUN make build-lunr-index
 
 # Run post-processing on archive:
 #
-- 
GitLab