From 2c1ee698ccf6a10a5c00c34d9a61670111105dd7 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 26 Jan 2023 15:53:27 +0100
Subject: [PATCH] Container: Copy captcha scripts to /opt/ejabberd-*/lib like
 the installers

Instead of a path like
  /opt/ejabberd-master/lib/ejabberd-23.1.0/priv/bin
they are now in
  /opt/ejabberd-master/lib
---
 .github/container/Dockerfile | 4 +---
 CONTAINER.md                 | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/container/Dockerfile b/.github/container/Dockerfile
index 221cfbb7c..9c5b2bfa0 100644
--- a/.github/container/Dockerfile
+++ b/.github/container/Dockerfile
@@ -42,9 +42,7 @@ RUN cp -r _build/prod/rel/ejabberd/ /opt/ejabberd-$VERSION \
     && mkdir -p /opt/ejabberd \
     && mv /opt/ejabberd-$VERSION/conf /opt/ejabberd/conf
 
-RUN BINPATH=$(dirname $(find /opt -name msgs))/bin/ \
-    && mkdir -p $BINPATH \
-    && cp tools/captcha*.sh $BINPATH
+RUN cp -p 'tools/captcha'*'.sh' "/opt/ejabberd-$VERSION/lib"
 
 RUN [ ! -d .ejabberd-modules ] || cp -r .ejabberd-modules /opt/ejabberd/
 
diff --git a/CONTAINER.md b/CONTAINER.md
index d5643a7ce..697084442 100644
--- a/CONTAINER.md
+++ b/CONTAINER.md
@@ -156,7 +156,7 @@ docker exec -it ejabberd vi conf/ejabberd.yml
 
 and add the required options:
 ```
-captcha_cmd: /opt/ejabberd-22.04/lib/ejabberd-22.04/priv/bin/captcha.sh
+captcha_cmd: /opt/ejabberd-22.04/lib/captcha.sh
 captcha_url: https://localhost:5443/captcha
 ```