diff --git a/app/cf.yml b/app/cf.yml new file mode 100644 index 0000000..823f52b --- /dev/null +++ b/app/cf.yml @@ -0,0 +1,49 @@ +# Maintainer: ds - ddsq +# Update: 2023-01-13 + +#& type: 3 +#& title: cf +#& description: +#& note: Website: Github.com +#& categories: SelfHosted, PAPAMICA +#& platform: linux +#& logo: fd + +#% SERVICE: Name of the service (No spaces or points) [cf] +#% 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] + +# Work with Portainer +version: '3.8' +services: + cf: + image: dd + + volumes: + - $DATA_LOCATION/$SERVICE/da:dezafr/fez + + + environment: + - sdq + - dgre + + healthcheck: + test: wget -s 'http://localhost:dd' + interval: 1m + timeout: 30s + retries: 3 + container_name: $SERVICE + 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.certresolver=http" + - "traefik.http.services.$SERVICE.loadbalancer.server.port=dd" +networks: + default: + external: + name: $NETWORK \ No newline at end of file diff --git a/app/template.yml.j2 b/app/template.yml.j2 index a3e412e..07451e1 100644 --- a/app/template.yml.j2 +++ b/app/template.yml.j2 @@ -19,24 +19,28 @@ version: '3.8' services: {{ app_name|lower }}: image: {{ app_image }} -{%- if volumlist is defined and envvar|length > 0 -%} volumes:{%- endif -%} -{%- for var in volumlist %} - {%- if not loop.last %} +{%- if volumlist is defined and envvar|length > 0 %} + volumes: + {%- for var in volumlist %} + {%- if not loop.last %} - $DATA_LOCATION/$SERVICE/{{ var }} - {%- endif %} - {%- if loop.last %} + {%- endif %} + {%- if loop.last %} - $DATA_LOCATION/$SERVICE/{{ var }} - {%- endif -%} -{%- endfor %} -{%- if envvar is defined and envvar|length > 0 -%} environment:{%- endif -%} -{%- for var in envvar %} - {%- if not loop.last %} + {%- endif -%} + {%- endfor %} +{%- endif %} +{%- if envvar is defined and envvar|length > 0 %} + environment: + {%- for var in envvar %} + {%- if not loop.last %} - {{ var }} - {%- endif %} - {%- if loop.last %} + {%- endif %} + {%- if loop.last %} - {{ var }} - {%- endif %} -{%- endfor %} + {%- endif %} + {%- endfor %} +{%- endif %} healthcheck: test: wget -s 'http://localhost:{{ app_port }}' interval: 1m diff --git a/app/test2.yml b/app/test2.yml new file mode 100644 index 0000000..d7d7bb8 --- /dev/null +++ b/app/test2.yml @@ -0,0 +1,46 @@ +# Maintainer: sdaq - daz +# Update: 2023-01-13 + +#& type: 3 +#& title: test2 +#& description: zad +#& note: Website: Github.com +#& categories: SelfHosted, PAPAMICA +#& platform: linux +#& logo: dz + +#% SERVICE: Name of the service (No spaces or points) [test2] +#% 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] + +# Work with Portainer +version: '3.8' +services: + test2: + image: dz + volumes: + - $DATA_LOCATION/$SERVICE/fzefz:fezfzef/.fezfzef + environment: + - fa + - zfsf + - qfazf + healthcheck: + test: wget -s 'http://localhost:dz' + interval: 1m + timeout: 30s + retries: 3 + container_name: $SERVICE + 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.certresolver=http" + - "traefik.http.services.$SERVICE.loadbalancer.server.port=dz" +networks: + default: + external: + name: $NETWORK \ No newline at end of file diff --git a/composes-files/flaresolverr.yml b/composes-files/flaresolverr.yml index adcafc5..0f547d2 100644 --- a/composes-files/flaresolverr.yml +++ b/composes-files/flaresolverr.yml @@ -19,7 +19,7 @@ # Work with Portainer version: "2" services: - adminer: + flaresolverr: image: ghcr.io/flaresolverr/flaresolverr:latest restart: always container_name: $SERVICE