Merge branch 'next' into next

2024-08-07 18:20:30 -05:00
parent 868bbaf5a9 0b000919cf
commit 20acb4363b
99 changed files with 1992 additions and 973 deletions
--- a/templates/compose/directus-with-postgresql.yaml
+++ b/templates/compose/directus-with-postgresql.yaml
@@ -36,7 +36,7 @@ services:
      redis:
        condition: service_healthy
  postgresql:
-    image: postgres:16-alpine
+    image: postgis/postgis:16-3.4-alpine
    volumes:
      - directus-postgresql-data:/var/lib/postgresql/data
    environment:
--- a/templates/compose/formbricks.yaml
+++ b/templates/compose/formbricks.yaml
@@ -1,6 +1,6 @@
-# documentation: https://formbricks.com
-# slogan: Open Source Experience Management
-# tags: form, builder, forms, open source, experience, management, self-hosted, docker
+# documentation: https://formbricks.com/docs/self-hosting/configuration
+# slogan: Open Source Survey Platform
+# tags: form, builder, forms, survey, open source, experience, management, self-hosted, docker
 # logo: svgs/formbricks.png
 # port: 3000

@@ -11,33 +11,55 @@ services:
      - SERVICE_FQDN_FORMBRICKS_3000
      - WEBAPP_URL=$SERVICE_FQDN_FORMBRICKS
      - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgresql:5432/${POSTGRESQL_DATABASE:-formbricks}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
      - NEXTAUTH_SECRET=$SERVICE_BASE64_64_NEXTAUTH
      - NEXTAUTH_URL=$SERVICE_FQDN_FORMBRICKS
      - ENCRYPTION_KEY=$SERVICE_BASE64_64_ENCRYPTION
-      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
+      - CRON_SECRET=$SERVICE_BASE64_64_CRON
+      - ENTERPRISE_LICENSE_KEY=${ENTERPRISE_LICENSE_KEY}
      - MAIL_FROM=${MAIL_FROM:-test@example.com}
      - SMTP_HOST=${SMTP_HOST:-test.example.com}
      - SMTP_PORT=${SMTP_PORT:-587}
      - SMTP_USER=${SMTP_USER:-test}
      - SMTP_PASSWORD=${SMTP_PASSWORD:-test}
      - SMTP_SECURE_ENABLED=${SMTP_SECURE_ENABLED:-0}
+      - SMTP_REJECT_UNAUTHORIZED_TLS=${SMTP_REJECT_UNAUTHORIZED_TLS:-1}
      - SHORT_URL_BASE=${SHORT_URL_BASE}
      - EMAIL_VERIFICATION_DISABLED=${EMAIL_VERIFICATION_DISABLED:-1}
      - PASSWORD_RESET_DISABLED=${PASSWORD_RESET_DISABLED:-1}
-      - SIGNUP_DISABLED=${SIGNUP_DISABLED:-0}
+      - EMAIL_AUTH_DISABLED=${EMAIL_AUTH_DISABLED:-0}
      - INVITE_DISABLED=${INVITE_DISABLED:-0}
+      - ASSET_PREFIX_URL=${ASSET_PREFIX_URL}
+      - UNSPLASH_ACCESS_KEY=${UNSPLASH_ACCESS_KEY}
+      - GITHUB_ID=${GITHUB_ID}
+      - GITHUB_SECRET=${GITHUB_SECRET}
+      - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
+      - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
+      - AZUREAD_CLIENT_ID=${AZUREAD_CLIENT_ID}
+      - AZUREAD_CLIENT_SECRET=${AZUREAD_CLIENT_SECRET}
+      - AZUREAD_TENANT_ID=${AZUREAD_TENANT_ID}
+      - OIDC_CLIENT_ID=${OIDC_CLIENT_ID}
+      - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET}
+      - OIDC_ISSUER=${OIDC_ISSUER}
+      - OIDC_DISPLAY_NAME=${OIDC_DISPLAY_NAME}
+      - OIDC_SIGNING_ALGORITHM=${OIDC_SIGNING_ALGORITHM}
+      - NOTION_OAUTH_CLIENT_ID=${NOTION_OAUTH_CLIENT_ID}
+      - NOTION_OAUTH_CLIENT_SECRET=${NOTION_OAUTH_CLIENT_SECRET}
+      - GOOGLE_SHEETS_CLIENT_ID=${GOOGLE_SHEETS_CLIENT_ID}
+      - GOOGLE_SHEETS_CLIENT_SECRET=${GOOGLE_SHEETS_CLIENT_SECRET}
+      - GOOGLE_SHEETS_REDIRECT_URL=${GOOGLE_SHEETS_REDIRECT_URL}
+      - AIRTABLE_CLIENT_ID=${AIRTABLE_CLIENT_ID}
+      - SLACK_CLIENT_ID=${SLACK_CLIENT_ID}
+      - SLACK_CLIENT_SECRET=${SLACK_CLIENT_SECRET}
      - PRIVACY_URL=${PRIVACY_URL}
      - TERMS_URL=${TERMS_URL}
      - IMPRINT_URL=${IMPRINT_URL}
-      - GITHUB_AUTH_ENABLED=${GITHUB_AUTH_ENABLED:-0}
-      - GITHUB_ID=${GITHUB_ID}
-      - GITHUB_SECRET=${GITHUB_SECRET}
-      - GOOGLE_AUTH_ENABLED=${GOOGLE_AUTH_ENABLED:-0}
-      - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
-      - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
-      - ASSET_PREFIX_URL=${ASSET_PREFIX_URL}
-      - CRON_SECRET=$SERVICE_BASE64_64_CRON
-      - ENCRYPTION_KEY=$SERVICE_BASE64_64_ENCRYPTION
+      - RATE_LIMITING_DISABLED=${RATE_LIMITING_DISABLED:-0}
+      - OPENTELEMETRY_LISTENER_URL=${OPENTELEMETRY_LISTENER_URL}
+      - REDIS_URL=${REDIS_URL}
+      - REDIS_HTTP_URL=${REDIS_HTTP_URL}
+      - DEFAULT_ORGANIZATION_ID=${DEFAULT_ORGANIZATION_ID}
+      - DEFAULT_ORGANIZATION_ROLE=${DEFAULT_ORGANIZATION_ROLE:-admin}
    volumes:
      - formbricks-uploads:/apps/web/uploads/
    depends_on:
--- a/templates/compose/homepage.yaml
+++ b/templates/compose/homepage.yaml
@@ -11,6 +11,112 @@ services:
      - SERVICE_FQDN_HOMEPAGE_3000
      - HOMEPAGE_VAR_BASE=${SERVICE_FQDN_HOMEPAGE}
    volumes:
-      - homepage-config:/app/config
-      - homepage-images:/app/public/images
-      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ./images:/app/public/images
+
+      - type: bind
+        source: ./config/bookmarks.yaml
+        target: /app/config/bookmarks.yaml
+        content: |
+          ---
+          # For configuration options and examples, please see:
+          # https://gethomepage.dev/latest/configs/bookmarks
+
+          - Developer:
+              - Github:
+                  - abbr: GH
+                    href: https://github.com/
+
+          - Social:
+              - Reddit:
+                  - abbr: RE
+                    href: https://reddit.com/
+
+          - Entertainment:
+              - YouTube:
+                  - abbr: YT
+                    href: https://youtube.com/
+
+      - type: bind
+        source: ./config/custom.css
+        target: /app/config/custom.css
+        content: ""
+
+      - type: bind
+        source: ./config/custom.js
+        target: /app/config/custom.js
+        content: ""
+
+      - type: bind
+        source: ./config/docker.yaml
+        target: /app/config/docker.yaml
+        content: |
+          ---
+          # For configuration options and examples, please see:
+          # https://gethomepage.dev/latest/configs/docker/
+
+          # my-docker:
+          #   host: 127.0.0.1
+          #   port: 2375
+
+          # my-docker:
+          #   socket: /var/run/docker.sock
+
+      - type: bind
+        source: ./config/kubernetes.yaml
+        target: /app/config/kubernetes.yaml
+        content: |
+          ---
+          # sample kubernetes config
+
+      - type: bind
+        source: ./config/services.yaml
+        target: /app/config/services.yaml
+        content: |
+          ---
+          # For configuration options and examples, please see:
+          # https://gethomepage.dev/latest/configs/services
+
+          - My First Group:
+              - My First Service:
+                  href: http://localhost/
+                  description: Homepage is awesome
+
+          - My Second Group:
+              - My Second Service:
+                  href: http://localhost/
+                  description: Homepage is the best
+
+          - My Third Group:
+              - My Third Service:
+                  href: http://localhost/
+                  description: Homepage is 😎
+
+      - type: bind
+        source: ./config/settings.yaml
+        target: /app/config/settings.yaml
+        content: |
+          ---
+          # For configuration options and examples, please see:
+          # https://gethomepage.dev/latest/configs/settings
+
+          providers:
+            openweathermap: openweathermapapikey
+            weatherapi: weatherapiapikey
+
+      - type: bind
+        source: ./config/widgets.yaml
+        target: /app/config/widgets.yaml
+        content: |
+          ---
+          # For configuration options and examples, please see:
+          # https://gethomepage.dev/latest/configs/service-widgets
+
+          - resources:
+              cpu: true
+              memory: true
+              disk: /
+
+          - search:
+              provider: duckduckgo
+              target: _blank
--- a/templates/compose/minecraft.yaml
+++ b/templates/compose/minecraft.yaml
@@ -0,0 +1,48 @@
+# documentation: https://github.com/itzg/docker-minecraft-server
+# slogan: Minecraft Server that will automatically download selected version at startup.
+# tags: minecraft
+# logo: svgs/minecraft.svg
+# port: 25565
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+      - ${PORT}:25565
+    environment:
+      - EULA=true
+      - VERSION=${MINECRAFT_VERSION:-latest}
+      - TYPE=${MINECRAFT_TYPE:-VANILLA}
+      - SERVER_NAME=${MINECRAFT_SERVER_NAME:-Minecraft Server}
+      - MOTD=${MINECRAFT_MOTD:-Minecraft Server powered by §aCoolify§r}
+      - DIFFICULTY=${MINECRAFT_DIFFICULTY:-normal}
+      - MAX_PLAYERS=${MINECRAFT_MAX_PLAYERS:-10}
+      - MAX_WORLD_SIZE=${MINECRAFT_MAX_WORLD_SIZE:-10000}
+      - VIEW_DISTANCE=${MINECRAFT_VIEW_DISTANCE:-10}
+      - MAX_BUILD_HEIGHT=${MINECRAFT_MAX_BUILD_HEIGHT:-256}
+      - MAX_TICK_TIME=${MINECRAFT_MAX_TICK_TIME:-60000}
+      - ALLOW_NETHER=${MINECRAFT_ALLOW_NETHER:-true}
+      - ANNOUNCE_PLAYER_ACHIEVEMENTS=${MINECRAFT_ANNOUNCE_PLAYER_ACHIEVEMENTS:-true}
+      - GENERATE_STRUCTURES=${MINECRAFT_GENERATE_STRUCTURES:-true}
+      - PVP=${MINECRAFT_PVP:-true}
+      - FORCE_GAMEMODE=${MINECRAFT_FORCE_GAMEMODE:-false}
+      - HARDCORE=${MINECRAFT_HARDCORE:-false}
+      - ENABLE_COMMAND_BLOCK=${MINECRAFT_ENABLE_COMMAND_BLOCK:-false}
+      - SPAWN_ANIMALS=${MINECRAFT_SPAWN_ANIMALS:-true}
+      - SPAWN_MONSTERS=${MINECRAFT_SPAWN_MONSTERS:-true}
+      - SPAWN_NPCS=${MINECRAFT_SPAWN_NPCS:-true}
+      - SNOOPER_ENABLED=${MINECRAFT_SNOOPER_ENABLED:-true}
+      - ONLINE_MODE=${MINECRAFT_ONLINE_MODE:-true}
+      - PLAYER_IDLE_TIMEOUT=${MINECRAFT_PLAYER_IDLE_TIMEOUT:-0}
+      - MEMORY=${MINECRAFT_MEMORY:-1G}
+      - ENABLE_AUTOPAUSE=${MINECRAFT_ENABLE_AUTOPAUSE:-false}
+      - RCON_PASSWORD=${SERVICE_PASSWORD_RCON}
+      - PORT=${PORT:-25565}
+    volumes:
+      - ./minecraft-data:/data
+    healthcheck:
+      test:
+        ["CMD", "/usr/local/bin/mc-monitor", "status", "--host", "localhost"]
+      interval: 2s
+      timeout: 10s
+      retries: 15
--- a/templates/compose/plausible.yaml
+++ b/templates/compose/plausible.yaml
@@ -6,13 +6,13 @@

 services:
  plausible:
-    image: "ghcr.io/plausible/community-edition:v2.1.0"
+    image: "ghcr.io/plausible/community-edition:v2.1"
    command: 'sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"'
    environment:
      - "DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@plausible_db/plausible"
      - BASE_URL=$SERVICE_FQDN_PLAUSIBLE
      - SECRET_KEY_BASE=$SERVICE_BASE64_64_PLAUSIBLE
-      - TOTP_VAULT_KEY=$SERVICE_BASE64_TOTP
+      - TOTP_VAULT_KEY=$SERVICE_REALBASE64_32_TOTP
    depends_on:
      - plausible_db
      - plausible_events_db