diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index c33f0e8..d4f38ec 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -1,36 +1,31 @@ -# This is a basic workflow to help you get started with Actions - name: CI - -# Controls when the workflow will run on: - # Triggers the workflow on push or pull request events but only for the master branch push: branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install yamllint + run: pip install yamllint + - name: Lint YAML files + run: yamllint -d .github/workflows/conf_yaml ./composes-files/* + build: runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - - # Runs a single command using the runners shell - name: Generate json file run: python3 .github/workflows/generate-template-json.py - name: update file and push to remote run: | git config --global user.name "github-actions[bot]" git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add -A git commit -m "Automatic generation of the file templates-portainer.json" git push diff --git a/.github/workflows/conf_yaml b/.github/workflows/conf_yaml new file mode 100644 index 0000000..498da8a --- /dev/null +++ b/.github/workflows/conf_yaml @@ -0,0 +1,27 @@ +--- + +extends: default + +rules: + braces: + level: warning + max-spaces-inside: 1 + brackets: + level: warning + max-spaces-inside: 1 + colons: + level: warning + commas: disable + comments: disable + comments-indentation: disable + document-start: disable + empty-lines: + level: warning + hyphens: + level: warning + indentation: + level: error + indent-sequences: consistent + new-line-at-end-of-file: disable + line-length: disable + truthy: disable \ No newline at end of file diff --git a/composes-files/adminer.yml b/composes-files/adminer.yml index 8f6661a..a81ba62 100644 --- a/composes-files/adminer.yml +++ b/composes-files/adminer.yml @@ -11,7 +11,7 @@ #& logo: https://git.spip.net/repo-avatars/1417-1f8a32370f4028c9c0c216787ad4916c #% SERVICE: Name of the service (No spaces or points) [adminer] -#% URL: Service URL (Example: service.papamica.fr or service.com) +#% URL: Service URL (Example: service.papamica.fr or service.com) #% NETWORK: Your Traefik network (Example: proxy) [proxy] # Work with Portainer diff --git a/composes-files/apprise-api.yml b/composes-files/apprise-api.yml index 0090255..2983f73 100644 --- a/composes-files/apprise-api.yml +++ b/composes-files/apprise-api.yml @@ -39,7 +39,6 @@ services: - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.http.services.$SERVICE.loadbalancer.server.port=8000" - "traefik.docker.network=$NETWORK" - networks: default: external: diff --git a/composes-files/bookstack.yml b/composes-files/bookstack.yml index 8430f0e..2de6b44 100644 --- a/composes-files/bookstack.yml +++ b/composes-files/bookstack.yml @@ -53,7 +53,7 @@ services: - "traefik.http.routers.$SERVICE.tls=true" - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - + bookstack_db: image: linuxserver/mariadb:version-10.5.12-r0 container_name: bookstack_db @@ -66,15 +66,15 @@ services: - MYSQL_USER=$DB_USER - MYSQL_PASSWORD=$DB_PASSWORD healthcheck: - test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] - timeout: 20s - retries: 10 + test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] + timeout: 20s + retries: 10 volumes: - $DATA_LOCATION/$SERVICE/db:/config restart: unless-stopped networks: - default - + networks: default: external: diff --git a/composes-files/cachethq.yml b/composes-files/cachethq.yml index c7d3f98..e69de29 100644 --- a/composes-files/cachethq.yml +++ b/composes-files/cachethq.yml @@ -1,95 +0,0 @@ -# Maintainer: Mickael "PAPAMICA" Asseline -# Update: 2022-05-10 - -#& type: 3 -#& title: CachetHQ -#& description: Uptime monitor alternative -#& note: Website: CachetHQ.io

Warning: Check log at the first run! -#& categories: SelfHosted, Monitoring, PAPAMICA -#& platform: linux -#& logo: http://cachethq.io/img/social/CachetFB-V.png - -#% SERVICE: Name of the service (No spaces or points) [cachethq] -#% DATA_LOCATION: data localization (Example: /apps/service) [/_data/apps] -#% URL: Service URL (Example: service.papamica.fr or service.com) -#% NETWORK: Your Traefik network (Example: proxy) [proxy] -#% DB_USER: Database user (No spaces or points) [cachethq] -#% DB_PASSWORD: Database user password -#% TIME_ZONE: Time zone (Example : Europe/Paris) Europe/Paris - -# Work with Portainer -version: "2" - -services: - postgres: - container_name: $SERVICE-db - image: postgres:14 - volumes: - - $DATA_LOCATION/$SERVICE/db:/var/lib/postgresql/data - environment: - - POSTGRES_USER=$DB_USER - - POSTGRES_PASSWORD=$DB_PASSWORD - restart: always - healthcheck: - test: ["CMD-SHELL", "pg_isready -U $DB_USER"] - interval: 10s - timeout: 5s - retries: 5 - labels: - - "autoupdate=monitor" # https://github.com/PAPAMICA/container-updater - networks: - - default - - # CachetHQ : https://github.com/CachetHQ/Cachet - cachet: - image: cachethq/docker:latest - container_name: $SERVICE - restart: always - links: - - postgres:postgres - healthcheck: - test: curl --fail http://localhost:8000 || exit 1 - interval: 1m - timeout: 30s - retries: 3 - environment: - - TZ=$TIME_ZONE -# - MAIL_DRIVER=smtp -# - MAIL_HOST= -# - MAIL_PORT=587 -# - MAIL_USERNAME= -# - MAIL_PASSWORD= -# - MAIL_ADDRESS= -# - MAIL_NAME=Notifications -# - MAIL_ENCRYPTION=tls - - DB_DRIVER=pgsql - - DB_HOST=postgres - - DB_PORT=5432 - - DB_DATABASE=postgres - - DB_USERNAME=$DB_USER - - DB_PASSWORD=$DB_PASSWORD - - DB_PREFIX=chq_ - - APP_KEY= - - APP_LOG=errorlog -# - APP_ENV=${APP_ENV:-production} - - APP_DEBUG=false - - DEBUG=false - depends_on: - - postgres - networks: - - default - labels: - - "autoupdate=monitor" # https://github.com/PAPAMICA/container-updater - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=https" - - "traefik.http.routers.$SERVICE.rule=Host(`$URL`)" - - "traefik.http.routers.$SERVICE.tls=true" - - "traefik.http.routers.$SERVICE.tls.certresolver=http" - - "traefik.http.services.$SERVICE.loadbalancer.server.port=8000" - - "traefik.docker.network=$NETWORK" - - -networks: - default: - external: - name: $NETWORK \ No newline at end of file diff --git a/composes-files/dillinger.yml b/composes-files/dillinger.yml index 71e6620..87e3ba3 100644 --- a/composes-files/dillinger.yml +++ b/composes-files/dillinger.yml @@ -40,7 +40,7 @@ services: - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.http.services.$SERVICE.loadbalancer.server.port=9000" - "traefik.docker.network=$NETWORK" - + networks: default: external: diff --git a/composes-files/etherpad.yml b/composes-files/etherpad.yml index 3bf7337..4cb36ec 100644 --- a/composes-files/etherpad.yml +++ b/composes-files/etherpad.yml @@ -40,7 +40,6 @@ services: networks: - default - # Etherpad : https://etherpad.org etherpad: image: etherpad/etherpad:latest container_name: $SERVICE diff --git a/composes-files/ferdi.yml b/composes-files/ferdi.yml index adc75f8..69c60a7 100644 --- a/composes-files/ferdi.yml +++ b/composes-files/ferdi.yml @@ -27,7 +27,7 @@ services: container_name: ferdi-server environment: - NODE_ENV=development - - EXTERNAL_DOMAIN=$URL + - EXTERNAL_DOMAIN=$URL # - DB_CONNECTION=mysql # - DB_HOST=ferdi-db # - DB_PORT=3306 @@ -65,7 +65,6 @@ services: - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - networks: default: external: diff --git a/composes-files/filebot.yml b/composes-files/filebot.yml index 3737128..73d0e3b 100644 --- a/composes-files/filebot.yml +++ b/composes-files/filebot.yml @@ -43,7 +43,7 @@ services: - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.http.services.$SERVICE.loadbalancer.server.port=5800" - "traefik.docker.network=$NETWORK" - + networks: default: external: diff --git a/composes-files/filebrowser.yml b/composes-files/filebrowser.yml index 69cfbd0..3ec3b65 100644 --- a/composes-files/filebrowser.yml +++ b/composes-files/filebrowser.yml @@ -43,7 +43,7 @@ services: - "traefik.http.routers.$SERVICE.tls=true" - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - + networks: default: external: diff --git a/composes-files/gitlab.yml b/composes-files/gitlab.yml index 3a4c669..e69de29 100644 --- a/composes-files/gitlab.yml +++ b/composes-files/gitlab.yml @@ -1,50 +0,0 @@ -version: '2' - -services: - gitlab: - image: 'polinux/gitlab-ce:latest' - container_name: gitlab - restart: always - hostname: 'git.NDD' - environment: - GITLAB_OMNIBUS_CONFIG: | - gitlab_rails['gitlab_shell_ssh_port'] = 8822 - ports: - - "8822:22" -# volumes: -# - '/apps/gitlab/config:/etc/gitlab' -# - '/apps/gitlab/logs:/var/log/gitlab' -# - '/apps/gitlab/data:/var/opt/gitlab' - networks: - - proxy - labels: - - "traefik.enable=true" - - "traefik.http.routers.git.entrypoints=http" - - "traefik.http.routers.git.rule=Host(`git.NDD`)" - - "traefik.http.middlewares.git-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.git.middlewares=git-https-redirect" - - "traefik.http.routers.git-secure.entrypoints=https" - - "traefik.http.routers.git-secure.rule=Host(`git.NDD`)" - - "traefik.http.routers.git-secure.tls=true" - - "traefik.http.routers.git-secure.tls.certresolver=http" - - "traefik.http.services.git-secure.loadbalancer.server.port=80" - - "traefik.docker.network=proxy" - - - - gitlab-runner: - image: gitlab/gitlab-runner:alpine - container_name: gitlab-runner - restart: unless-stopped - depends_on: - - gitlab - volumes: - # - /apps/gitlab-runner/config:/etc/gitlab-runner - - /var/run/docker.sock:/var/run/docker.sock - networks: - - proxy - -networks: - proxy: - external: - name: proxy diff --git a/composes-files/grafana.yml b/composes-files/grafana.yml index 2e7f9ef..0afd2c5 100644 --- a/composes-files/grafana.yml +++ b/composes-files/grafana.yml @@ -22,7 +22,7 @@ services: image: grafana/grafana:latest restart: always container_name: $SERVICE - volumes: + volumes: - $DATA_LOCATION/$SERVICE/config:/etc/grafana - $DATA_LOCATION/$SERVICE/data:/var/lib/grafana environment: @@ -47,7 +47,7 @@ services: - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.http.services.$SERVICE.loadbalancer.server.port=3000" - "traefik.docker.network=$NETWORK" - + networks: default: external: diff --git a/composes-files/hastebin.yml b/composes-files/hastebin.yml index ec936a5..34ca1f3 100644 --- a/composes-files/hastebin.yml +++ b/composes-files/hastebin.yml @@ -30,7 +30,7 @@ services: test: wget -s 'http://localhost:7777' interval: 1m timeout: 30s - retries: 3 + retries: 3 networks: - default labels: @@ -41,7 +41,7 @@ services: - "traefik.http.routers.$SERVICE.tls=true" - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - + networks: default: external: diff --git a/composes-files/jirafeau.yml b/composes-files/jirafeau.yml index 170a50e..a6d58d1 100644 --- a/composes-files/jirafeau.yml +++ b/composes-files/jirafeau.yml @@ -31,7 +31,6 @@ services: interval: 1m timeout: 30s retries: 3 - networks: - default labels: @@ -42,7 +41,7 @@ services: - "traefik.http.routers.$SERVICE.tls=true" - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - + networks: default: external: diff --git a/composes-files/keycloak.yml b/composes-files/keycloak.yml index 86cb7d4..f422cf6 100644 --- a/composes-files/keycloak.yml +++ b/composes-files/keycloak.yml @@ -29,16 +29,16 @@ services: container_name: $SERVICE-db restart: always healthcheck: - test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] - timeout: 20s - retries: 10 + test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] + timeout: 20s + retries: 10 volumes: - $DATA_LOCATION/$SERVICE/db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD=$DB_ROOT_PASSWORD - MYSQL_DATABASE=keycloak - MYSQL_USER=$DB_USER - - MYSQL_PASSWORD=$DB_PASSWORD + - MYSQL_PASSWORD=$DB_PASSWORD labels: - "autoupdate=monitor" networks: diff --git a/composes-files/matomo.yml b/composes-files/matomo.yml index 41f0346..32e879d 100644 --- a/composes-files/matomo.yml +++ b/composes-files/matomo.yml @@ -66,10 +66,10 @@ services: labels: - "autoupdate=monitor" # https://github.com/PAPAMICA/container-updater healthcheck: - test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] - timeout: 20s - retries: 10 - + test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] + timeout: 20s + retries: 10 + networks: default: external: diff --git a/composes-files/mumble-web.yml b/composes-files/mumble-web.yml index 7a24e60..ca8ecfb 100644 --- a/composes-files/mumble-web.yml +++ b/composes-files/mumble-web.yml @@ -2,7 +2,7 @@ # Update: 2022-05-12 #& type: 3 -#& title: Mumble Web +#& title: Mumble Web #& description: Web client for Mumble #& note: Website: Github.com #& categories: SelfHosted, PAPAMICA @@ -40,5 +40,4 @@ services: networks: default: external: - name: $NETWORK - \ No newline at end of file + name: $NETWORK \ No newline at end of file diff --git a/composes-files/murmur.yml b/composes-files/murmur.yml index eadd3c2..af30eed 100644 --- a/composes-files/murmur.yml +++ b/composes-files/murmur.yml @@ -43,5 +43,4 @@ services: networks: default: external: - name: $NETWORK - \ No newline at end of file + name: $NETWORK \ No newline at end of file diff --git a/composes-files/nextcloud.yml b/composes-files/nextcloud.yml index 1dfccf7..d79f8bb 100644 --- a/composes-files/nextcloud.yml +++ b/composes-files/nextcloud.yml @@ -72,8 +72,6 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=$DB_USER - MYSQL_PASSWORD=$DB_PASSWORD - - # Facultatif networks: - default diff --git a/composes-files/openvpn.yml b/composes-files/openvpn.yml index 049370f..e69de29 100644 --- a/composes-files/openvpn.yml +++ b/composes-files/openvpn.yml @@ -1,55 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 04/09/2021 - -# Variables d'environnement à déclarer : -# - SERVICE : nom du service (exemple : pgadmin) -# - PUID : uid de l'utilisateur système (exemple : 1001) -# - GUID : gid du groupe système (exemple : 1001) -# - INTERFACE: nom de l'interface réseau -# - TZ : Timezone du service (exemple : Europe/Paris) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - NDD : nom de domaine de l'application (ex : vpn.papamica.com) - -# Fonctionne avec Portainer - -version: "2" -services: - openvpn-as: - image: linuxserver/openvpn-as:latest - container_name: $SERVICE - cap_add: - - NET_ADMIN - environment: - - PUID=$PUID - - PGID=$PGID - - TZ=$TZ - - INTERFACE=$INTERFACE - healthcheck: - test: curl --fail --insecure https://localhost:943 || exit 1 - interval: 1m - timeout: 30s - retries: 3 - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - volumes: - - $DATA_LOCATION:/config - ports: - - 9443:9443 - - 1194:1194/udp - restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=https" - - "traefik.http.routers.$SERVICE.rule=Host(`$NDD`)" - - "traefik.http.services.$SERVICE.loadbalancer.server.port=943" - - "traefik.http.services.$SERVICE.loadbalancer.server.scheme=https" - - "traefik.docker.network=proxy" - networks: - - proxy -networks: - proxy: - external: - name: proxy diff --git a/composes-files/plex.yml b/composes-files/plex.yml index 05482f0..4026f20 100644 --- a/composes-files/plex.yml +++ b/composes-files/plex.yml @@ -60,7 +60,7 @@ services: - "traefik.docker.network=$NETWORK" networks: - default - + networks: default: external: diff --git a/composes-files/privatebin.yml b/composes-files/privatebin.yml index 1d6f799..e69de29 100644 --- a/composes-files/privatebin.yml +++ b/composes-files/privatebin.yml @@ -1,50 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 14/06/2021 - -# Variables d'environnement à déclarer : -# - SERVICE : nom du service (exemple : privatebin) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - URL_LOKI : lien du serveur loki (exemple : ndd/loki/api/v1/push) -# - URL : lien du nom de domaine (exemple : papamica.fr) - -# Fonctionne avec Portainer -version: "2" -services: - # PrivateBin : https://privatebin.info - privatebin: - image: jgeusebroek/privatebin:latest - container_name: $SERVICE - restart: always - volumes: - - $DATA_LOCATION/data:/privatebin/data - - $DATA_LOCATION/cfg:/privatebin/cfg - environment: - hostname: 'privatebin' - name: 'privatebin' - #ports: - #- 8080:80 - - # Facultatif - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - networks: - - proxy - labels: - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=http" - - "traefik.http.routers.$SERVICE.rule=Host(`$URL`)" - - "traefik.http.middlewares.$SERVICE-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.$SERVICE.middlewares=$SERVICE-https-redirect" - - "traefik.http.routers.$SERVICE-secure.entrypoints=https" - - "traefik.http.routers.$SERVICE-secure.rule=Host(`$URL`)" - - "traefik.http.routers.$SERVICE-secure.tls=true" - - "traefik.http.routers.$SERVICE-secure.tls.certresolver=http" - - "traefik.docker.network=proxy" - -networks: - proxy: - external: - name: proxy \ No newline at end of file diff --git a/composes-files/projectsend.yml b/composes-files/projectsend.yml index c12aa87..e69de29 100644 --- a/composes-files/projectsend.yml +++ b/composes-files/projectsend.yml @@ -1,85 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 27/10/2020 - -# Variables d'environnement à déclarer : -# - SERVICE : nom du service (exemple : plex) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - URL_LOKI : lien du serveur loki (exemple : ndd/loki/api/v1/push) -# - NDD : lien du nom de domaine (exemple : papamica.fr) -# - DATA : localisation de vos fichiers à explorer -# - DB_USER : nom d'utilisateur pour la base de données (exemple : papamica) -# - DB_PASSWORD : mot de passe pour la base de données -# - DB_ROOT : mot de passe ROOT pour la base de données - -# Fonctionne avec Portainer -version: "2" -services: - projectsend: - image: ghcr.io/linuxserver/projectsend:latest - container_name: $SERVICE - restart: unless-stopped - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Paris - - MAX_UPLOAD=<5000> - volumes: - - $DATA_LOCATION:/config - - $DATA:/data -# ports: -# - 80:80 - - healthcheck: - test: curl --fail http://localhost:80 || exit 1 - interval: 1m - timeout: 30s - retries: 3 - - - # Facultatif - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - labels: - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=http" - - "traefik.http.routers.$SERVICE.rule=Host(`$SERVICE.$NDD`)" - - "traefik.http.middlewares.$SERVICE-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.$SERVICE.middlewares=$SERVICE-https-redirect" - - "traefik.http.routers.$SERVICE-secure.entrypoints=https" - - "traefik.http.routers.$SERVICE-secure.rule=Host(`$SERVICE.$NDD`)" - - "traefik.http.routers.$SERVICE-secure.tls=true" - - "traefik.http.routers.$SERVICE-secure.tls.certresolver=http" - - "traefik.docker.network=proxy" - - - # Base de donnée - projectsend-db: - image: mariadb:10.4.12 - container_name: $SERVICE-db - restart: always - volumes: - - $DATA_LOCATION/db:/var/lib/mysql - environment: - - MYSQL_ROOT_PASSWORD=$DB_ROOT - - MYSQL_DATABASE=$SERVICE - - MYSQL_USER=$DB_USER - - MYSQL_PASSWORD=$DB_PASSWORD - - # Facultatif - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - -networks: - proxy: - external: - name: proxy \ No newline at end of file diff --git a/composes-files/rundeck.yml b/composes-files/rundeck.yml index 39229c8..9ba1473 100644 --- a/composes-files/rundeck.yml +++ b/composes-files/rundeck.yml @@ -51,7 +51,6 @@ services: - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.http.services.$SERVICE.loadbalancer.server.port=4440" - "traefik.docker.network=$NETWORK" - rundeck-db: image: postgres:9.6 diff --git a/composes-files/shorturl.yml b/composes-files/shorturl.yml index bcadb40..e69de29 100644 --- a/composes-files/shorturl.yml +++ b/composes-files/shorturl.yml @@ -1,79 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 27/10/2020 - -# Variables d'environnement à déclarer : -# - SERVICE : nom du service (exemple : plex) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - URL_LOKI : lien du serveur loki (exemple : ndd/loki/api/v1/push) -# - NDD : lien du nom de domaine (exemple : papamica.fr) -# - DB_USER : nom d'utilisateur pour la base de données (exemple : papamica) -# - DB_PASSWORD : mot de passe pour la base de données -# - DB_ROOT : mot de passe ROOT pour la base de données -# - ADMIN_USERNAME : identifiant pour l'administrateur -# - ADMIN_PASSWORD : mot de passe pour l'administrateur -# - ADMIN_EMAIL : email de l'administrateur - -# Fonctionne avec Portainer -version: "2" - -services: - #POLR : https://polrproject.org/ - polr: - image: ajanvier/polr:latest - container_name: $SERVICE - environment: - - DB_HOST=polr-db - - DB_DATABASE=shorturl - - DB_USERNAME=$DB_USER - - DB_PASSWORD=$DB_PASSWORD - - APP_ADDRESS=$SERVICE.$NDD - - ADMIN_USERNAME=$ADMIN_USERNAME - - ADMIN_PASSWORD=$ADMIN_PASSWORD - - ADMIN_EMAIL=$ADMIN_EMAIL - depends_on: - - polr-db -# ports: -# - 980:80 - - # Facultatif - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - labels: - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=http" - - "traefik.http.routers.$SERVICE.rule=Host(`$SERVICE.$NDD`)" - - "traefik.http.middlewares.$SERVICE-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.$SERVICE.middlewares=$SERVICE-https-redirect" - - "traefik.http.routers.$SERVICE-secure.entrypoints=https" - - "traefik.http.routers.$SERVICE-secure.rule=Host(`$SERVICE.$NDD`)" - - "traefik.http.routers.$SERVICE-secure.tls=true" - - "traefik.http.routers.$SERVICE-secure.tls.certresolver=http" - - "traefik.docker.network=proxy" - - # Base de donnée - polr-db: - image: mariadb:10.5.6 - container_name: polr-db - restart: always - environment: - - MYSQL_ROOT_PASSWORD=$DB_ROOT - - MYSQL_DATABASE=shorturl - - MYSQL_USER=$DB_USER - - MYSQL_PASSWORD=$DB_PASSWORD - volumes: - - $DATA_LOCATION/data:/var/lib/mysql - - # Facultatif - networks: - - proxy - - -networks: - proxy: - external: - name: proxy \ No newline at end of file diff --git a/composes-files/sinusbot.yml b/composes-files/sinusbot.yml index 10e66a7..8c3a291 100644 --- a/composes-files/sinusbot.yml +++ b/composes-files/sinusbot.yml @@ -36,9 +36,7 @@ services: - "traefik.http.services.$SERVICE.loadbalancer.server.port=8087" - "traefik.docker.network=$NETWORK" - networks: default: external: - name: $NETWORK - \ No newline at end of file + name: $NETWORK \ No newline at end of file diff --git a/composes-files/taiga.yml b/composes-files/taiga.yml index 2bb8bd1..e69de29 100644 --- a/composes-files/taiga.yml +++ b/composes-files/taiga.yml @@ -1,221 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 29/04/2021 - -# Variables d'environnement à déclarer : -# - URL : lien du service -# - URL_WS : lien pour les websockets ("ws://localhost:9000") -# - SERVICE : nom du service (exemple : plex) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - URL_LOKI : lien du serveur loki (exemple : ndd/loki/api/v1/push) -# - DB_USER : nom d'utilisateur pour la base de données (exemple : papamica) -# - DB_PASSWORD : mot de passe pour la base de données -# - SECRET : mot de passe de du service - -# Fonctionne avec Portainer -version: "2" - -services: - taiga-db: - image: postgres:12.3 - container_name: $SERVICE-db - environment: - POSTGRES_DB: taiga - POSTGRES_USER: $DB_USER - POSTGRES_PASSWORD: $DB_PASSWORD - volumes: - - $DATA_LOCATION/db:/var/lib/postgresql/data - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - - taiga-back: - image: taigaio/taiga-back:latest - container_name: $SERVICE-back - environment: - # Database settings - POSTGRES_DB: taiga - POSTGRES_USER: $DB_USER - POSTGRES_PASSWORD: $DB_PASSWORD - POSTGRES_HOST: taiga-db - # Taiga settings - TAIGA_SECRET_KEY: $SECRET - TAIGA_SITES_DOMAIN: $URL - TAIGA_SITES_SCHEME: "https" - # Email settings. Uncomment following lines and configure your SMTP server - # EMAIL_BACKEND: "django.core.mail.backends.smtp.EmailBackend" - # DEFAULT_FROM_EMAIL: "no-reply@example.com" - # EMAIL_USE_TLS: "False" - # EMAIL_USE_SSL: "False" - # EMAIL_HOST: "smtp.host.example.com" - # EMAIL_PORT: 587 - # EMAIL_HOST_USER: "user" - # EMAIL_HOST_PASSWORD: "password" - # Rabbitmq settings - # Should be the same as in taiga-async-rabbitmq and taiga-events-rabbitmq - RABBITMQ_USER: taiga - RABBITMQ_PASS: taiga - # Telemetry settings - ENABLE_TELEMETRY: "True" - volumes: - - $DATA_LOCATION/static-data:/taiga-back/static - - $DATA_LOCATION/media-data:/taiga-back/media - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - depends_on: - - taiga-db - - taiga-events-rabbitmq - - taiga-async-rabbitmq - - taiga-async: - image: taigaio/taiga-back:latest - container_name: $SERVICE-async - entrypoint: ["/taiga-back/docker/async_entrypoint.sh"] - environment: - # Database settings - POSTGRES_DB: taiga - POSTGRES_USER: $DB_USER - POSTGRES_PASSWORD: $DB_PASSWORD - POSTGRES_HOST: taiga-db - # Taiga settings - TAIGA_SECRET_KEY: $SECRET - TAIGA_SITES_DOMAIN: $URL - TAIGA_SITES_SCHEME: "https" - # Email settings. Uncomment following lines and configure your SMTP server - # EMAIL_BACKEND: "django.core.mail.backends.smtp.EmailBackend" - # DEFAULT_FROM_EMAIL: "no-reply@example.com" - # EMAIL_USE_TLS: "False" - # EMAIL_USE_SSL: "False" - # EMAIL_HOST: "smtp.host.example.com" - # EMAIL_PORT: 587 - # EMAIL_HOST_USER: "user" - # EMAIL_HOST_PASSWORD: "password" - # Rabbitmq settings - # Should be the same as in taiga-async-rabbitmq and taiga-events-rabbitmq - RABBITMQ_USER: taiga - RABBITMQ_PASS: taiga - # Telemetry settings - ENABLE_TELEMETRY: "True" - volumes: - - $DATA_LOCATION/static-data:/taiga-back/static - - $DATA_LOCATION/media-data:/taiga-back/media - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - depends_on: - - taiga-db - - taiga-back - - taiga-async-rabbitmq - - taiga-async-rabbitmq: - image: rabbitmq:3-management-alpine - container_name: $SERVICE-rabbitmq - environment: - RABBITMQ_ERLANG_COOKIE: secret-erlang-cookie - RABBITMQ_DEFAULT_USER: taiga - RABBITMQ_DEFAULT_PASS: taiga - RABBITMQ_DEFAULT_VHOST: taiga - volumes: - - $DATA_LOCATION/async-rabbitmq-data:/var/lib/rabbitmq - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - - taiga-front: - image: taigaio/taiga-front:latest - container_name: $SERVICE-front - environment: - TAIGA_URL: $URL - TAIGA_WEBSOCKETS_URL: $URL_WS #"ws://localhost:9000" - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - # volumes: - # - ./conf.json:/usr/share/nginx/html/conf.json - labels: - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=http" - - "traefik.http.routers.$SERVICE.rule=Host(`$URL`)" - - "traefik.http.middlewares.$SERVICE-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.$SERVICE.middlewares=$SERVICE-https-redirect" - - "traefik.http.routers.$SERVICE-secure.entrypoints=https" - - "traefik.http.routers.$SERVICE-secure.rule=Host(`$URL`)" - - "traefik.http.routers.$SERVICE-secure.tls=true" - - "traefik.http.routers.$SERVICE-secure.tls.certresolver=http" - - "traefik.http.services.$SERVICE-secure.loadbalancer.server.port=9000" - - "traefik.docker.network=proxy" - - - taiga-events: - image: taigaio/taiga-events:latest - container_name: $SERVICE-events - environment: - RABBITMQ_USER: taiga - RABBITMQ_PASS: taiga - TAIGA_SECRET_KEY: "taiga-back-secret-key" - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - depends_on: - - taiga-events-rabbitmq - - taiga-events-rabbitmq: - image: rabbitmq:3-management-alpine - container_name: $SERVICE-evet-rabbitmq - environment: - RABBITMQ_ERLANG_COOKIE: secret-erlang-cookie - RABBITMQ_DEFAULT_USER: taiga - RABBITMQ_DEFAULT_PASS: taiga - RABBITMQ_DEFAULT_VHOST: taiga - volumes: - - $DATA_LOCATION/events-rabbitmq-data:/var/lib/rabbitmq - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - - taiga-protected: - image: taigaio/taiga-protected:latest - container_name: $SERVICE-protected - environment: - MAX_AGE: 360 - SECRET_KEY: "taiga-back-secret-key" - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - -networks: - proxy: - external: - name: proxy diff --git a/composes-files/teamspeak.yml b/composes-files/teamspeak.yml index e496209..3bf2cd2 100644 --- a/composes-files/teamspeak.yml +++ b/composes-files/teamspeak.yml @@ -48,7 +48,7 @@ services: default: aliases: - $SERVICE.docker.local - + networks: default: external: diff --git a/composes-files/traefik.yml b/composes-files/traefik.yml index 61bc5d7..37d7252 100644 --- a/composes-files/traefik.yml +++ b/composes-files/traefik.yml @@ -34,7 +34,7 @@ services: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro - $DATA_LOCATION/$SERVICE/config/traefik.yml:/traefik.yml:ro - - $DATA_LOCATION/$SERVICE/config/config.yml:/config.yml:ro + - $DATA_LOCATION/$SERVICE/config/config.yml:/config.yml:ro - $DATA_LOCATION/$SERVICE/config/acme.json:/acme.json labels: autoupdate: "monitor" diff --git a/composes-files/ts3rank.yml b/composes-files/ts3rank.yml index 78f6c64..1249dea 100644 --- a/composes-files/ts3rank.yml +++ b/composes-files/ts3rank.yml @@ -30,7 +30,7 @@ services: - MYSQL_ROOT_PASSWORD=$DB_ROOT - MYSQL_DATABASE=RanksystemDatabase - MYSQL_USER=$DB_USER - - MYSQL_PASSWORD=$DB_PASSWORD + - MYSQL_PASSWORD=$DB_PASSWORD healthcheck: test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] timeout: 20s @@ -71,7 +71,6 @@ services: - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - networks: default: external: diff --git a/composes-files/ts3viewer.yml b/composes-files/ts3viewer.yml index 2605257..11f736b 100644 --- a/composes-files/ts3viewer.yml +++ b/composes-files/ts3viewer.yml @@ -42,8 +42,7 @@ services: - "traefik.http.routers.$SERVICE.tls=true" - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - - + tsweb-db: image: mariadb:10.4.12 container_name: $SERVICE-db diff --git a/composes-files/umami.yml b/composes-files/umami.yml index e88f89a..2394e5b 100644 --- a/composes-files/umami.yml +++ b/composes-files/umami.yml @@ -4,7 +4,7 @@ #& type: 3 #& title: umami #& description: Light alternative to Google Analitycs -#& note: Website: Umami.is

Warning: RTFM ! You need to add one file and restart ! +#& note: Website: Umami.is

Warning: RTFM ! You need to add one file and restart ! #& categories: SelfHosted, PAPAMICA #& platform: linux #& logo: https://img.stackshare.io/service/20837/umami.png diff --git a/composes-files/vault.yml b/composes-files/vault.yml index 6a3eb8c..e69de29 100644 --- a/composes-files/vault.yml +++ b/composes-files/vault.yml @@ -1,51 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 27/10/2020 - -# Variables d'environnement à déclarer : -# - SERVICE : nom du service (exemple : plex) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - URL_LOKI : lien du serveur loki (exemple : ndd/loki/api/v1/push) -# - URL : lien de l'application (exemple : service.papamica.fr) - -# Fonctionne avec Portainer -version: '2' -services: - vault: - image: vault:latest - container_name: $SERVICE - restart: always - volumes: - - $DATA_LOCATION/logs:/vault/logs - - $DATA_LOCATION/file:/vault/file - - $DATA_LOCATION/config:/vault/config - cap_add: - - IPC_LOCK - entrypoint: vault server -config=/vault/config/vault.json - ports: - - "8200:8200" - - # Facultatif - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - networks: - - proxy - labels: - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=http" - - "traefik.http.routers.$SERVICE.rule=Host(`$URL`)" - - "traefik.http.middlewares.$SERVICE-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.$SERVICE.middlewares=$SERVICE-https-redirect" - - "traefik.http.routers.$SERVICE-secure.entrypoints=https" - - "traefik.http.routers.$SERVICE-secure.rule=Host(`$URL`)" - - "traefik.http.routers.$SERVICE-secure.tls=true" - - "traefik.http.routers.$SERVICE-secure.tls.certresolver=http" - - "traefik.http.services.$SERVICE-secure.loadbalancer.server.port=8200" - - "traefik.docker.network=proxy" - -networks: - proxy: - external: - name: proxy \ No newline at end of file diff --git a/composes-files/vscode.yml b/composes-files/vscode.yml index 7be132b..a3cd568 100644 --- a/composes-files/vscode.yml +++ b/composes-files/vscode.yml @@ -37,8 +37,8 @@ services: - "traefik.http.routers.$SERVICE.tls=true" - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - + networks: default: external: - name: $NETWORK + name: $NETWORK \ No newline at end of file diff --git a/composes-files/wikijs.yml b/composes-files/wikijs.yml index fad6f54..e69de29 100644 --- a/composes-files/wikijs.yml +++ b/composes-files/wikijs.yml @@ -1,79 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 27/10/2020 - -# Variables d'environnement à déclarer : -# - SERVICE : nom du service (exemple : plex) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - URL_LOKI : lien du serveur loki (exemple : ndd/loki/api/v1/push) -# - NDD : lien du nom de domaine (exemple : papamica.fr) -# - DB_USER : nom d'utilisateur pour la base de données (exemple : papamica) -# - DB_PASSWORD : mot de passe pour la base de données - - -# Fonctionne avec Portainer -version: "2" -services: - - wiki-db: - image: postgres:11-alpine - container_name: $SERVICE-db - environment: - POSTGRES_DB: wiki - POSTGRES_PASSWORD: $DB_PASSWORD - POSTGRES_USER: $DB_USER - restart: unless-stopped - volumes: - - $DATA_LOCATION/db:/var/lib/postgresql/data - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - - wiki: - image: requarks/wiki:2 - container_name: $SERVICE - depends_on: - - wiki-db - environment: - DB_TYPE: postgres - DB_HOST: $SERVICE-db - DB_PORT: 5432 - DB_USER: $DB_USER - DB_PASS: $DB_PASSWORD - DB_NAME: wiki - restart: unless-stopped - - healthcheck: - test: curl --fail http://localhost:3000 || exit 1 - interval: 1m - timeout: 30s - retries: 3 - -# Facultatif - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - labels: - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=http" - - "traefik.http.routers.$SERVICE.rule=Host(`$SERVICE.$NDD`)" - - "traefik.http.middlewares.$SERVICE-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.$SERVICE.middlewares=$SERVICE-https-redirect" - - "traefik.http.routers.$SERVICE-secure.entrypoints=https" - - "traefik.http.routers.$SERVICE-secure.rule=Host(`$SERVICE.$NDD`)" - - "traefik.http.routers.$SERVICE-secure.tls=true" - - "traefik.http.routers.$SERVICE-secure.tls.certresolver=http" - - "traefik.http.services.$SERVICE-secure.loadbalancer.server.port=3000" - - "traefik.docker.network=proxy" - -networks: - proxy: - external: - name: proxy \ No newline at end of file diff --git a/composes-files/wiznote.yml b/composes-files/wiznote.yml index 7e72de3..e69de29 100644 --- a/composes-files/wiznote.yml +++ b/composes-files/wiznote.yml @@ -1,48 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 30/10/2020 - -# Variables d'environnement à déclarer : -# - SERVICE : nom du service (exemple : plex) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - URL_LOKI : lien du serveur loki (exemple : ndd/loki/api/v1/push) -# - NDD : lien du nom de domaine (exemple : papamica.fr) - -# Fonctionne avec Portainer -version: "2" -services: - # Wiznote : https://www.wiz.cn/ - wiznote: - image: wiznote/wizserver:latest - container_name: $SERVICE - restart: always - volumes: - - $DATA_LOCATION/data:/wiz/storage - - /etc/localtime:/etc/localtime - ports: - - 9269:9269/udp -# - 8080:80 - - # Facultatif - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - labels: - - "traefik.enable=true" - - "traefik.http.routers.$SERVICE.entrypoints=http" - - "traefik.http.routers.$SERVICE.rule=Host(`$SERVICE.$NDD`)" - - "traefik.http.middlewares.$SERVICE-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.$SERVICE.middlewares=$SERVICE-https-redirect" - - "traefik.http.routers.$SERVICE-secure.entrypoints=https" - - "traefik.http.routers.$SERVICE-secure.rule=Host(`$SERVICE.$NDD`)" - - "traefik.http.routers.$SERVICE-secure.tls=true" - - "traefik.http.routers.$SERVICE-secure.tls.certresolver=http" - - "traefik.docker.network=proxy" - -networks: - proxy: - external: - name: proxy \ No newline at end of file diff --git a/composes-files/wordpress.yml b/composes-files/wordpress.yml index 170cbe9..43a4fab 100644 --- a/composes-files/wordpress.yml +++ b/composes-files/wordpress.yml @@ -71,9 +71,8 @@ services: - "traefik.http.routers.$SERVICE.tls=true" - "traefik.http.routers.$SERVICE.tls.certresolver=http" - "traefik.docker.network=$NETWORK" - + networks: default: external: - name: $NETWORK - + name: $NETWORK \ No newline at end of file diff --git a/composes-files/yourls.yml b/composes-files/yourls.yml index 00f55a2..639afc3 100644 --- a/composes-files/yourls.yml +++ b/composes-files/yourls.yml @@ -66,15 +66,14 @@ services: volumes: - $DATA_LOCATION/$SERVICE/db:/var/lib/mysql healthcheck: - test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] - timeout: 20s - retries: 10 + test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] + timeout: 20s + retries: 10 networks: - default labels: - "autoupdate=monitor" # https://github.com/PAPAMICA/container-updater - - + networks: default: external: diff --git a/composes-files/zabbix-cachethq.yml b/composes-files/zabbix-cachethq.yml index 1b02987..e69de29 100644 --- a/composes-files/zabbix-cachethq.yml +++ b/composes-files/zabbix-cachethq.yml @@ -1,41 +0,0 @@ -# Docker-compose mis à disposition par Mickael "PAPAMICA" Asseline -# Date de mise à jour : 27/10/2020 - -# Variables d'environnement à déclarer : -# - SERVICE : nom du service (exemple : plex) -# - DATA_LOCATION : localisation des données (exemple /apps/"service") -# - URL_LOKI : lien du serveur loki (exemple : ndd/loki/api/v1/push) -# - NDD : lien du nom de domaine (exemple : papamica.fr) - -# Fonctionne avec Portainer - -version: "2" - -services: - # Script zabbix-cachet : https://github.com/qk4l/zabbix-cachet - zabbix-cachet: - image: qk4l/zabbix-cachet:latest - container_name: $SERVICE - volumes: - - $DATA_LOCATION/config.yml:/config.yml - restart: always - healthcheck: - test: grep -qr "python" /proc/*/status || exit 1 - interval: 1m - timeout: 30s - retries: 3 - - - # Facultatif - networks: - - proxy - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - -networks: - proxy: - external: - name: proxy diff --git a/composes-files/zabbix-proxy.yml b/composes-files/zabbix-proxy.yml index 5674856..e69de29 100644 --- a/composes-files/zabbix-proxy.yml +++ b/composes-files/zabbix-proxy.yml @@ -1,60 +0,0 @@ -# Maintainer: Mickael "PAPAMICA" Asseline -# Docker-compose provided by Mickael "PAPAMICA" Asseline -# Last update : 04/09/2021 -# Environment variables to declare : -# - SERVICE : name of the service (example : zabbix-proxy) -# - HOSTNAME : name of zabbix proxy (example : zabbix-proxy) -# - ZABBIX_SERVER : FQDN of zabbix server (example : zabbic.domain.tld) -# - TLSPSKIDENTITY : ID of psk in zabbix server (example : PSK001) -# - TLSPSKFILE : PSK file (example : zabbix_agentd.psk) -# - URL_LOKI : loki service URL (example : http://ip:3100/loki/api/v1/push) -# - DATA_LOCATION : location of service configuration data (example /app/"service") -# - NETWORK_APP : application network name -# Work with Portainer -version: '2' -services: - zabbix-proxy: - image: zabbix/zabbix-proxy-sqlite3:ubuntu-5.4-latest - restart: unless-stopped - container_name: $SERVICE - environment: - ZBX_PROXYMODE: 0 - ZBX_HOSTNAME: $PROXY_HOSTNAME - ZBX_SERVER_HOST: $ZABBIX_SERVER - ZBX_ENABLEREMOTECOMMANDS: 1 - ZBX_STARTPOLLERS: 5 - ZBX_IPMIPOLLERS: 1 - ZBX_STARTPOLLERSUNREACHABLE: 1 - ZBX_STARTTRAPPERS: 5 - ZBX_STARTPINGERS: 1 - ZBX_STARTDISCOVERERS: 1 - ZBX_STARTHTTPPOLLERS: 1 - ZBX_STARTVMWARECOLLECTORS: 10 - ZBX_TLSCONNECT: psk - ZBX_TLSACCEPT: psk - ZBX_TLSPSKIDENTITY: $TLSPSKIDENTITY - ZBX_TLSPSKFILE: $TLSPSKFILE - ZBX_VMWAREFREQUENCY: 60 - ZBX_VMWAREPERFFREQUENCY: 60 - ZBX_VMWARECACHESIZE: 8M - ZBX_VMWARETIMEOUT: 10 - healthcheck: - test: grep -qr "zabbix_proxy" /proc/*/status || exit 1 - interval: 1m - timeout: 30s - retries: 3 - logging: - driver: loki - options: - loki-url: "$URL_LOKI" - loki-external-labels: service={{.Name}} - volumes: - - $DATA_LOCATION/enc:/var/lib/zabbix/enc - ports: - - 10051:10051 - networks: - - proxy -networks: - proxy: - external: - name: proxy diff --git a/composes-files/zabbix.yml b/composes-files/zabbix.yml index a105c1d..985a6db 100644 --- a/composes-files/zabbix.yml +++ b/composes-files/zabbix.yml @@ -74,7 +74,7 @@ services: - $DATA_LOCATION/$SERVICE/$SERVICE/alertscripts:/usr/lib/zabbix/alertscripts networks: - default - + zabbix-web: image: zabbix/zabbix-web-nginx-pgsql:6.0.2-ubuntu restart: always