chore: update base image registry

9 files changed, 16 insertions, 14 deletions

diff --git a/src/base/VERSION b/src/base/VERSION
index b82608c..1474d00 100644
--- a/src/base/VERSION
+++ b/src/base/VERSION
@@ -1 +1 @@
-v0.1.0
+v0.2.0
diff --git a/src/base/bin/install_deb b/src/base/bin/install_deb
index 2656179..5759d88 100755
--- a/src/base/bin/install_deb
+++ b/src/base/bin/install_deb
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 DEBIAN_FRONTEND=noninteractive
-DEFAULT_APT_OPTS="--no-install-recommends --yes"
+DEFAULT_APT_OPTS="--no-install-recommends --no-install-suggests --yes"
 APT_OPTS="${APT_OPTS:-$DEFAULT_APT_OPTS}"
 set -e
 apt-get update --yes
diff --git a/src/cgit/Dockerfile b/src/cgit/Dockerfile
index 684b589..25fd377 100644
--- a/src/cgit/Dockerfile
+++ b/src/cgit/Dockerfile
@@ -1,12 +1,13 @@
-ARG BASE_VER=latest
-FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER}
+ARG BASE_VER=v0.2.0
+FROM public.ecr.aws/s0f9o2k5/base:${BASE_VER}
 SHELL ["/bin/bash", "-c"]
-RUN APT_OPTS="--no-install-recommends --install-suggests --yes" install_deb cgit uwsgi nginx-light \
-        && install_deb python3-minimal python3-pygments python3-markdown \
+RUN install_deb cgit uwsgi nginx-light python3-minimal python3-pygments python3-markdown \
             && mkdir -p /run/uwsgi \
                 && chown www-data:www-data /run/uwsgi \
                     && addgroup --gid 998 git \
                         && usermod -a -G git www-data
 COPY etc/uwsgi/cgit.ini /etc/uwsgi/cgit.ini
+COPY etc/gruvbox.css /usr/share/cgit/gruvbox.css
+COPY etc/gruvbox_header.html /usr/lib/cgit/gruvbox_header.html
 COPY bin/entrypoint.sh /usr/bin/entrypoint.sh
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]
diff --git a/src/cluster/Dockerfile b/src/cluster/Dockerfile
index 622d5b7..002f00c 100644
--- a/src/cluster/Dockerfile
+++ b/src/cluster/Dockerfile
@@ -7,7 +7,7 @@ RUN git clone https://git.ofmax.li/go-echo \
         && cd go-echo \                                            
         && go build -o /go-echo                                    
                                                                    
-FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER} 
+FROM public.ecr.aws/s0f9o2k5/base:${BASE_VER} 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y \
         && apt-get upgrade -y \
diff --git a/src/git-snapshot/Dockerfile b/src/git-snapshot/Dockerfile
index f7a6e14..a474d90 100644
--- a/src/git-snapshot/Dockerfile
+++ b/src/git-snapshot/Dockerfile
@@ -1,6 +1,6 @@
 ARG GIT_SNAPSHOT=0.0.2
 ARG BASE_VER=latest
-FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER}
+FROM public.ecr.aws/s0f9o2k5/base:${BASE_VER}
 ARG GIT_SNAPSHOT
 SHELL ["/bin/bash", "-c"]
 RUN install_deb python3-minimal python3-pip python3-setuptools python3-wheel git \
diff --git a/src/gitolite/Dockerfile b/src/gitolite/Dockerfile
index f48e890..d2104e5 100644
--- a/src/gitolite/Dockerfile
+++ b/src/gitolite/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_VER=latest
-FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER}
+FROM public.ecr.aws/s0f9o2k5/base:${BASE_VER}
 SHELL ["/bin/bash", "-c"]
 
 RUN install_deb gitolite3
diff --git a/src/go-echo/Dockerfile b/src/go-echo/Dockerfile
index fbd7c28..6d6cd79 100644
--- a/src/go-echo/Dockerfile
+++ b/src/go-echo/Dockerfile
@@ -7,6 +7,6 @@ RUN git clone https://git.ofmax.li/go-echo \
         && cd go-echo \
         && go build -o /go-echo
 
-FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER}
+FROM public.ecr.aws/s0f9o2k5/base:${BASE_VER}
 COPY --from=0 /app/go-echo /opt/app/go-echo
 CMD [ "/opt/app/go-echo" ]
diff --git a/src/pelican/Dockerfile b/src/pelican/Dockerfile
index de75030..f4649a5 100644
--- a/src/pelican/Dockerfile
+++ b/src/pelican/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_VER=latest
-FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER}
+FROM public.ecr.aws/s0f9o2k5/base:${BASE_VER}
 RUN apt-get update -y \
         && apt-get install -y python3-pip libsass-dev ruby-sass libtiff5-dev \
 		   libjpeg-dev libopenjp2-7-dev zlib1g-dev \
diff --git a/src/sally/Dockerfile b/src/sally/Dockerfile
index 20b9b90..f9cc3c1 100644
--- a/src/sally/Dockerfile
+++ b/src/sally/Dockerfile
@@ -2,9 +2,10 @@ 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 master \
-                    && make build
+                && git checkout grumps-build \
+                    && make grumps-build
 FROM scratch
-COPY --from=build /opt/workspace/sally/_tmp/sally /sally
+COPY --from=build /opt/workspace/sally/sally /sally
 COPY sally.yaml /sally.yaml
+WORKDIR /
 CMD ["/sally"]