diff --git a/.gitea/workflows/publish-image.yml b/.gitea/workflows/publish-image.yml
index 615fea7..0fe1c73 100644
--- a/.gitea/workflows/publish-image.yml
+++ b/.gitea/workflows/publish-image.yml
@@ -37,4 +37,6 @@ jobs:
${{ secrets.DOCKER_REGISTRY }}/${{ gitea.repository }}:latest
${{ secrets.DOCKER_REGISTRY }}/${{ gitea.repository }}:${{ gitea.ref_name }}
build-args: |
- img_ver=${{ gitea.ref_name }}
\ No newline at end of file
+ img_ver=${{ gitea.ref_name }}
+ analytics_src=${{ secrets.ANALYTICS_SRC }}
+ analytics_id=${{ secrets.ANALYTICS_ID }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2eea525
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.env
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 9df6c92..901da75 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,8 @@
FROM alpine:3
ARG img_ver
+ARG analytics_src
+ARG analytics_id
ENV IMAGE_VERSION ${img_ver}
LABEL org.opencontainers.image.title="Website" \
@@ -24,6 +26,8 @@ RUN hugo new site www \
&& hugo mod init git.morthimer.fr
COPY --chown=morthimer:morthimer rootfs/ /
WORKDIR /home/morthimer/www
+RUN sed -i "s/ANALYTICS_SRC_PLACEHOLDER/${analytics_src}/g" hugo.toml \
+ && sed -i "s/ANALYTICS_ID_PLACEHOLDER/${analytics_id}/g" hugo.toml
EXPOSE 1313
ENTRYPOINT [ "hugo" ]
diff --git a/Makefile b/Makefile
index 508485a..bc7712f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+include .env
+
init-sandbox:
docker run -d --name dev-ct alpine sleep infinity
docker exec -it dev-ct ash
@@ -9,10 +11,18 @@ lint:
docker run --rm -i ghcr.io/hadolint/hadolint < Dockerfile
build-dev:
- docker build --no-cache -t hugo-dev .
+ docker build \
+ --build-arg img_ver=dev \
+ --build-arg analytics_src=${A7S_SRC} \
+ --build-arg analytics_id=${A7S_ID} \
+ --no-cache \
+ -t hugo-dev .
run-dev:
- docker run -p 80:1313 --name hugo-dev -d hugo-dev
+ docker run \
+ -p 80:1313 \
+ --name hugo-dev \
+ -d hugo-dev
clean-dev:
docker rm -f hugo-dev
\ No newline at end of file
diff --git a/rootfs/home/morthimer/www/hugo.toml b/rootfs/home/morthimer/www/hugo.toml
index d442554..6288c46 100644
--- a/rootfs/home/morthimer/www/hugo.toml
+++ b/rootfs/home/morthimer/www/hugo.toml
@@ -8,6 +8,7 @@ ignoreErrors = ["error-remote-getjson"]
[params]
description = "morthimer's Portfolio"
+
[params.Terminal]
schema = "gruvbox_dark"
@@ -16,9 +17,9 @@ ignoreErrors = ["error-remote-getjson"]
workDir = "www"
profile = "profile.txt"
- ps1Delay = 20
- stdoutDelay = 20
- commandDelay = 40
+ ps1Delay = 10
+ stdoutDelay = 15
+ commandDelay = 20
titleDelay = 0
contentDelay = 0
@@ -52,4 +53,8 @@ ignoreErrors = ["error-remote-getjson"]
["Awesome Content","https://github.com/sindresorhus/awesome"],
["server-world.info","https://www.server-world.info/en/"],
["The Brutalist Report", "https://brutalist.report/" ],
- ]
\ No newline at end of file
+ ]
+
+ [params.analytics]
+ src = "ANALYTICS_SRC_PLACEHOLDER"
+ id = "ANALYTICS_ID_PLACEHOLDER"
\ No newline at end of file
diff --git a/rootfs/home/morthimer/www/layouts/partials/head.html b/rootfs/home/morthimer/www/layouts/partials/head.html
new file mode 100644
index 0000000..25a14fc
--- /dev/null
+++ b/rootfs/home/morthimer/www/layouts/partials/head.html
@@ -0,0 +1,8 @@
+
+ {{- if .IsHome }}{{ .Site.Title }}{{- else }}{{ .Title }}{{- end }}
+
+
+
+
+ {{ partial "partials/style.html" . }}
+
\ No newline at end of file