feat: update configs

6 files changed, 5 insertions, 35 deletions

diff --git a/src/base/targets/buster-builder b/src/base/targets/buster-builder
deleted file mode 100644
index e69de29..0000000
--- a/src/base/targets/buster-builder
+++ /dev/null
diff --git a/src/base/targets/buster-slim b/src/base/targets/buster-slim
deleted file mode 100644
index e69de29..0000000
--- a/src/base/targets/buster-slim
+++ /dev/null
diff --git a/src/cgit/VERSION b/src/cgit/VERSION
index 5c314e5..77cada2 100644
--- a/src/cgit/VERSION
+++ b/src/cgit/VERSION
@@ -1 +1 @@
-v0.0.5
+v0.0.6
diff --git a/src/cgit/bin/entrypoint.sh b/src/cgit/bin/entrypoint.sh
index 80d3788..8e17aa5 100755
--- a/src/cgit/bin/entrypoint.sh
+++ b/src/cgit/bin/entrypoint.sh
@@ -24,35 +24,5 @@ server {
 }
 EOF
 
-cat << EOF > /etc/cgitrc
-#
-# cgit config
-# see cgitrc(5) for details
-
-root-title=git.ofmax.li
-root-desc=grumpy software
-
-readme=:README.md
-
-about-filter=/usr/lib/cgit/filters/about-formatting.sh
-source-filter=/usr/lib/cgit/filters/syntax-highlighting.py
-
-enable-index-links=1
-enable-log-filecount=1
-enable-commit-graph=1
-enable-index-owner=1
-enable-http-clone=1
-snapshots=tar.gz
-css=/cgit.css
-logo=/cgit.png
-virtual-root=/
-robots=nofollow
-remove-suffix=1
-
-project-list=/var/lib/git/projects.list
-scan-path=/var/lib/git/repositories
-
-EOF
-
 uwsgi --daemonize --ini /etc/uwsgi/cgit.ini > /dev/stdout 2> /dev/stderr < /dev/null &
 nginx -c /etc/nginx/nginx.conf -g "daemon off;"
diff --git a/src/go-echo/Dockerfile b/src/go-echo/Dockerfile
index 2c8a082..fbd7c28 100644
--- a/src/go-echo/Dockerfile
+++ b/src/go-echo/Dockerfile
@@ -1,5 +1,5 @@
-ARG BASE_VER=latest
-FROM golang:1.17-bullseye
+ARG BASE_VER=v0.1.0
+FROM golang:1.21-bullseye
 
 WORKDIR /app
 
diff --git a/src/sally/Dockerfile b/src/sally/Dockerfile
index 2225a40..021766a 100644
--- a/src/sally/Dockerfile
+++ b/src/sally/Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:1.17 as build
+FROM golang:1.22 as build
 RUN mkdir -p /opt/workspace \
         && git clone https://git.ofmax.li/sally /opt/workspace/sally \
             && cd /opt/workspace/sally \
                 && git checkout grumps-master \
-                    && make grumps-build
+                    && make build
 FROM scratch
 COPY --from=build /opt/workspace/sally/_tmp/sally /sally
 COPY sally.yaml /sally.yaml