diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c9ddcbae7..5e1fe0d08 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -124,53 +124,8 @@ services: - frontend volumes: - .:/app - - panora-store: - image: minio/minio - container_name: panora-store - environment: - - MINIO_ROOT_USER=${MINIO_ROOT_USER} - - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD} - ports: - - "9000:9000" - - "9001:9001" - command: server /data --console-address ":9001" - healthcheck: - test: timeout 5s bash -c ':> /dev/tcp/127.0.0.1/9000' || exit 1 - start_period: 5s - interval: 10s - timeout: 5s - retries: 2 - volumes: - - pnr-objstr:/data - restart: - unless-stopped - # Initialize s3 buckets - panora-store-init: - image: minio/minio - entrypoint: [] - command: > - sh -c " - sleep 10 && - mc alias set panora-store http://panora-store:9000 ${MINIO_ROOT_USER} ${MINIO_ROOT_PASSWORD} && - echo "****1****" && - mc mb panora-store/${S3_TCG_ATTACHMENTS_BUCKETNAME} && - echo "****2****" && - mc admin user add panora-store ${BUCKET_TCG_ATTACHMENTS_USER} ${BUCKET_TCG_ATTACHMENTS_PW} && - echo "****3****" && - mc admin policy attach panora-store readwrite --user ${BUCKET_TCG_ATTACHMENTS_USER} && - echo "****4****" && - mc ls panora-store - " - depends_on: - - postgres - volumes: - - pnr-objstr:/data networks: frontend: backend: - -volumes: - pnr-objstr: \ No newline at end of file diff --git a/docker-compose.source.yml b/docker-compose.source.yml index edd07eac5..797c32811 100644 --- a/docker-compose.source.yml +++ b/docker-compose.source.yml @@ -37,8 +37,6 @@ services: ENCRYPT_CRYPTO_SECRET_KEY: ${ENCRYPT_CRYPTO_SECRET_KEY} HUBSPOT_CLIENT_ID: ${HUBSPOT_CLIENT_ID} HUBSPOT_CLIENT_SECRET: ${HUBSPOT_CLIENT_SECRET} - ATTIO_CLIENT_ID: ${ATTIO_CLIENT_ID} - ATTIO_CLIENT_SECRET: ${ATTIO_CLIENT_SECRET} ZOHOCRM_CLIENT_ID: ${ZOHOCRM_CLIENT_ID} ZOHOCRM_CLIENT_SECRET: ${ZOHOCRM_CLIENT_SECRET} PIPEDRIVE_CLIENT_ID: ${PIPEDRIVE_CLIENT_ID} @@ -49,6 +47,8 @@ services: ZENDESK_TICKETING_SUBDOMAIN: ${ZENDESK_TICKETING_SUBDOMAIN} ZENDESK_TICKETING_CLIENT_ID: ${ZENDESK_TICKETING_CLIENT_ID} ZENDESK_TICKETING_CLIENT_SECRET: ${ZENDESK_TICKETING_CLIENT_SECRET} + STYTCH_PROJECT_ID: ${STYTCH_PROJECT_ID} + STYTCH_SECRET: ${STYTCH_SECRET} restart: unless-stopped ports: - 3000:3000 @@ -79,11 +79,11 @@ services: NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN: ${NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN} NEXT_PUBLIC_DISTRIBUTION: ${DISTRIBUTION} NEXT_PUBLIC_BACKEND_DOMAIN: ${NEXT_PUBLIC_BACKEND_DOMAIN} - NEXT_PUBLIC_MAGIC_LINK_DOMAIN: ${NEXT_PUBLIC_MAGIC_LINK_DOMAIN} + NEXT_PUBLIC_FRONTEND_DOMAIN: ${NEXT_PUBLIC_FRONTEND_DOMAIN} NEXT_PUBLIC_WEBAPP_DOMAIN: ${NEXT_PUBLIC_WEBAPP_DOMAIN} restart: unless-stopped ports: - - 80:8090 + - 80:3000 depends_on: - api networks: @@ -94,6 +94,8 @@ services: build: dockerfile: ./apps/magic-link/Dockerfile context: ./ + args: + NEXT_PUBLIC_MAGIC_LINK_DOMAIN: ${NEXT_PUBLIC_MAGIC_LINK_DOMAIN} restart: always ports: - 81:80 @@ -102,52 +104,6 @@ services: networks: - backend - frontend - - panora-store: - image: minio/minio - container_name: panora-store - environment: - - MINIO_ROOT_USER=${MINIO_ROOT_USER} - - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD} - ports: - - '9000:9000' - - '9001:9001' - command: server /data --console-address ":9001" - healthcheck: - test: timeout 5s bash -c ':> /dev/tcp/127.0.0.1/9000' || exit 1 - start_period: 5s - interval: 10s - timeout: 5s - retries: 2 - volumes: - - pnr-objstr:/data - restart: unless-stopped - - # Initialize s3 buckets - panora-store-init: - image: minio/minio - entrypoint: [] - command: > - sh -c " - sleep 10 && - mc alias set panora-store http://panora-store:9000 ${MINIO_ROOT_USER} ${MINIO_ROOT_PASSWORD} && - echo "****1****" && - mc mb panora-store/${S3_TCG_ATTACHMENTS_BUCKETNAME} && - echo "****2****" && - mc admin user add panora-store ${BUCKET_TCG_ATTACHMENTS_USER} ${BUCKET_TCG_ATTACHMENTS_PW} && - echo "****3****" && - mc admin policy attach panora-store readwrite --user ${BUCKET_TCG_ATTACHMENTS_USER} && - echo "****4****" && - mc ls panora-store - " - depends_on: - - postgres - volumes: - - pnr-objstr:/data - networks: frontend: - backend: - -volumes: - pnr-objstr: + backend: \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 4ef53b894..bdf452208 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -77,26 +77,6 @@ services: - backend - frontend - panora-store: - image: minio/minio - container_name: panora-store - environment: - - MINIO_ROOT_USER=${MINIO_ROOT_USER} - - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD} - ports: - - "9000:9000" - - "9001:9001" - command: server /data --console-address ":9001" - healthcheck: - test: timeout 5s bash -c ':> /dev/tcp/127.0.0.1/9000' || exit 1 - start_period: 5s - interval: 10s - timeout: 5s - retries: 2 - volumes: - - pnr-objstr:/data - restart: - unless-stopped webapp-next: image: panoradotdev/frontend-webapp:latest @@ -118,31 +98,7 @@ services: - backend - frontend - # Initialize s3 buckets - panora-store-init: - image: minio/minio - entrypoint: [] - command: > - sh -c " - sleep 10 && - mc alias set panora-store http://panora-store:9000 ${MINIO_ROOT_USER} ${MINIO_ROOT_PASSWORD} && - echo "****1****" && - mc mb panora-store/${S3_TCG_ATTACHMENTS_BUCKETNAME} && - echo "****2****" && - mc admin user add panora-store ${BUCKET_TCG_ATTACHMENTS_USER} ${BUCKET_TCG_ATTACHMENTS_PW} && - echo "****3****" && - mc admin policy attach panora-store readwrite --user ${BUCKET_TCG_ATTACHMENTS_USER} && - echo "****4****" && - mc ls panora-store - " - depends_on: - - postgres - volumes: - - pnr-objstr:/data networks: frontend: backend: - -volumes: - pnr-objstr: \ No newline at end of file