diff options
author | Badlop <badlop@process-one.net> | 2022-05-06 16:22:31 +0200 |
---|---|---|
committer | Badlop <badlop@process-one.net> | 2022-05-06 17:30:24 +0200 |
commit | e5782a519a10bcf3ddc5a9efa96d467527edc794 (patch) | |
tree | 4757f1fe4e4bb2bba606016df0f6dfe76fb6d288 /.github | |
parent | Remove dependabot because it gets fired in forks too (diff) |
Use alternate method to get priv/ path when copying captcha scripts
Diffstat (limited to '.github')
-rw-r--r-- | .github/container/Dockerfile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/container/Dockerfile b/.github/container/Dockerfile index 5b01c7393..a712f9b71 100644 --- a/.github/container/Dockerfile +++ b/.github/container/Dockerfile @@ -42,10 +42,9 @@ RUN cp -r _build/prod/rel/ejabberd/ /opt/ejabberd-$VERSION \ && mkdir -p /opt/ejabberd \ && mv /opt/ejabberd-$VERSION/conf /opt/ejabberd/conf -RUN DESCRIBE=$(git describe --tags) \ - && MIXVER=$(echo $DESCRIBE.0 | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') \ - && mkdir /opt/ejabberd-$VERSION/lib/ejabberd-$MIXVER/priv/bin \ - && cp tools/captcha*.sh /opt/ejabberd-$VERSION/lib/ejabberd-$MIXVER/priv/bin/ +RUN BINPATH=$(dirname $(find /opt -name msgs))/bin/ \ + && mkdir $BINPATH \ + && cp tools/captcha*.sh $BINPATH RUN export PEM=/opt/ejabberd/conf/server.pem \ && curl -o "/opt/ejabberd/conf/cacert.pem" 'https://curl.se/ca/cacert.pem' \ |