Merge pull request #4340 from badlop/containers-frictionless

CTL_OVER_HTTP and containers frictionless

Author: badlop

Diff for: .github/container/Dockerfile

@@ -1,20 +1,22 @@
 #' Define default build variables
-## specifc ARGs for METHOD='direct'
 ARG OTP_VSN='27.2'
 ARG ELIXIR_VSN='1.18.1'
-## specifc ARGs for METHOD='package'
-ARG ALPINE_VSN='3.19'
-## general ARGs
 ARG UID='9000'
 ARG USER='ejabberd'
 ARG HOME="opt/$USER"
-ARG METHOD='direct'
 ARG BUILD_DIR="/$USER"
 ARG VERSION='master'
 
 ################################################################################
-#' METHOD='direct' - build and install ejabberd directly from source
-FROM docker.io/erlang:${OTP_VSN}-alpine AS direct
+#' Compile ejabberdapi
+FROM docker.io/golang:1.23-alpine AS api
+RUN go install -v \
+    github.com/processone/ejabberd-api/cmd/ejabberd@master \
+    && mv bin/ejabberd bin/ejabberdapi
+
+################################################################################
+#' build and install ejabberd directly from source
+FROM docker.io/erlang:${OTP_VSN}-alpine AS ejabberd
 
 RUN apk -U add --no-cache \
         autoconf \
@@ -39,7 +41,8 @@ ARG ELIXIR_VSN
 RUN wget -O - https://github.com/elixir-lang/elixir/archive/v$ELIXIR_VSN.tar.gz \
         | tar -xzf -
 
-WORKDIR elixir-$ELIXIR_VSN
+WORKDIR /elixir-$ELIXIR_VSN
+ENV ERL_FLAGS="+JPperf true"
 RUN make install clean
 
 RUN mix local.hex --force \
@@ -50,6 +53,7 @@ COPY / $BUILD_DIR/
 
 WORKDIR $BUILD_DIR
 RUN mv .github/container/ejabberdctl.template . \
+    && mv .github/container/ejabberd.yml.example . \
     && ./autogen.sh \
     && ./configure --with-rebar=mix --enable-all \
     && make deps \
@@ -67,36 +71,18 @@ RUN cp -p $BUILD_DIR/tools/captcha*.sh $HOME-$VERSION/lib
 RUN find "$HOME-$VERSION/bin" -name 'ejabberd' -delete \
     && find "$HOME-$VERSION/releases" -name 'COOKIE' -delete
 
-RUN wget -O "$HOME/conf/cacert.pem" 'https://curl.se/ca/cacert.pem' \
-    && sed -i '/^loglevel:/a \ \
-        \nca_file: /opt/ejabberd/conf/cacert.pem \
-        \ncertfiles: \
-        \n  - /opt/ejabberd/conf/server.pem' "$HOME/conf/ejabberd.yml"
-
-################################################################################
-#' METHOD='package' - install ejabberd from binary tarball package
-FROM docker.io/alpine:${ALPINE_VSN} AS package
-COPY tarballs/ejabberd-*-linux-musl-*.tar.gz /tmp/
-WORKDIR /rootfs
-ARG HOME
-RUN home_root_dir=$(echo $HOME | sed 's|\(.*\)/.*|\1 |') \
-    && mkdir -p $home_root_dir \
-    && ARCH=$(uname -m | sed -e 's/x86_64/x64/;s/aarch64/arm64/') \
-    && tar -xzf /tmp/ejabberd-*-linux-musl-$ARCH.tar.gz -C $home_root_dir
+RUN wget -O "$HOME/conf/cacert.pem" 'https://curl.se/ca/cacert.pem'
 
-################################################################################
 #' Prepare ejabberd for runtime
-FROM ${METHOD} AS ejabberd
 RUN apk -U add --no-cache \
         git \
         libcap \
         openssl
 
-WORKDIR /rootfs
-ARG HOME
 RUN mkdir -p usr/local/bin $HOME/conf $HOME/database $HOME/logs $HOME/upload
 
-ARG BUILD_DIR
+COPY --from=api /go/bin/ejabberdapi usr/local/bin/
+
 RUN if [ ! -d $HOME/.ejabberd-modules ]; \
     then \
         if [ -d $BUILD_DIR/.ejabberd-modules ]; \
@@ -116,11 +102,35 @@ RUN export PEM=$HOME/conf/server.pem \
             -days 3650 \
             -subj "/CN=localhost"
 
+RUN sed -i 's|^#CTL_OVER_HTTP=|CTL_OVER_HTTP=../|' "$HOME/conf/ejabberdctl.cfg"
+
 RUN home_root_dir=$(echo $HOME | sed 's|\(.*\)/.*|\1 |') \
     && setcap 'cap_net_bind_service=+ep' $(find $home_root_dir -name beam.smp) \
     && echo -e \
         "#!/bin/sh \
         \n[ -z \$ERLANG_NODE_ARG ] && export ERLANG_NODE_ARG=ejabberd@localhost \
+        \nexport EMA=\"\$EJABBERD_MACRO_ADMIN\" \
+        \nexport HOST=\"\${EJABBERD_MACRO_HOST:-localhost}\" \
+        \nif [ -n \"\$EMA\" ] \
+        \nthen \
+        \n    if [ \"\$EMA\" != \"\${EMA%%@*}\" ] \
+        \n    then \
+        \n        export USERNAME=\"\${EMA%%@*}\" \
+        \n        export HOST=\"\${EMA##*@}\" \
+        \n    else \
+        \n        export USERNAME=\"\$EMA\" \
+        \n        export SHOW_WARNING=\"true\" \
+        \n    fi \
+        \nelif [ -n \"\$REGISTER_ADMIN_PASSWORD\" ] \
+        \nthen \
+        \n    export USERNAME=\"admin\" \
+        \nelse \
+        \n    export USERNAME=\"\$(od -A n -N 8 -t x8 /dev/urandom)\" \
+        \nfi \
+        \nexport EJABBERD_MACRO_ADMIN=\"\$USERNAME@\$HOST\" \
+        \n[ -n \"\$SHOW_WARNING\" ] && echo \"WARNING: The EJABBERD_MACRO_ADMIN environment variable was set to '\$EMA', but it should include the host... I'll overwrite it to become '\$EJABBERD_MACRO_ADMIN'.\" \
+        \n[ -n \"\$CTL_ON_CREATE\" ] && export SEPARATOR=\";\" \
+        \n[ -n \"\$REGISTER_ADMIN_PASSWORD\" ] && export CTL_ON_CREATE=\"register \${EJABBERD_MACRO_ADMIN%%@*} \${EJABBERD_MACRO_ADMIN##*@} \$REGISTER_ADMIN_PASSWORD \$SEPARATOR \$CTL_ON_CREATE\" \
         \nexport CONFIG_DIR=/$HOME/conf \
         \nexport LOGS_DIR=/$HOME/logs \
         \nexport SPOOL_DIR=/$HOME/database \
@@ -137,28 +147,28 @@ RUN home_root_dir=$(echo $HOME | sed 's|\(.*\)/.*|\1 |') \
 ARG UID
 RUN chown -R $UID:$UID $HOME
 
+RUN cp /rootfs/$HOME-$VERSION/lib/captcha*.sh usr/local/bin/
+RUN mkdir $HOME/sql \
+    && find /rootfs/$HOME-$VERSION/lib/ -name *.sql -exec cp {} $HOME/sql \; -exec cp {} $HOME/database \;
+
 ################################################################################
-#' METHOD='direct' - Remove erlang/OTP & rebar3
-FROM docker.io/erlang:${OTP_VSN}-alpine AS runtime-direct
+#' Remove erlang/OTP & rebar3
+FROM docker.io/erlang:${OTP_VSN}-alpine AS runtime
 RUN apk del .erlang-rundeps \
     && rm -f $(which rebar3) \
     && find /usr -type d -name 'erlang' -exec rm -rf {} + \
     && find /usr -type l -exec test ! -e {} \; -delete
 
-################################################################################
-#' METHOD='package' - define runtime base image
-FROM docker.io/alpine:${ALPINE_VSN} AS runtime-package
-
-################################################################################
 #' Update alpine, finalize runtime environment
-FROM runtime-${METHOD} AS runtime
 COPY --from=ejabberd /tmp/runDeps /tmp/runDeps
 RUN apk -U upgrade --available --no-cache \
     && apk add --no-cache \
         $(cat /tmp/runDeps) \
         so:libcap.so.2 \
         so:libtdsodbc.so.0 \
+        curl \
         tini \
+    && rm /tmp/runDeps \
     && ln -fs /usr/lib/libtdsodbc.so.0 /usr/lib/libtdsodbc.so
 
 ARG USER
@@ -167,9 +177,13 @@ ARG HOME
 RUN addgroup $USER -g $UID \
     && adduser -s /sbin/nologin -D -u $UID -h /$HOME -G $USER $USER
 
+RUN ln -fs /usr/local/bin/ /opt/ejabberd/bin
+RUN rm -rf /home \
+    && ln -fs /opt /home
+
 ################################################################################
 #' Build together production image
-FROM scratch AS prod
+FROM scratch
 ARG USER
 ARG HOME
 
@@ -186,7 +200,7 @@ HEALTHCHECK \
 WORKDIR /$HOME
 USER $USER
 VOLUME ["/$HOME"]
-EXPOSE 1883 4369-4399 5210 5222 5269 5280 5443
+EXPOSE 1880 1883 4369-4399 5210 5222 5269 5280 5443
 
 ENTRYPOINT ["/sbin/tini","--","ejabberdctl"]
 CMD ["foreground"]