[pull] master from processone:master

.github/workflows/code-server.yml

@@ -0,0 +1,42 @@
+name: code-server
+
+on:
+  push:
+    paths:
+      - '.github/workflows/code-server.yml'
+      - 'code-server/**'
+
+jobs:
+
+  code-server:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Build image
+        run: docker build
+               code-server
+               --tag code-server
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push image
+        run: |
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/code-server
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "master" ] && VERSION=latest
+          docker tag code-server $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.github/workflows/devcontainer.yml

@@ -0,0 +1,42 @@
+name: devcontainer
+
+on:
+  push:
+    paths:
+      - '.github/workflows/devcontainer.yml'
+      - 'devcontainer/**'
+
+jobs:
+
+  devcontainer:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Build image
+        run: docker build
+               devcontainer
+               --tag devcontainer
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push image
+        run: |
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/devcontainer
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "master" ] && VERSION=latest
+          docker tag devcontainer $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.github/workflows/tests.yml

@@ -2,44 +2,193 @@ name: Tests
 
 on:
   push:
-    paths-ignore:
-      - '**.md'
-      - '**.bat'
+    paths:
+      - '.github/workflows/tests.yml'
+      - 'ecs/**'
+      - 'mix/**'
   pull_request:
-    paths-ignore:
-      - '**.md'
-      - '**.bat'
+    paths:
+      - '.github/workflows/tests.yml'
+      - 'ecs/**'
+      - 'mix/**'
+
+env:
+  REGISTRY_GHCR: ghcr.io
+  REGISTRY_LOCAL: localhost:5000
+  REGISTRY_DOCKER: docker.io
+  MIX_IMAGENAME_GHCR: ${{ github.repository_owner }}/mix
+  ECS_IMAGENAME_GHCR: ${{ github.repository_owner }}/ecs
+  MIX_IMAGENAME_DOCKERHUB: ejabberd/mix
+  ECS_IMAGENAME_DOCKERHUB: ejabberd/ecs
 
 jobs:
+
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
       max-parallel: 1
+    permissions:
+      packages: write
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
 
     steps:
+
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY_GHCR }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build ecs image
+      - name: Get git describe
+        id: gitdescribe
+        run: echo "ver=$(git describe --tags --exact-match 2>/dev/null || echo latest)" >> $GITHUB_OUTPUT
+
+      - name: Extract mix metadata (tags, labels)
+        id: mixmeta
+        if: github.ref_type == 'tag'
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.REGISTRY_GHCR }}/${{ env.MIX_IMAGENAME_GHCR }}
+            ${{ env.REGISTRY_DOCKER }}/${{ env.MIX_IMAGENAME_DOCKERHUB }}
+          labels: |
+            org.opencontainers.image.revision=${{ steps.gitdescribe.outputs.ver }}
+            org.opencontainers.image.licenses=GPL-2.0
+            org.opencontainers.image.vendor=ProcessOne
+
+      - name: Extract ecs metadata (tags, labels)
+        id: ecsmeta
+        if: github.ref_type == 'tag'
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.REGISTRY_GHCR }}/${{ env.ECS_IMAGENAME_GHCR }}
+            ${{ env.REGISTRY_DOCKER }}/${{ env.ECS_IMAGENAME_DOCKERHUB }}
+          labels: |
+            org.opencontainers.image.revision=${{ steps.gitdescribe.outputs.ver }}
+            org.opencontainers.image.licenses=GPL-2.0
+            org.opencontainers.image.vendor=ProcessOne
+
+      - name: Prepare local tags
+        id: localreg
         run: |
-            cd ecs
-            ./build.sh
+          tag="$(echo ${{ github.ref_name }} | sed -e 's|[/]\+|-|g')"
+          echo "mixlocaltag=${{ env.REGISTRY_LOCAL }}/${{ env.MIX_IMAGENAME_GHCR }}:$tag" >> $GITHUB_OUTPUT
+          echo "ecslocaltag=${{ env.REGISTRY_LOCAL }}/${{ env.ECS_IMAGENAME_GHCR }}:$tag" >> $GITHUB_OUTPUT
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+
+      - name: Build and push local mix image
+        uses: docker/build-push-action@v5
+        with:
+          build-args: |
+            VERSION=${{ steps.gitdescribe.outputs.ver }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          context: mix
+          labels: ${{ steps.mixmeta.outputs.labels }}
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ steps.localreg.outputs.mixlocaltag }}
+
+      - name: Prepare ecs Dockerfile
+        run: sed -i 's|docker.io/ejabberd/mix|${{ steps.localreg.outputs.mixlocaltag }}|g' ecs/Dockerfile
+
+      - name: Build and push local ecs image
+        uses: docker/build-push-action@v5
+        with:
+          build-args: |
+            VERSION=${{ steps.gitdescribe.outputs.ver }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          context: ecs
+          labels: ${{ steps.ecsmeta.outputs.labels }}
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ steps.localreg.outputs.ecslocaltag }}
 
       - name: Run ecs image
         run: |
             docker images
-            docker run --name ejabberd -d -p 5222:5222 ejabberd/ecs:latest
+            docker run --name ejabberd -d -p 5222:5222 ${{ steps.localreg.outputs.ecslocaltag }}
 
       - name: Wait ejabberd started
         run: |
             docker exec ejabberd bin/ejabberdctl started
 
       - name: Check ecs results
+        if: always()
         run: |
             docker ps -s
             docker logs ejabberd
             docker logs ejabberd | grep -q "Start accepting TCP connections" || exit 1
             docker logs ejabberd | grep -q "error" && exit 1 || exit 0
             docker logs ejabberd | grep -q "Error" && exit 1 || exit 0
+
+      - name: Save image
+        run: |
+            docker image save ${{ steps.localreg.outputs.ecslocaltag }} --output ejabberd-latest.tar
+
+      - name: Upload image
+        uses: actions/upload-artifact@v4
+        with:
+          name: ejabberd-image
+          path: ejabberd-latest.tar
+
+      - run: |
+          echo "::notice::To get this image, download ejabberd-image.zip, "\
+                         "uncompress it and run: " \
+                         "docker image load -i ejabberd-latest.tar"
+
+      - name: Build and push mix image
+        uses: docker/build-push-action@v5
+        if: github.ref_type == 'tag'
+        with:
+          build-args: |
+            VERSION=${{ steps.gitdescribe.outputs.ver }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          context: mix
+          labels: ${{ steps.mixmeta.outputs.labels }}
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ steps.mixmeta.outputs.tags }}
+
+      - name: Build and push ecs image
+        uses: docker/build-push-action@v5
+        if: github.ref_type == 'tag'
+        with:
+          build-args: |
+            VERSION=${{ steps.gitdescribe.outputs.ver }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          context: ecs
+          labels: ${{ steps.ecsmeta.outputs.labels }}
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ steps.ecsmeta.outputs.tags }}

README.md

@@ -3,12 +3,33 @@
 
 # docker-ejabberd
 
-This repository contains a set of Docker images for ejabberd.
+This repository contains a set of container images to run or develop ejabberd:
 
-- [ejabberd/mix](https://hub.docker.com/r/ejabberd/mix/): This image allows you to build develop
-  environment for ejabberd, using all dependencies packaged from the Docker image. You do not
-  need anything else to build ejabberd from source and write your own ejabberd plugins.
-- [ejabberd/ecs](https://hub.docker.com/r/ejabberd/ecs/): This image is suitable for running
-  ejabberd with Docker in a simple, single-node setup.
+- [mix](mix/) (published in [docker.io/ejabberd/mix](https://hub.docker.com/r/ejabberd/mix/)
+and [ghcr.io/processone/mix](https://github.com/processone/docker-ejabberd/pkgs/container/mix)):
 
-Please read the README file in each repository for documentation for each image.
+  Build a development environment for ejabberd. See [mix README](mix/README.md) file for details.
+
+- [ecs](ecs/) (published in [docker.io/ejabberd/ecs](https://hub.docker.com/r/ejabberd/ecs/)
+and [ghcr.io/processone/ecs](https://github.com/processone/docker-ejabberd/pkgs/container/ecs)):
+
+  Run ejabberd in a container with simple setup.
+  See [ecs README](ecs/README.md) file for details.
+
+- [code-server](code-server/) (published in [ghcr.io/processone/code-server](https://github.com/orgs/processone/packages/container/package/code-server)):
+
+  Run Coder's code-server with a local ejabberd git clone.
+  See [VSCode section](https://docs.ejabberd.im/developer/vscode/) in ejabberds Docs.
+
+- [devcontainer](devcontainer/) (published in [ghcr.io/processone/devcontainer](https://github.com/orgs/processone/packages/container/package/devcontainer)):
+
+  Use as a Dev Container for ejabberd in Visual Studio Code.
+  See [VSCode section](https://docs.ejabberd.im/developer/vscode/) in ejabberds Docs.
+
+The [ejabberd source code repository](https://github.com/processone/ejabberd) also provides:
+
+- [ejabberd](https://github.com/processone/ejabberd/tree/master/.github/container) (published in [ghcr.io/processone/ejabberd](https://github.com/processone/ejabberd/pkgs/container/ejabberd)):
+
+  Run ejabberd in a container with simple setup.
+  See [ejabberd's CONTAINER](https://github.com/processone/ejabberd/blob/master/CONTAINER.md) file for details.
+  Check the [differences between this image and `ecs`](https://github.com/processone/docker-ejabberd/blob/master/ecs/HUB-README.md#alternative-image-in-github).

code-server/Dockerfile

@@ -0,0 +1,30 @@
+FROM debian:sid-slim
+
+RUN apt-get update \
+    && apt-get -y --no-install-recommends install \
+        curl ca-certificates \
+        autoconf automake git make gcc g++ \
+        erlang erlang-dev elixir rebar3 \
+        libexpat1-dev libgd-dev libpam0g-dev \
+        libsqlite3-dev libwebp-dev libyaml-dev \
+        libssl-dev
+
+RUN curl -fsSL https://code-server.dev/install.sh | sh
+
+RUN addgroup vscode --gid 1000 \
+    && adduser --shell /bin/bash --ingroup vscode vscode -u 1000
+
+USER vscode
+
+RUN /usr/bin/code-server --install-extension erlang-ls.erlang-ls
+
+WORKDIR /home/vscode
+RUN echo "export PATH=/workspaces/ejabberd/_build/relive:$PATH" >>.bashrc \
+    && echo "COOKIE" >.erlang.cookie \
+    && chmod 400 .erlang.cookie
+
+WORKDIR /workspaces/ejabberd
+VOLUME ["workspaces/ejabberd"]
+EXPOSE 1870 1883 4369-4399 5210 5222 5269 5280 5443
+
+ENTRYPOINT ["code-server", "--bind-addr", "0.0.0.0:1870", "--auth", "none", "/workspaces/ejabberd"]