Compare commits

...

4 Commits

Author SHA1 Message Date
Badlop 72d317a02b Halt ejabberd if a command in CTL_ON_ fails during ejabberd startup (#97) 11 months ago
badlop 9361646acd
Merge pull request #98 from sando38/master
Dockerfile: compile ejabberdapi during build
11 months ago
sando38 47498d8d70 actions: fix test 11 months ago
sando38 3d5efe9e76 Dockerfile: compile ejabberdapi during build 11 months ago

@ -76,8 +76,9 @@ jobs:
- name: Prepare local tags
id: localreg
run: |
echo "mixtag=${{ env.REGISTRY_LOCAL }}/${{ env.MIX_IMAGE_NAME }}:${{ github.ref_name }}" >> $GITHUB_OUTPUT
echo "ecstag=${{ env.REGISTRY_LOCAL }}/${{ env.ECS_IMAGE_NAME }}:${{ github.ref_name }}" >> $GITHUB_OUTPUT
tag="$(echo ${{ github.ref_name }} | sed -e 's|[/]\+|-|g')"
echo "mixtag=${{ env.REGISTRY_LOCAL }}/${{ env.MIX_IMAGE_NAME }}:$tag" >> $GITHUB_OUTPUT
echo "ecstag=${{ env.REGISTRY_LOCAL }}/${{ env.ECS_IMAGE_NAME }}:$tag" >> $GITHUB_OUTPUT
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

@ -1,3 +1,8 @@
FROM docker.io/golang:1.20-alpine AS api
RUN go install -v \
github.com/processone/ejabberd-api/cmd/ejabberd@master \
&& mv bin/ejabberd bin/ejabberdapi
FROM ejabberd/mix as builder
ARG VERSION
ENV VERSION=${VERSION:-latest} \
@ -93,6 +98,7 @@ RUN apk upgrade --update-cache --no-progress \
WORKDIR $HOME
COPY --from=builder /ejabberd/runtime .
COPY bin/* bin/
COPY --from=api /go/bin/ejabberdapi bin/ejabberdapi
RUN chmod 755 bin/ejabberdctl bin/ejabberdapi bin/erl
COPY --chown=ejabberd:ejabberd conf conf/
ADD --chown=ejabberd:ejabberd https://download.process-one.net/cacert.pem conf/cacert.pem

Binary file not shown.

@ -280,6 +280,12 @@ post_waiter_loop()
TAIL=${LIST#* ; }
echo ":> ejabberdctl $HEAD"
$0 $HEAD
ctlstatus=$?
if [ $ctlstatus -ne 0 ] ; then
echo ":> FAILURE in command '$HEAD' !!! Stopping ejabberd..."
$0 halt > /dev/null
exit $ctlstatus
fi
[ "$HEAD" = "$TAIL" ] || post_waiter_loop $TAIL
}

Loading…
Cancel
Save