wip

Author: NelsonVides

.github/workflows/ci.yml

@@ -13,12 +13,10 @@ jobs:
     name: OTP ${{matrix.otp}}
     strategy:
       matrix:
-        otp: ['25.3', '24.3.4.9']
+        otp: ['26.0', '25.3', '24.3']
     runs-on: 'ubuntu-22.04'
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ matrix.otp }}
@@ -34,14 +32,17 @@ jobs:
     name: docker container test with OTP ${{matrix.otp}}
     strategy:
       matrix:
-        otp: ['25.3', '24.3.4.9']
+        otp: ['25.3', '24.3']
     runs-on: 'ubuntu-22.04'
     env:
       OTP_RELEASE: ${{ matrix.otp }}
     steps:
       - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
+      - uses: erlef/setup-beam@v1
         with:
-          fetch-depth: 0
+          otp-version: ${{ matrix.otp }}
+          rebar3-version: '3.21.0'
       - run: ./ci/build_docker_image.sh
       - run: ./ci/start_demo_cluster.sh
       - run: ./ci/test_amoc_cluster.sh

Dockerfile

@@ -1,10 +1,8 @@
-ARG otp_vsn=25.3
+ARG otp_vsn
 FROM erlang:${otp_vsn} as builder
 MAINTAINER Erlang Solutions <mongoose-im@erlang-solutions.com>
 
-RUN useradd -ms /bin/bash amoc
-USER amoc
-WORKDIR /home/amoc/amoc_arsenal_xmpp
+WORKDIR /amoc_arsenal_xmpp
 
 COPY ./rebar.config ./rebar.lock ./
 RUN rebar3 deps && rebar3 compile -d
@@ -13,6 +11,6 @@ COPY ./rel rel
 COPY ./src src
 RUN rebar3 release
 
-ENV PATH "/home/amoc/amoc_arsenal_xmpp/_build/default/rel/amoc_arsenal_xmpp/bin:${PATH}"
+ENV PATH "/amoc_arsenal_xmpp/_build/default/rel/amoc_arsenal_xmpp/bin:${PATH}"
 
-CMD ["/home/amoc/amoc_arsenal_xmpp/_build/default/rel/amoc_arsenal_xmpp/bin/amoc_arsenal_xmpp", "console", "-noshell", "-noinput", "+Bd"]
+CMD ["/amoc_arsenal_xmpp/_build/default/rel/amoc_arsenal_xmpp/bin/amoc_arsenal_xmpp", "console", "-noshell", "-noinput", "+Bd"]

ci/build_docker_image.sh

@@ -6,14 +6,11 @@ cd "$git_root"
 
 version="$(git rev-parse --short HEAD)"
 otp_vsn="${OTP_RELEASE:-25.3}"
-rebar_vsn="${REBAR_RELEASE:-3.20.0}"
 echo "ERLANG/OTP '${otp_vsn}'"
-echo "REBAR '${rebar_vsn}'"
 
 docker build \
     -f Dockerfile \
     -t "amoc-arsenal-xmpp:${version}" \
     -t "amoc-arsenal-xmpp:latest" \
     --build-arg "otp_vsn=${otp_vsn}" \
-    --build-arg "rebar_vsn=${rebar_vsn}" \
     .

ci/helper.sh

@@ -69,7 +69,7 @@ docker_compose() {
 }
 
 function amoc_eval() {
-    local exec_path="/home/amoc/amoc_arsenal_xmpp/_build/default/rel/amoc_arsenal_xmpp/bin/amoc_arsenal_xmpp"
+    local exec_path="/amoc_arsenal_xmpp/_build/default/rel/amoc_arsenal_xmpp/bin/amoc_arsenal_xmpp"
     local service="$1"
     shift 1
     docker_compose exec -T "$service" "$exec_path" eval "$@"