From 1627ebcc06345ad20c6c03eff8f68dfa656e6765 Mon Sep 17 00:00:00 2001
From: Ed Sabol <22986767+esabol@users.noreply.github.com>
Date: Sat, 20 Jul 2024 23:48:20 -0400
Subject: [PATCH] Updated Dockerfiles for latest version and other minor
 tweaks.

---
 docker/example/gearmand/Dockerfile    | 31 +++++++++++----------------
 docker/example/gearmand/Makefile      |  2 +-
 docker/example/gearmand/gearmand.conf |  4 ++--
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/docker/example/gearmand/Dockerfile b/docker/example/gearmand/Dockerfile
index 2014174e4..280ecab0f 100644
--- a/docker/example/gearmand/Dockerfile
+++ b/docker/example/gearmand/Dockerfile
@@ -1,6 +1,6 @@
-FROM gearmand/supervisord:latest
+FROM gearmand/supervisord:1.0
 
-ARG version=1.1.19.1
+ARG version=1.1.21
 
 LABEL description="Gearman Job Server Image"
 LABEL maintainer="Gearmand Developers https://github.com/gearman/gearmand"
@@ -11,17 +11,17 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
  && apt-get -y upgrade \
  && apt-get -y install \
-	make \
-	gcc \
-	g++ \
-	gperf \
-	libboost-all-dev \
-	libevent-dev \
-	libhiredis-dev \
-	libssl-dev \
-	libtokyocabinet-dev \
-	uuid-dev \
-	wget \
+        make \
+        gcc \
+        g++ \
+        gperf \
+        libboost-all-dev \
+        libevent-dev \
+        libhiredis-dev \
+        libssl-dev \
+        libtokyocabinet-dev \
+        uuid-dev \
+        wget \
  && apt-get clean autoclean \
  && apt-get -y autoremove \
  && rm -rf /var/lib/apt/lists/*
@@ -53,11 +53,6 @@ RUN touch /var/log/gearmand.log \
  && chown gearman:gearman /var/log/gearmand.log
 COPY gearmand.conf /etc/supervisor/conf.d/gearmand.conf
 
-# Links
-RUN ln /usr/sbin/gearmand /sbin/gearmand \
- && ln /usr/bin/gearman /bin/gearman \
- && ln /usr/bin/gearadmin /bin/gearadmin
-
 HEALTHCHECK --interval=5m --timeout=3s --retries=2 \
         CMD test $(supervisorctl status gearmand | awk '{print $2}' | grep 'RUNNING' | wc -l) -eq 1 || exit 1
 
diff --git a/docker/example/gearmand/Makefile b/docker/example/gearmand/Makefile
index e0d40a1e0..2149c2ba7 100644
--- a/docker/example/gearmand/Makefile
+++ b/docker/example/gearmand/Makefile
@@ -1,5 +1,5 @@
 IMAGE_NAME = gearmand
-IMAGE_VERSION = 1.1.19.1
+IMAGE_VERSION = 1.1.21
 USE_CACHE ?=
 
 image:
diff --git a/docker/example/gearmand/gearmand.conf b/docker/example/gearmand/gearmand.conf
index 2cb74b2e6..d516c8f6a 100644
--- a/docker/example/gearmand/gearmand.conf
+++ b/docker/example/gearmand/gearmand.conf
@@ -1,8 +1,8 @@
 [program:gearmand]
 user = gearman
 priority = 100
-###command = /sbin/gearmand --port 4730 --ssl --ssl-ca-file /var/lib/gearman/gearmand-ca.pem --ssl-certificate /var/lib/gearman/gearmand.pem --ssl-key /var/lib/gearman/gearmand.key --verbose INFO -l /var/log/gearmand.log
-command = /sbin/gearmand --port 4730 --verbose INFO -l /var/log/gearman.log
+###command = /usr/sbin/gearmand --port 4730 --ssl --ssl-ca-file /var/lib/gearman/gearmand-ca.pem --ssl-certificate /var/lib/gearman/gearmand.pem --ssl-key /var/lib/gearman/gearmand.key --verbose INFO -l /var/log/gearmand.log
+command = /usr/sbin/gearmand --port 4730 --verbose INFO -l /var/log/gearman.log
 redirect_stderr = true
 stdout_logfile = /var/log/supervisor/gearman.log
 stdout_logfile_maxbytes = 50MB