Docker updates

Signed-off-by: Archit Sharma <[email protected]>

Author: iArchitSharma

.dockerignore

@@ -0,0 +1,13 @@
+.DS_Store
+.github
+.gitignore
+.idea
+_releaser
+CONTRIBUTING.md
+Dockerfile
+compose.yml
+docker-bake.hcl
+public
+node_modules
+resources
+tmp

Dockerfile

@@ -1,10 +1,91 @@
-FROM razonyang/hugo:exts as builder
+ARG GO_VERSION=1.21
+ARG HTMLTEST_VERSION=0.17.0
 
-ARG HUGO_BASEURL=
-ENV HUGO_BASEURL=${HUGO_BASEURL}
+FROM golang:${GO_VERSION}-alpine as base
+WORKDIR /src
+RUN apk --update add nodejs npm git gcompat
 
-COPY . /src
-RUN hugo --minify --gc --enableGitInfo
+FROM base as node
+COPY package*.json .
+ENV NODE_ENV=production
+RUN npm install
 
-FROM razonyang/hugo:nginx
-COPY --from=builder /src/public /site
+FROM base as hugo
+ARG HUGO_VERSION=0.122.0
+ARG TARGETARCH
+WORKDIR /tmp/hugo
+RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz"
+RUN tar -xf "hugo.tar.gz" hugo
+
+FROM base as build-base
+COPY --from=hugo /tmp/hugo/hugo /bin/hugo
+COPY --from=node /src/node_modules /src/node_modules
+COPY . .
+
+FROM build-base as dev
+
+FROM build-base as build
+ARG HUGO_ENV
+ARG DOCS_URL
+RUN hugo --gc --minify -d /out -e $HUGO_ENV -b $DOCS_URL
+
+FROM scratch as release
+COPY --from=build /out /
+
+FROM scratch as update-stats
+COPY --from=build /src/hugo_stats.json /hugo_stats.json
+
+FROM build as validate-stats
+RUN <<EOF
+if [ -n "$(git status --porcelain -- hugo_stats.json)" ]; then
+  echo >&2 'ERROR: hugo_stats.json differs. Update with `docker buildx bake update-stats`'
+  exit 1
+fi
+EOF
+
+FROM davidanson/markdownlint-cli2:v0.12.1 as lint
+USER root
+RUN --mount=type=bind,target=. \
+    /usr/local/bin/markdownlint-cli2 \
+    "content/**/*.md" \
+    "#content/engine/release-notes/*.md" \
+    "#content/desktop/previous-versions/*.md"
+
+FROM wjdp/htmltest:v${HTMLTEST_VERSION} as test
+WORKDIR /test
+COPY --from=build /out ./public
+ADD .htmltest.yml .htmltest.yml
+RUN htmltest
+
+FROM build-base as update-modules
+ARG MODULE
+RUN <<"EOT"
+set -ex
+if [ -n "$MODULE" ]; then
+    hugo mod get ${MODULE}
+    RESOLVED=$(cat go.mod | grep -m 1 "${MODULE/@*/}" | awk '{print $1 "@" $2}')
+    go mod edit -replace "${MODULE/@*/}=${RESOLVED}";
+else
+    echo "no module set";
+fi
+EOT
+RUN hugo mod vendor
+
+FROM scratch as vendor
+COPY --from=update-modules /src/_vendor /_vendor
+COPY --from=update-modules /src/go.* /
+
+FROM build-base as build-upstream
+ARG UPSTREAM_MODULE_NAME
+ARG UPSTREAM_REPO
+ARG UPSTREAM_COMMIT
+ENV HUGO_MODULE_REPLACEMENTS="github.com/${UPSTREAM_MODULE_NAME} -> github.com/${UPSTREAM_REPO} ${UPSTREAM_COMMIT}"
+RUN hugo --ignoreVendorPaths "github.com/${UPSTREAM_MODULE_NAME}" -d /out
+
+FROM wjdp/htmltest:v${HTMLTEST_VERSION} as validate-upstream
+WORKDIR /test
+COPY --from=build-upstream /out ./public
+ADD .htmltest.yml .htmltest.yml
+RUN htmltest
+
+FROM dev

Makefile

@@ -44,5 +44,4 @@ check-go:
 	@echo "Go is installed."
 
 docker:
-	docker build -t layer5/docs .
-	docker run -p 8080:80 layer5/docs
+	docker compose watch

compose.yaml

@@ -0,0 +1,15 @@
+services:
+  server:
+    build:
+      context: .
+      target: dev
+    ports:
+      - "1313:1313"
+    entrypoint: ["hugo", "server", "--bind", "0.0.0.0"]
+    develop:
+      watch:
+        - action: sync
+          path: .
+          target: /src
+          ignore:
+            - node_modules/