25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00

Use alternate method to get priv/ path when copying captcha scripts

This commit is contained in:
Badlop 2022-05-06 16:22:31 +02:00
parent fbeaa2e03a
commit e5782a519a

View File

@ -42,10 +42,9 @@ RUN cp -r _build/prod/rel/ejabberd/ /opt/ejabberd-$VERSION \
&& mkdir -p /opt/ejabberd \ && mkdir -p /opt/ejabberd \
&& mv /opt/ejabberd-$VERSION/conf /opt/ejabberd/conf && mv /opt/ejabberd-$VERSION/conf /opt/ejabberd/conf
RUN DESCRIBE=$(git describe --tags) \ RUN BINPATH=$(dirname $(find /opt -name msgs))/bin/ \
&& MIXVER=$(echo $DESCRIBE.0 | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') \ && mkdir $BINPATH \
&& mkdir /opt/ejabberd-$VERSION/lib/ejabberd-$MIXVER/priv/bin \ && cp tools/captcha*.sh $BINPATH
&& cp tools/captcha*.sh /opt/ejabberd-$VERSION/lib/ejabberd-$MIXVER/priv/bin/
RUN export PEM=/opt/ejabberd/conf/server.pem \ RUN export PEM=/opt/ejabberd/conf/server.pem \
&& curl -o "/opt/ejabberd/conf/cacert.pem" 'https://curl.se/ca/cacert.pem' \ && curl -o "/opt/ejabberd/conf/cacert.pem" 'https://curl.se/ca/cacert.pem' \