From 365f71e6042a4701261d6ff1f2596959b780b878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= <marcio.fernandes@outlook.pt>
Date: Sun, 19 Jan 2025 03:07:48 +0000
Subject: [PATCH] mosquitto start using config section, removed custom docker
 image

---
 .gitea/workflows/ deploy-docker-image.yml | 27 -----------------------
 .gitea/workflows/ deploy-to-homesrv.yml   |  7 ------
 docker-compose.yml                        | 18 ++++++++-------
 docker/Dockerfile                         | 11 ---------
 docker/README.md                          | 22 ------------------
 docker/run.sh                             | 10 ---------
 6 files changed, 10 insertions(+), 85 deletions(-)
 delete mode 100644 .gitea/workflows/ deploy-docker-image.yml
 delete mode 100644 docker/Dockerfile
 delete mode 100644 docker/README.md
 delete mode 100644 docker/run.sh

diff --git a/.gitea/workflows/ deploy-docker-image.yml b/.gitea/workflows/ deploy-docker-image.yml
deleted file mode 100644
index cc684e8..0000000
--- a/.gitea/workflows/ deploy-docker-image.yml	
+++ /dev/null
@@ -1,27 +0,0 @@
-on: 
-  push:
-  schedule:
-    - cron: '0 3 * * *'
-jobs:
-  deploy-docker-image:
-    runs-on: "ubuntu-latest"
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Log in to git.limbosolutions.com docker registry
-      uses: docker/login-action@v3
-      with:
-        registry: git.limbosolutions.com
-        username: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_USERNAME }}
-        password: ${{ secrets.GITLIMBO_DOCKER_REGISTRY_PASSWORD }}
-
-    - name: Build and push Docker Image
-      id: push
-      uses: docker/build-push-action@v6
-      with:
-        context: ${{gitea.workspace}}/docker
-        file: ${{gitea.workspace}}/docker/Dockerfile
-        push: true
-        tags: git.limbosolutions.com/marcio.fernandes/mosquitto:latest
-
diff --git a/.gitea/workflows/ deploy-to-homesrv.yml b/.gitea/workflows/ deploy-to-homesrv.yml
index 6a66753..8e16f4b 100644
--- a/.gitea/workflows/ deploy-to-homesrv.yml	
+++ b/.gitea/workflows/ deploy-to-homesrv.yml	
@@ -9,12 +9,5 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v2
     
-    - name: setup docker compose .env
-      run: |
-        cat <<EOF >${{ github.workspace }}/.env
-        LISTENER_PORT=1883
-        ALLOW_ANONYMOUS=true
-        EOF
-
     - name: docker compose up
       run: docker compose up -d --pull always
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b748ca..657dd2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,23 +1,25 @@
 services:
   mosquitto:
-    #build:
-    #  dockerfile: Dockerfile
-    #  context: ./docker
-    image: git.limbosolutions.com/marcio.fernandes/mosquitto:latest
+    image: eclipse-mosquitto:latest
     ports:
       - '1883:1883'
       - '8883:8883'
     environment:
       - TZ= Europe/Lisbon
-      - |
-        MOSQUITTO_CONFIG_CONTENT=
-        listener ${LISTENER_PORT}
-        allow_anonymous ${ALLOW_ANONYMOUS}
+      - MOSQUITTO_CONFIG_CONTENT=${MOSQUITTO_CONFIG_CONTENT}
     volumes:
       - data:/mosquitto/data
+    configs:
+      - mosquitto_conf
+    command: /usr/sbin/mosquitto -c /mosquitto_conf
     restart: unless-stopped
 volumes:
   data:
+configs:
+  mosquitto_conf:
+    content: |
+      listener 1883
+      allow_anonymous true
 
 
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 1d3d6c0..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM eclipse-mosquitto:latest
-LABEL org.opencontainers.image.documentation="https://git.limbosolutions.com/marcio.fernandes/mosquitto/src/branch/master/docker/README.md"
-LABEL org.opencontainers.image.url="https://git.limbosolutions.com/marcio.fernandes/mosquitto"
-LABEL org.opencontainers.image.description="For more information and examples check Documentation."
-
-COPY run.sh /mosquitto/run.sh
-
-RUN chmod +x mosquitto/run.sh
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/mosquitto/run.sh"]
\ No newline at end of file
diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index d3edc9f..0000000
--- a/docker/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# mosquitto - docker
-
-``` yaml
-services:
-  mosquitto:
-    image: git.limbosolutions.com/marcio.fernandes/mosquitto:latest
-    ports:
-      - '1883:1883'
-      - '8883:8883'
-    environment:
-      - TZ= Europe/Lisbon
-      - |
-        MOSQUITTO_CONFIG_CONTENT=
-        listener ${LISTENER_PORT}
-        allow_anonymous ${ALLOW_ANONYMOUS}
-    volumes:
-      - data:/mosquitto/data
-    restart: unless-stopped
-volumes:
-  data:
-
-```
diff --git a/docker/run.sh b/docker/run.sh
deleted file mode 100644
index db15bad..0000000
--- a/docker/run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-cat << EOF > /mosquitto/config/mosquitto.conf
-$MOSQUITTO_CONFIG_CONTENT
-EOF
-
-echo "-------------- config --------------"
-cat /mosquitto/config/mosquitto.conf
-echo "------------------------------------"
-
-/usr/sbin/mosquitto -c /mosquitto/config/mosquitto.conf
\ No newline at end of file