.github/workflows/tests.yml

@@ -76,9 +76,8 @@ jobs:
       - name: Prepare local tags
         id: localreg
         run: |
-          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
+          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
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

ecs/Dockerfile

@@ -1,8 +1,3 @@
-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} \
@@ -98,7 +93,6 @@ 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

ecs/bin/ejabberdctl

@@ -280,12 +280,6 @@ 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
 }