diff --git a/blueprints/gotify/docker-compose.yml b/blueprints/gotify/docker-compose.yml index de347c52..1d3d8265 100644 --- a/blueprints/gotify/docker-compose.yml +++ b/blueprints/gotify/docker-compose.yml @@ -1,20 +1,3 @@ -<<<<<<< HEAD -version: "3.8" - -services: - gotify: - image: gotify/server:latest - restart: unless-stopped - expose: - - "80" - environment: - - GOTIFY_DEFAULTUSER_PASS=${GOTIFY_DEFAULTUSER_PASS} - volumes: - - gotify-data:/app/data - -volumes: - gotify-data: -======= services: gotify: image: gotify/server:2.9.1 @@ -26,4 +9,3 @@ services: volumes: gotify_data: ->>>>>>> origin/canary diff --git a/blueprints/gotify/gotify.svg b/blueprints/gotify/gotify.svg index 4eff0896..29502b8a 100644 --- a/blueprints/gotify/gotify.svg +++ b/blueprints/gotify/gotify.svg @@ -1,9 +1,5 @@ -<<<<<<< HEAD - -======= G ->>>>>>> origin/canary diff --git a/blueprints/gotify/template.toml b/blueprints/gotify/template.toml index 981d37ae..2308838a 100644 --- a/blueprints/gotify/template.toml +++ b/blueprints/gotify/template.toml @@ -1,16 +1,4 @@ [variables] -<<<<<<< HEAD -admin_password = "${password:32}" - -[config] -[[config.domains]] -serviceName = "gotify" -port = 80 -host = "${domain}" - -[config.env] -GOTIFY_DEFAULTUSER_PASS = "${admin_password}" -======= main_domain = "${domain}" [config] @@ -21,4 +9,3 @@ mounts = [] serviceName = "gotify" port = 80 host = "${main_domain}" ->>>>>>> origin/canary diff --git a/blueprints/jellyseerr/docker-compose.yml b/blueprints/jellyseerr/docker-compose.yml index a57f7a0e..e17f3ddb 100644 --- a/blueprints/jellyseerr/docker-compose.yml +++ b/blueprints/jellyseerr/docker-compose.yml @@ -1,21 +1,3 @@ -<<<<<<< HEAD -version: "3.8" - -services: - jellyseerr: - image: fallenbagel/jellyseerr:latest - restart: unless-stopped - expose: - - "5055" - environment: - - LOG_LEVEL=info - - TZ=${TZ} - volumes: - - jellyseerr-config:/app/config - -volumes: - jellyseerr-config: -======= services: jellyseerr: image: fallenbagel/jellyseerr:2.7.3 @@ -29,4 +11,3 @@ services: volumes: jellyseerr_config: ->>>>>>> origin/canary diff --git a/blueprints/jellyseerr/jellyseerr.svg b/blueprints/jellyseerr/jellyseerr.svg index f2e51163..93840c4a 100644 --- a/blueprints/jellyseerr/jellyseerr.svg +++ b/blueprints/jellyseerr/jellyseerr.svg @@ -1,9 +1,5 @@ -<<<<<<< HEAD - -======= J ->>>>>>> origin/canary diff --git a/blueprints/jellyseerr/template.toml b/blueprints/jellyseerr/template.toml index e5b60651..b41dae81 100644 --- a/blueprints/jellyseerr/template.toml +++ b/blueprints/jellyseerr/template.toml @@ -1,16 +1,4 @@ [variables] -<<<<<<< HEAD -timezone = "Etc/UTC" - -[config] -[[config.domains]] -serviceName = "jellyseerr" -port = 5055 -host = "${domain}" - -[config.env] -TZ = "${timezone}" -======= main_domain = "${domain}" [config] @@ -21,4 +9,3 @@ mounts = [] serviceName = "jellyseerr" port = 5055 host = "${main_domain}" ->>>>>>> origin/canary diff --git a/blueprints/privatebin/docker-compose.yml b/blueprints/privatebin/docker-compose.yml index 3033e030..dc621ca0 100644 --- a/blueprints/privatebin/docker-compose.yml +++ b/blueprints/privatebin/docker-compose.yml @@ -1,24 +1,3 @@ -<<<<<<< HEAD -version: "3.8" - -services: - privatebin: - image: privatebin/nginx-fpm-alpine:latest - restart: unless-stopped - read_only: true - expose: - - "8080" - volumes: - - privatebin-data:/srv/data - tmpfs: - - /tmp - - /var/tmp - - /var/run - - /var/lib/nginx/tmp - -volumes: - privatebin-data: -======= services: privatebin: image: privatebin/nginx-fpm-alpine:2.0.4 @@ -30,4 +9,3 @@ services: volumes: privatebin_data: ->>>>>>> origin/canary diff --git a/blueprints/privatebin/privatebin.svg b/blueprints/privatebin/privatebin.svg index e9df1095..0391799d 100644 --- a/blueprints/privatebin/privatebin.svg +++ b/blueprints/privatebin/privatebin.svg @@ -1,9 +1,5 @@ -<<<<<<< HEAD - -======= P ->>>>>>> origin/canary diff --git a/blueprints/privatebin/template.toml b/blueprints/privatebin/template.toml index e9dbf400..747c3bc7 100644 --- a/blueprints/privatebin/template.toml +++ b/blueprints/privatebin/template.toml @@ -1,10 +1,3 @@ -<<<<<<< HEAD -[config] -[[config.domains]] -serviceName = "privatebin" -port = 8080 -host = "${domain}" -======= [variables] main_domain = "${domain}" @@ -16,4 +9,3 @@ mounts = [] serviceName = "privatebin" port = 8080 host = "${main_domain}" ->>>>>>> origin/canary diff --git a/blueprints/speedtest-tracker/docker-compose.yml b/blueprints/speedtest-tracker/docker-compose.yml index 15070b75..234eddb4 100644 --- a/blueprints/speedtest-tracker/docker-compose.yml +++ b/blueprints/speedtest-tracker/docker-compose.yml @@ -1,30 +1,7 @@ -<<<<<<< HEAD -version: "3.8" - -======= ->>>>>>> origin/canary services: speedtest-tracker: image: lscr.io/linuxserver/speedtest-tracker:latest restart: unless-stopped -<<<<<<< HEAD - expose: - - "80" - environment: - - APP_KEY - - APP_URL - - DB_CONNECTION - - PUID - - PGID - - TZ - - DISPLAY_TIMEZONE - - SPEEDTEST_SCHEDULE - volumes: - - speedtest-tracker-config:/config - -volumes: - speedtest-tracker-config: -======= environment: PUID: ${PUID} PGID: ${PGID} @@ -37,4 +14,3 @@ volumes: volumes: speedtest_config: ->>>>>>> origin/canary diff --git a/blueprints/speedtest-tracker/speedtest-tracker.svg b/blueprints/speedtest-tracker/speedtest-tracker.svg index b8b8e43a..1928bbb7 100644 --- a/blueprints/speedtest-tracker/speedtest-tracker.svg +++ b/blueprints/speedtest-tracker/speedtest-tracker.svg @@ -1,9 +1,5 @@ -<<<<<<< HEAD - -======= S ->>>>>>> origin/canary diff --git a/blueprints/speedtest-tracker/template.toml b/blueprints/speedtest-tracker/template.toml index ccb5b8ba..2ae03d8c 100644 --- a/blueprints/speedtest-tracker/template.toml +++ b/blueprints/speedtest-tracker/template.toml @@ -1,36 +1,16 @@ [variables] main_domain = "${domain}" -<<<<<<< HEAD -app_key = "base64:${base64:32}" -timezone = "Etc/UTC" - -[config] -env = [ - "APP_KEY=${app_key}", - "APP_URL=https://${main_domain}", - "DB_CONNECTION=sqlite", - "PUID=1000", - "PGID=1000", - "TZ=${timezone}", - "DISPLAY_TIMEZONE=${timezone}", - "SPEEDTEST_SCHEDULE=0 */6 * * *", -] -======= app_key = "${base64:32}" [config] mounts = [] ->>>>>>> origin/canary [[config.domains]] serviceName = "speedtest-tracker" port = 80 host = "${main_domain}" -<<<<<<< HEAD -======= [config.env] APP_KEY = "base64:${app_key}" PUID = "1000" PGID = "1000" ->>>>>>> origin/canary