From 894f3e19d44dfae20cdabcb836874c95760b6fd0 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Thu, 11 Jan 2024 15:43:54 -0800
Subject: [PATCH] Release 16.6.4 - See CHANGELOG.md

---
 CHANGELOG.md |  7 +++++++
 Dockerfile   | 17 +++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2494c50..1a93a82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 16.6.4 2024-01-11 <dave at tiredofit dot ca>
+
+   ### Added
+      - Gitlab-EE 16.6.4
+      - GoLang 1.21.6
+
+
 ## 16.7.2 2024-01-11 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index cc3ea42..dd29327 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG DISTRO="debian"
-ARG DISTRO_VARIANT="bookworm"
+ARG DISTRO_VARIANT="bullseye"
 
 FROM docker.io/tiredofit/nginx:${DISTRO}-${DISTRO_VARIANT}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
@@ -9,9 +9,9 @@ ARG GO_VERSION
 ARG RUBY_VERSION
 
 ### Set Defaults and Arguments
-ENV GITLAB_VERSION=${GITLAB_VERSION:-"16.7.2-ee"} \
+ENV GITLAB_VERSION=${GITLAB_VERSION:-"16.6.4-ee"} \
     GO_VERSION=${GO_VERSION:-"1.21.6"} \
-    RUBY_VERSION=${RUBY_VERSION:-"3.3.0"} \
+    RUBY_VERSION=${RUBY_VERSION:-"3.0.6"} \
     GITLAB_HOME="/home/git" \
     IMAGE_NAME="tiredofit/gitlab-ee" \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-gitlab-ee/"
@@ -55,9 +55,9 @@ RUN source /assets/functions/00-container && \
                 gettext-base \
                 graphicsmagick \
                 libcurl4 \
-                libffi8 \
+                libffi7 \
                 libgdbm6 \
-                libicu72 \
+                libicu67 \
                 libimage-exiftool-perl \
                 libjemalloc2 \
                 libncurses5 \
@@ -71,8 +71,8 @@ RUN source /assets/functions/00-container && \
                 locales \
                 openssh-server \
                 nodejs \
-                postgresql-client-16 \
-                postgresql-contrib-16 \
+                postgresql-client-15 \
+                postgresql-contrib-15 \
                 python3 \
                 python3-docutils \
                 redis-tools \
@@ -87,8 +87,6 @@ RUN source /assets/functions/00-container && \
     DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales && \
     \
     BUILD_DEPENDENCIES="build-essential \
-                        cargo \
-                        clang \
                         cmake \
                         g++ \
                         gcc \
@@ -113,7 +111,6 @@ RUN source /assets/functions/00-container && \
                         make \
                         patch \
                         pkg-config \
-                        rustc \
                         zlib1g-dev" \
                         && \
     package install ${BUILD_DEPENDENCIES} && \