Use hugo-ext. Setup. Tests.

Author: penyaskito

README.md

@@ -16,8 +16,8 @@ In DDEV addons can be installed from the command line using the `ddev get` comma
 ## Getting started
 
 1. Create your ddev project with `ddev config --omit-containers=db`
-2. Run `ddev get https://github.com/penyaskito/ddev-hugo/tarball/main`
-3. Run `ddev hugo`
-4. Run `ddev launch hugo`
+2. Run `ddev get https://github.com/penyaskito/ddev-hugo`
+3. Run `ddev hugo -b public`
+4. Run `ddev launch public`
 
 **Contributed and maintained by [@penyaskito](https://github.com/penyaskito)**

tests/test.bats

@@ -7,14 +7,22 @@ setup() {
   export DDEV_NON_INTERACTIVE=true
   ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true
   cd "${TESTDIR}"
-  ddev config --project-name=${PROJNAME}
+  ddev config --project-name=${PROJNAME} --omit-containers=db
   ddev start -y >/dev/null
 }
 
 health_checks() {
   # Do something useful here that verifies the add-on
   # ddev exec "curl -s elasticsearch:9200" | grep "${PROJNAME}-elasticsearch"
-  ddev exec "curl -s https://localhost:443/"
+  ddev exec hugo new site quickstart
+  cp -r quickstart/* .
+  ddev exec hugo new theme testtheme
+  echo "{{.Site.Home.Content}}" >> themes/testtheme/layouts/index.html
+  echo "theme = 'testtheme'" >> config.toml
+  ddev exec hugo new _index.md
+  echo "# Welcome to Hugo!" >> content/_index.md
+  ddev exec hugo -b public
+  ddev exec "curl -s https://localhost/public" | grep "Welcome to Hugo"
 }
 
 teardown() {
@@ -37,7 +45,7 @@ teardown() {
   set -eu -o pipefail
   cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
   echo "# ddev get ddev/ddev-hugo with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
-  ddev get ddev/ddev-hugo
+  ddev get penyaskito/ddev-hugo
   ddev restart >/dev/null
   health_checks
 }

web-build/Dockerfile.ddev-hugo

@@ -1,13 +1,13 @@
 #ddev-generated
-ENV HUGO_BIND="0.0.0.0" \
-    HUGO_DESTINATION="hugo" \
+ENV HUGO_EDITION="extended" \
+    HUGO_BIND="0.0.0.0" \
+    HUGO_DESTINATION="public" \
     HUGO_ENV="DEV" \
     HUGO_DIR="." \
-    HUGO_CMD="-b /hugo" \
     HOME="/tmp"
 
-COPY --from=klakegg/hugo:debian /usr/bin/hugo /usr/bin/hugo
-COPY --from=klakegg/hugo:debian /usr/bin/hugo-official /usr/bin/hugo-official
-COPY --from=klakegg/hugo:debian /etc/profile.d/hugo.sh /etc/profile.d/hugo.sh
-COPY --from=klakegg/hugo:debian /etc/profile.d/hugo_shell.sh /etc/profile.d/hugo_shell.sh
-COPY --from=klakegg/hugo:debian /usr/lib/hugo /usr/lib/hugo
+COPY --from=klakegg/hugo:ext-debian /usr/bin/hugo /usr/bin/hugo
+COPY --from=klakegg/hugo:ext-debian /usr/bin/hugo-official /usr/bin/hugo-official
+COPY --from=klakegg/hugo:ext-debian /etc/profile.d/hugo.sh /etc/profile.d/hugo.sh
+COPY --from=klakegg/hugo:ext-debian /etc/profile.d/hugo_shell.sh /etc/profile.d/hugo_shell.sh
+COPY --from=klakegg/hugo:ext-debian /usr/lib/hugo /usr/lib/hugo