17 files changed, 23 insertions, 65 deletions
diff --git a/src/base/Dockerfile b/src/base/Dockerfile
index 50a6ac8..45066b0 100644
--- a/src/base/Dockerfile
+++ b/src/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim as buster-slim
+FROM debian:bullseye-slim as bullseye-slim
 ENV DEBIAN_FRONTEND=noninteractive
 RUN useradd -s /usr/sbin/nologin \
             --create-home \
@@ -6,6 +6,7 @@ RUN useradd -s /usr/sbin/nologin \
             app
 COPY bin/install_deb /usr/local/bin/install_deb
 WORKDIR /opt/app
+
 FROM debian:sid-slim as sid-slim
 ENV DEBIAN_FRONTEND=noninteractive
 RUN useradd -s /usr/sbin/nologin \
@@ -14,11 +15,13 @@ RUN useradd -s /usr/sbin/nologin \
             app
 COPY bin/install_deb /usr/local/bin/install_deb
 WORKDIR /opt/app
-FROM buster-slim as buster-builder
+
+FROM bullseye-slim as bullseye-builder
 ENV DEBIAN_FRONTEND=noninteractive
 COPY bin/install_deb /usr/local/bin/install_deb
 RUN install_deb curl ca-certificates xz-utils gpg
 WORKDIR /opt/app
-FROM debian:buster-slim as finale
+
+FROM debian:bullseye-slim as finale
 ENV DEBIAN_FRONTEND=noninteractive
 COPY bin/install_deb /usr/local/bin/install_deb
diff --git a/src/base/VERSION b/src/base/VERSION
index f9cece5..b82608c 100644
--- a/src/base/VERSION
+++ b/src/base/VERSION
@@ -1 +1 @@
-v0.0.3
+v0.1.0
diff --git a/src/cgit/Dockerfile b/src/cgit/Dockerfile
index e0e31ba..684b589 100644
--- a/src/cgit/Dockerfile
+++ b/src/cgit/Dockerfile
@@ -1,4 +1,5 @@
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.2
+ARG BASE_VER=latest
+FROM registry.gitlab.com/grumps/grumpy-containers/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 \
diff --git a/src/git-snapshot/Dockerfile b/src/git-snapshot/Dockerfile
index 87e08a6..f7a6e14 100644
--- a/src/git-snapshot/Dockerfile
+++ b/src/git-snapshot/Dockerfile
@@ -1,5 +1,6 @@
-ARG GIT_SNAPSHOT=0.0.1
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
+ARG GIT_SNAPSHOT=0.0.2
+ARG BASE_VER=latest
+FROM registry.gitlab.com/grumps/grumpy-containers/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/git-snapshot/VERSION b/src/git-snapshot/VERSION
index f9cece5..5c314e5 100644
--- a/src/git-snapshot/VERSION
+++ b/src/git-snapshot/VERSION
@@ -1 +1 @@
-v0.0.3
+v0.0.5
diff --git a/src/gitolite/Dockerfile b/src/gitolite/Dockerfile
index e08e76b..f48e890 100644
--- a/src/gitolite/Dockerfile
+++ b/src/gitolite/Dockerfile
@@ -1,4 +1,5 @@
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
+ARG BASE_VER=latest
+FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER}
 SHELL ["/bin/bash", "-c"]
 
 RUN install_deb gitolite3
diff --git a/src/gitolite/VERSION b/src/gitolite/VERSION
index 7df503e..5c314e5 100644
--- a/src/gitolite/VERSION
+++ b/src/gitolite/VERSION
@@ -1 +1 @@
-v0.0.4
+v0.0.5
diff --git a/src/helm-tools/Dockerfile b/src/helm-tools/Dockerfile
deleted file mode 100644
index d3aba41..0000000
--- a/src/helm-tools/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
-RUN apt-get update -y \
-        && apt-get install -y curl make git \
-            && curl -L -o /tmp/hm.tar.gz https://get.helm.sh/helm-v2.14.3-linux-amd64.tar.gz \
-                && tar xvf /tmp/hm.tar.gz -C /tmp \
-                    && install /tmp/linux-amd64/helm /usr/local/bin/helm \
-                        && helm init  --client-only
-USER app
diff --git a/src/helm-tools/VERSION b/src/helm-tools/VERSION
deleted file mode 100644
index 9c2228b..0000000
--- a/src/helm-tools/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v2.14.3
diff --git a/src/miniflux/Dockerfile b/src/miniflux/Dockerfile
deleted file mode 100644
index 151d66c..0000000
--- a/src/miniflux/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
-SHELL ["/bin/bash", "-c"]                                                                           
-RUN APT_OPTS="--no-install-recommends --install-suggests --yes" install_deb curl ca-certificates
-RUN curl -LSo /miniflux https://github.com/miniflux/miniflux/releases/download/2.0.23/miniflux-linux-amd64 \
-        && install /miniflux /usr/local/bin
-
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.2
-COPY --from=0  /usr/local/bin/miniflux /usr/local/bin/miniflux
-
-ENTRYPOINT ["/usr/local/bin/miniflux"]
-CMD ["-c", "/etc/miniflux/miniflux.conf"]
diff --git a/src/miniflux/VERSION b/src/miniflux/VERSION
deleted file mode 100644
index 1474d00..0000000
--- a/src/miniflux/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v0.2.0
diff --git a/src/pelican/Dockerfile b/src/pelican/Dockerfile
index 3834138..de75030 100644
--- a/src/pelican/Dockerfile
+++ b/src/pelican/Dockerfile
@@ -1,5 +1,10 @@
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
-RUN apt-get update -y && apt-get install -y python3-pip libsass-dev ruby-sass
+ARG BASE_VER=latest
+FROM registry.gitlab.com/grumps/grumpy-containers/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 \
+    	   libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
+    	   libharfbuzz-dev libfribidi-dev libxcb1-dev
 RUN pip3 install pelican webassets Pillow markdown cssmin libsass
 USER app
 WORKDIR /opt/app
diff --git a/src/thelounge/Dockerfile b/src/thelounge/Dockerfile
deleted file mode 100644
index 3cfdc02..0000000
--- a/src/thelounge/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-ARG NODE_VERSION=v12.16.2
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3-buster-builder as builder
-ARG NODE_VERSION
-RUN mkdir -p /opt/build/nodejs \
-        && curl "https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.xz" -o "/opt/build/node-${NODE_VERSION}-linux-x64.tar.xz" \
-          && tar -xJvf "/opt/build/node-${NODE_VERSION}-linux-x64.tar.xz" -C /opt/build/nodejs --strip-components=1
-RUN mkdir -p /opt/build/yarn \
-        && curl -Lo /opt/build/yarn/latest.tar.gz https://yarnpkg.com/latest.tar.gz \
-            && tar zvxf /opt/build/yarn/latest.tar.gz -C /opt/build/yarn --strip-components=1
-
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
-COPY --from=builder /opt/build/nodejs /opt/lib/nodejs
-COPY --from=builder /opt/build/yarn /opt/lib/yarn
-ENV PATH "$PATH:/opt/lib/yarn/bin:/opt/lib/nodejs/bin"
diff --git a/src/thelounge/VERSION b/src/thelounge/VERSION
deleted file mode 100644
index dee399e..0000000
--- a/src/thelounge/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v0.0.1-rc.1
diff --git a/src/znc/Dockerfile b/src/znc/Dockerfile
deleted file mode 100644
index 241761c..0000000
--- a/src/znc/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM gcr.io/google-containers/pause:latest
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3-sid-slim
-SHELL ["/bin/bash", "-c"]
-RUN install_deb znc znc-perl znc-push znc-python znc-backlog
-USER app
-RUN mkdir -p ~/.znc/users/grumpsznc/moddata/freenode/moddata/{sasl,nickserv}
-COPY bin/entrypoint.sh /usr/local/bin/entrypoint.sh
-COPY --from=0 /pause /usr/local/bin/pause
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD ["-f"]
diff --git a/src/znc/VERSION b/src/znc/VERSION
deleted file mode 100644
index 45c7a58..0000000
--- a/src/znc/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v0.0.1
diff --git a/src/znc/bin/entrypoint.sh b/src/znc/bin/entrypoint.sh
deleted file mode 100755
index 43bff83..0000000
--- a/src/znc/bin/entrypoint.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-export INSTALL_BASE=/opt/app/.znc
-export TAR_BALL=/mnt/config/znc.tar.gz
-tar xvf "${TAR_BALL}" -C "${INSTALL_BASE}"
-exec znc "${@}"