Merge branch 'services' into next

templates/compose/postiz.yaml

@@ -1,13 +1,13 @@
 # ignore: true
-# documentation: https://docs.postiz.com/introduction
-# slogan:
-# tags:
-# logo:
+# documentation: https://docs.postiz.com
+# slogan: Open source social media scheduling tool.
+# tags: post everywhere, social media, planning
+# logo: svgs/postiz.svg
 # port: 5000
 
 services:
   postiz:
-    image: "ghcr.io/gitroomhq/postiz-app:latest"
+    image: ghcr.io/gitroomhq/postiz-app:latest
     environment:
       - SERVICE_FQDN_POSTIZ_5000
       - MAIN_URL=${SERVICE_FQDN_POSTIZ}
@@ -18,20 +18,57 @@ services:
       - REDIS_URL=redis://redis:6379
       - BACKEND_INTERNAL_URL=http://localhost:3000/
       - IS_GENERAL=true
-      - CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
-      - CLOUDFLARE_ACCESS_KEY=${CLOUDFLARE_ACCESS_KEY}
-      - CLOUDFLARE_SECRET_ACCESS_KEY=${CLOUDFLARE_SECRET_ACCESS_KEY}
-      - CLOUDFLARE_BUCKETNAME=${CLOUDFLARE_BUCKETNAME}
-      - CLOUDFLARE_BUCKET_URL=${CLOUDFLARE_BUCKET_URL}
-      - CLOUDFLARE_REGION=${CLOUDFLARE_REGION}
-      - RESEND_API_KEY=${RESEND_API_KEY}
-      - EMAIL_FROM_ADDRESS=${EMAIL_FROM_ADDRESS}
-      - EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
+      - STORAGE_PROVIDER=local
+      - UPLOAD_DIRECTORY=/uploads
+      - NEXT_PUBLIC_UPLOAD_DIRECTORY=/uploads
+      - X_API_KEY=${SERVICE_X_API}
+      - X_API_SECRET=${SERVICE_X_SECRET}
+      - REDDIT_CLIENT_ID=${SERVICE_REDDIT_API}
+      - REDDIT_CLIENT_SECRET=${SERVICE_REDDIT_SECRET}
+      - TIKTOK_CLIENT_ID=${SERVICE_TIKTOK_ID}
+      - TIKTOK_CLIENT_SECRET=${SERVICE_TIKTOK_SECRET}
+      - SLACK_ID=${SERVICE_SLACK_ID}
+      - SLACK_SECRET=${SERVICE_SLACK_SECRET}
+      - PINTEREST_CLIENT_ID=${SERVICE_PINTEREST_ID}
+      - PINTEREST_CLIENT_SECRET=${SERVICE_PINTEREST_SECRET}
+      - DRIBBLE_CLIENT_ID=${SERVICE_DRIBBLE_ID}
+      - DRIBBLE_CLIENT_SECRET=${SERVICE_DRIBBLE_SECRET}
+      - DISCORD_CLIENT_ID=${SERVICE_DISCORD_ID}
+      - DISCORD_CLIENT_SECRET=${SERVICE_DISCORD_SECRET}
+      - DISCORD_BOT_TOKEN_ID=${SERVICE_DISCORD_TOKEN}
+      - YOUTUBE_CLIENT_ID=${SERVICE_YOUTUBE_ID}
+      - YOUTUBE_CLIENT_SECRET=${SERVICE_YOUTUBE_SECRET}
+      - MASTODON_CLIENT_ID=${SERVICE_MASTODON_ID}
+      - MASTODON_CLIENT_SECRET=${SERVICE_MASTODON_SECRET}
+      - LINKEDIN_CLIENT_ID=${SERVICE_LINKEDIN_ID}
+      - LINKEDIN_CLIENT_SECRET=${SERVICE_LINKEDIN_SECRET}
+      - INSTAGRAM_APP_ID=${SERVICE_INSTAGRAM_ID}
+      - INSTAGRAM_APP_SECRET=${SERVICE_INSTAGRAM_SECRET}
+      - FACEBOOK_APP_ID=${SERVICE_FACEBOOK_ID}
+      - FACEBOOK_APP_SECRET=${SERVICE_FACEBOOK_SECRET}
+      - THREADS_APP_ID=${SERVICE_THREADS_ID}
+      - THREADS_APP_SECRET=${SERVICE_THREADS_SECRET}
+      - GITHUB_CLIENT_ID=${SERVICE_GITHUB_ID}
+      - GITHUB_CLIENT_SECRET=${SERVICE_GITHUB_SECRET}
+      - BEEHIIVE_API_KEY=${SERVICE_BEEHIIVE_KEY}
+      - BEEHIIVE_PUBLICATION_ID=${SERVICE_BEEHIIVE_PUBID}
+      - OPENAI_API_KEY=${SERVICE_OPENAI_KEY}
+    volumes:
+      - postiz-config:/config/
+      - postiz-uploads:/uploads/
     depends_on:
-      postgres:
+      postiz-postgres:
         condition: service_healthy
-      redis:
-        condition: service_started
+      postiz-redis:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:5000/"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+
+  postiz-postgres:
+    image: postgres:14.5
     volumes:
       - 'postiz_config:/config'
       - 'postiz_uploads:/uploads'
@@ -42,24 +79,26 @@ services:
       retries: 10
   postgres:
     image: "postgres:latest"
+      - postiz-postgresql-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_DB=${POSTGRES_DB:-postiz}
-      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
-      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
-      - POSTGRES_PORT=${POSTGRES_PORT:-5432}
-    volumes:
-      - "pg-data:/var/lib/postgresql/data"
+      - POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
+      - POSTGRES_DB=${POSTGRESQL_DATABASE:-postiz-db}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
       timeout: 20s
       retries: 10
-  redis:
-    image: "redis:7.2"
+
+  postiz-redis:
+    image: redis:7.2
     volumes:
-      - "redis_data:/data"
+      - postiz-redis-data:/data
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test:
+        - CMD
+        - redis-cli
+        - PING
       interval: 5s
-      timeout: 20s
-      retries: 10
+      timeout: 10s
+      retries: 20