diff --git a/.env-sample b/.env-sample index cff85f81..d2416316 100644 --- a/.env-sample +++ b/.env-sample @@ -7,7 +7,6 @@ DJANGO_SECRET_KEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX # DJANGO_DEBUG= # DEEP_ENVIRONMENT= # DEEP_FRONTEND_HOST= -# DEEP_FRONTEND_ARY_HOST= # DJANGO_ALLOWED_HOST= # SESSION_COOKIE_DOMAIN= # CSRF_COOKIE_DOMAIN= diff --git a/.github/workflows/ary-deploy.yml b/.github/workflows/ary-deploy.yml deleted file mode 100644 index e05c347d..00000000 --- a/.github/workflows/ary-deploy.yml +++ /dev/null @@ -1,263 +0,0 @@ -name: Deep client Deployment (ARY only) - -on: - push: - branches: - - main - -jobs: - deploy_config: - name: Read deploy config - runs-on: ubuntu-latest - outputs: - deploy: ${{ steps.config.outputs.deploy }} - repo: ${{ steps.config.outputs.repo }} - branch: ${{ steps.config.outputs.branch }} - react_store_branch: ${{ steps.config.outputs.react_store_branch }} - react_store_repo: ${{ steps.config.outputs.react_store_repo }} - steps: - - uses: actions/checkout@v2 - - - name: Read deploy config - id: config - run: | - SUB_MODULES_DEP_FILE=./deploy.json - DEEP_CLIENT_DEPLOY=`jq -r '.ary_client.deploy' ${SUB_MODULES_DEP_FILE}` - DEEP_CLIENT_REPO=`jq -r '.ary_client.repo' ${SUB_MODULES_DEP_FILE}` - DEEP_CLIENT_BRANCH=`jq -r '.ary_client.branch' ${SUB_MODULES_DEP_FILE}` - DEEP_REACT_STORE_REPO=`jq -r '.ary_client.react_store_repo' ${SUB_MODULES_DEP_FILE}` - DEEP_REACT_STORE_BRANCH=`jq -r '.ary_client.react_store_branch' ${SUB_MODULES_DEP_FILE}` - echo "deploy=${DEEP_CLIENT_DEPLOY}" >> $GITHUB_OUTPUT - echo "branch=${DEEP_CLIENT_BRANCH}" >> $GITHUB_OUTPUT - echo "repo=${DEEP_CLIENT_REPO#https://github.com/}" >> $GITHUB_OUTPUT - echo "react_store_repo=${DEEP_REACT_STORE_REPO#https://github.com/}" >> $GITHUB_OUTPUT - echo "react_store_branch=${DEEP_REACT_STORE_BRANCH}" >> $GITHUB_OUTPUT - - test_build: - name: Lint + Test + Build - needs: deploy_config - if: ${{ needs.deploy_config.outputs.deploy == 'true' }} - runs-on: ubuntu-latest - steps: - - name: Clone client - uses: actions/checkout@v2 - with: - repository: ${{ needs.deploy_config.outputs.repo }} - ref: ${{ needs.deploy_config.outputs.branch }} - path: ./client - - - name: Clone client - uses: actions/checkout@v2 - with: - repository: ${{ needs.deploy_config.outputs.react_store_repo }} - ref: ${{ needs.deploy_config.outputs.react_store_branch }} - path: ./client/src/vendor/react-store - - - name: ๐Ÿณ Prepare Docker - id: prep - run: | - TAG=$(echo $GITHUB_SHA | head -c7) - IMAGE="docker.pkg.github.com/the-deep/client" - echo "tagged_image=${IMAGE}:${TAG}" >> $GITHUB_OUTPUT - echo "tag=${TAG}" >> $GITHUB_OUTPUT - - name: ๐Ÿณ Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@master - - - name: ๐Ÿณ Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-single-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-ary-single-buildx - - - name: ๐Ÿณ Build image - uses: docker/build-push-action@v2 - with: - context: ./client/ # Custom - builder: ${{ steps.buildx.outputs.name }} - file: ./client/Dockerfile # Custom - push: false # This would be set to true in a real world deployment scenario. - load: true - tags: ${{ steps.prep.outputs.tagged_image }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new - - - name: ๐Ÿคž Run Build + Lint + Test ๐Ÿงช - env: - DOCKER_IMAGE: ${{ steps.prep.outputs.tagged_image }} - run: | - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" && \ - docker run --rm --workdir="/code/" $DOCKER_IMAGE sh -c 'yarn lint' - - # Temp fix - # https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#github-cache - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: ๐Ÿณ Move docker cache (๐Ÿง™ Hack fix) - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - - # [End] From client .github/workflows/ci.yml - - - name: Build [Staging] - env: - DOCKER_IMAGE: ${{ steps.prep.outputs.tagged_image }} - # Misc - REACT_APP_DEEP_ENVIRONMENT: staging - REACT_APP_DEBUG_MODE: true - # Endpoints - REACT_APP_API_HTTPS: https - REACT_APP_API_END: staging-api.thedeep.io - REACT_APP_GRAPHQL_ENDPOINT: https://staging-api.thedeep.io/graphql - REACT_APP_SERVERLESS_DOMAIN: https://services-alpha.thedeep.io - # Iframes - REACT_APP_ASSESSMENT_REGISTRY_END: https://staging-ary.thedeep.io - REACT_APP_ASSESSMENT_VIZ_URL: https://the-deep.github.io/deepviz-assessments/ - REACT_APP_ENTRY_VIZ_URL: https://the-deep.github.io/deepviz-entries/ - # Chrome extension - REACT_APP_BROWSER_EXTENSION_ID: hkmakfhfikfhllpkfpkkaoonapclfajf - # Mapbox # FIXME: Make sure to use valid token for deep domain. - REACT_APP_MAPBOX_STYLE: mapbox://styles/deepmapz/cjc8oth8775tu2sr0eeymm3qv - REACT_APP_MAPBOX_ACCESS_TOKEN: pk.eyJ1IjoiZGVlcG1hcHoiLCJhIjoiY2pjMjN1bjBxMGJmYjJ3bnpwZXlydzNkeiJ9.vYTnFCIPiRCT8jA33Dti5A - # Google Analytics - REACT_APP_GA_TRACKING_ID: UA-112330910-1 - # Sentry - REACT_APP_SENTRY_DSN: https://9a60f35c6a1c45fe999727c5f6f7229c@sentry.io/1220157 - REACT_APP_SENTRY_TRACES_SAMPLE_RATE: 0.2 - REACT_APP_SENTRY_NORMALIZE_DEPTH: 5 - # HID - REACT_APP_HID_CLIENT_ID: deeper-staging - REACT_APP_HID_CLIENT_REDIRECT_URL: https://staging.thedeep.io/login/ - REACT_APP_HID_AUTH_URI: https://auth.humanitarian.id - # Hcaptcha - REACT_APP_HCATPCHA_SITEKEY: ac332154-0c48-4fc1-9092-e52b291d903c - # Google Drive - REACT_APP_GOOGLE_DRIVE_DEVELOPER_KEY: AIzaSyAcaVOYWk0zGL9TVQfKXdziFI-5pEkw6X4 - REACT_APP_GOOGLE_DRIVE_CLIENT_KEY: 642927279233-ht6v3t7h37cc4gjh336sbin6hdlup2vi.apps.googleusercontent.com - run: | - env > env && \ - docker run --rm --env-file=./env -v `pwd`/client/build:/code/build $DOCKER_IMAGE sh -c 'yarn install && CI=false NODE_OPTIONS=--max_old_space_size=4096 yarn build' - - - name: Upload artifacts [Staging] - uses: actions/upload-artifact@v2 - with: - name: ary-client-build-staging - path: ./client/build/ - - - name: Build [Prod] - env: - DOCKER_IMAGE: ${{ steps.prep.outputs.tagged_image }} - # Misc - REACT_APP_DEEP_ENVIRONMENT: prod - REACT_APP_DEBUG_MODE: false - # Endpoints - REACT_APP_API_HTTPS: https - REACT_APP_API_END: prod-api.thedeep.io - REACT_APP_GRAPHQL_ENDPOINT: https://prod-api.thedeep.io/graphql - REACT_APP_SERVERLESS_DOMAIN: https://services.thedeep.io - # Iframes - REACT_APP_ASSESSMENT_REGISTRY_END: https://prod-ary.thedeep.io - REACT_APP_ASSESSMENT_VIZ_URL: https://the-deep.github.io/deepviz-assessments/ - REACT_APP_ENTRY_VIZ_URL: https://the-deep.github.io/deepviz-entries/ - # Chrome extension - REACT_APP_BROWSER_EXTENSION_ID: hkmakfhfikfhllpkfpkkaoonapclfajf - # Mapbox # FIXME: Make sure to use valid token for deep domain. - REACT_APP_MAPBOX_ACCESS_TOKEN: pk.eyJ1IjoiZGVlcG1hcHoiLCJhIjoiY2pjMjN1bjBxMGJmYjJ3bnpwZXlydzNkeiJ9.vYTnFCIPiRCT8jA33Dti5A - REACT_APP_MAPBOX_STYLE: mapbox://styles/deepmapz/cjc8oth8775tu2sr0eeymm3qv - # Google Analytics - REACT_APP_GA_TRACKING_ID: UA-112330910-1 - # Sentry - REACT_APP_SENTRY_DSN: https://9a60f35c6a1c45fe999727c5f6f7229c@sentry.io/1220157 - REACT_APP_SENTRY_TRACES_SAMPLE_RATE: 0.2 - REACT_APP_SENTRY_NORMALIZE_DEPTH: 5 - # HID - REACT_APP_HID_CLIENT_ID: deeper-prod - REACT_APP_HID_CLIENT_REDIRECT_URL: https://app.thedeep.io/login/ - REACT_APP_HID_AUTH_URI: https://auth.humanitarian.id - # Hcaptcha - REACT_APP_HCATPCHA_SITEKEY: ac332154-0c48-4fc1-9092-e52b291d903c - # Google Drive - REACT_APP_GOOGLE_DRIVE_DEVELOPER_KEY: AIzaSyAcaVOYWk0zGL9TVQfKXdziFI-5pEkw6X4 - REACT_APP_GOOGLE_DRIVE_CLIENT_KEY: 642927279233-ht6v3t7h37cc4gjh336sbin6hdlup2vi.apps.googleusercontent.com - run: | - env > env && \ - docker run --rm --env-file=./env -v `pwd`/client/build:/code/build $DOCKER_IMAGE sh -c 'yarn install && CI=false NODE_OPTIONS=--max_old_space_size=4096 yarn build' - - - name: Upload artifacts [Prod] - uses: actions/upload-artifact@v2 - with: - name: ary-client-build-prod - path: ./client/build/ - - staging_deploy: - name: Deploy (STAGING) - runs-on: ubuntu-latest - environment: - name: staging - url: https://staging-ary.thedeep.io - needs: test_build - steps: - - uses: actions/download-artifact@v1 - with: - name: ary-client-build-staging - path: build - - # Copy build to S3 - - name: S3 Sync - uses: jakejarvis/s3-sync-action@master - with: - args: --acl public-read --follow-symlinks --delete - env: - AWS_S3_BUCKET: deep-staging-ary-client - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_REGION: ${{ secrets.AWS_REGION }} - SOURCE_DIR: './build' - - # Invalidate Cloudfront (this action) - - name: Cloudfront Invalidate - uses: chetan/invalidate-cloudfront-action@master - env: - DISTRIBUTION: ${{ secrets.AWS_CDN_DISTRIBUTION }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_REGION: ${{ secrets.AWS_REGION }} - PATHS: '/index.html' - - prod_deploy: - name: Deploy (PROD) - runs-on: ubuntu-latest - environment: - name: prod - url: https://prod-ary.thedeep.io - needs: [test_build, staging_deploy] - steps: - - uses: actions/download-artifact@v1 - with: - name: ary-client-build-prod - path: build - - # Copy build to S3 - - name: S3 Sync - uses: jakejarvis/s3-sync-action@master - with: - args: --acl public-read --follow-symlinks --delete - env: - AWS_S3_BUCKET: deep-prod-ary-client - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_REGION: ${{ secrets.AWS_REGION }} - SOURCE_DIR: './build' - - # Invalidate Cloudfront (this action) - - name: Cloudfront Invalidate - uses: chetan/invalidate-cloudfront-action@master - env: - DISTRIBUTION: ${{ secrets.ARY_AWS_CDN_DISTRIBUTION }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_REGION: ${{ secrets.AWS_REGION }} - PATHS: '/index.html' diff --git a/aws/cfn-client.yml b/aws/cfn-client.yml index 5d7f25d4..2cae671b 100644 --- a/aws/cfn-client.yml +++ b/aws/cfn-client.yml @@ -17,17 +17,11 @@ Mappings: BucketName: deep-staging-client UpdatePolicyName: deep-staging-client-update-policy UpdateIamUserName: deep-staging-client-update-user - AryDomain: staging-ary.thedeep.io - AryBucketName: deep-staging-ary-client - AryUpdatePolicyName: deep-staging-ary-client-update-policy prod: Domain: app.thedeep.io BucketName: deep-prod-client UpdatePolicyName: deep-prod-client-update-policy UpdateIamUserName: deep-prod-client-update-user - AryDomain: prod-ary.thedeep.io - AryBucketName: deep-prod-ary-client - AryUpdatePolicyName: deep-prod-ary-client-update-policy Resources: CloudFrontFunction: @@ -182,116 +176,12 @@ Resources: - !Join ['', ['arn:aws:s3:::', !Ref 'WebsiteBucket']] - !Join ['', ['arn:aws:s3:::', !Ref 'WebsiteBucket', /*]] - # -- ARY [Start] - AryWebsiteBucket: - Type: AWS::S3::Bucket - Properties: - BucketName: !FindInMap [EnvMaps, !Ref Env, AryBucketName] - AccessControl: PublicRead - WebsiteConfiguration: - IndexDocument: index.html - ErrorDocument: index.html - - AryWebsiteBucketPolicy: - Type: AWS::S3::BucketPolicy - Properties: - Bucket: !Ref 'AryWebsiteBucket' - PolicyDocument: - Statement: - - Sid: PublicReadForGetBucketObjects - Effect: Allow - Principal: '*' - Action: s3:GetObject - Resource: !Join ['', ['arn:aws:s3:::', !Ref 'AryWebsiteBucket', /*]] - - AryAcmCertificate: - Type: AWS::CertificateManager::Certificate - Properties: - DomainName: !FindInMap [EnvMaps, !Ref Env, AryDomain] - DomainValidationOptions: - - DomainName: !FindInMap [EnvMaps, !Ref Env, AryDomain] - HostedZoneId: !Ref 'HostedZoneId' - ValidationMethod: DNS - - AryWebsiteCloudfront: - Type: AWS::CloudFront::Distribution - DependsOn: - - AryWebsiteBucket - Properties: - DistributionConfig: - Comment: Cloudfront Distribution pointing to S3 bucket - Origins: - - DomainName: !Select [2, !Split ["/", !GetAtt AryWebsiteBucket.WebsiteURL]] - Id: S3Origin - CustomOriginConfig: - HTTPPort: '80' - HTTPSPort: '443' - OriginProtocolPolicy: http-only - Enabled: true - HttpVersion: 'http2' - DefaultRootObject: index.html - Aliases: - - !FindInMap [EnvMaps, !Ref Env, AryDomain] - DefaultCacheBehavior: - AllowedMethods: - - GET - - HEAD - Compress: true - TargetOriginId: S3Origin - ForwardedValues: - QueryString: true - Cookies: - Forward: none - ViewerProtocolPolicy: redirect-to-https - PriceClass: PriceClass_All - ViewerCertificate: - AcmCertificateArn: !Ref AryAcmCertificate - SslSupportMethod: sni-only - - AryDNSRecord: - Type: AWS::Route53::RecordSet - Properties: - HostedZoneId: !Ref 'HostedZoneId' - Comment: CNAME redirect custom name to CloudFront distribution - Name: !FindInMap [EnvMaps, !Ref Env, AryDomain] - Type: CNAME - TTL: '900' - ResourceRecords: - - !GetAtt [AryWebsiteCloudfront, DomainName] - - AryClientUpdateIamPolicy: - Type: AWS::IAM::ManagedPolicy - Properties: - ManagedPolicyName: !FindInMap [EnvMaps, !Ref Env, AryUpdatePolicyName] - Description: Policy for to update static files and invalidate CloudFront cache - PolicyDocument: - Version: 2012-10-17 - Statement: - - Action: - - cloudfront:CreateInvalidation - Effect: Allow - Resource: - - !Join ['', [!Sub 'arn:aws:cloudfront::${AWS::AccountId}:distribution/', !Ref 'AryWebsiteCloudfront']] - - Action: - - s3:DeleteObject - - s3:GetBucketLocation - - s3:GetObject - - s3:ListBucket - - s3:PutObject - - s3:PutObjectAcl - Effect: Allow - Resource: - - !Join ['', ['arn:aws:s3:::', !Ref 'AryWebsiteBucket']] - - !Join ['', ['arn:aws:s3:::', !Ref 'AryWebsiteBucket', /*]] - # -- ARY [END] - ClientUpdateIamUser: Type: AWS::IAM::User Properties: UserName: !FindInMap [EnvMaps, !Ref Env, UpdateIamUserName] ManagedPolicyArns: - !Ref ClientUpdateIamPolicy - - !Ref AryClientUpdateIamPolicy Outputs: BucketName: @@ -309,18 +199,3 @@ Outputs: UpdatePolicyName: Description: Policy to be used to update client files Value: !FindInMap [EnvMaps, !Ref Env, UpdatePolicyName] - AryBucketName: - Value: !Ref 'AryWebsiteBucket' - Description: Name of S3 bucket to hold website content - AryCloudfrontEndpoint: - Value: !GetAtt [AryWebsiteCloudfront, DomainName] - Description: Endpoint for Cloudfront distribution - AryCloudfrontDistributionId: - Value: !Ref 'AryWebsiteCloudfront' - Description: ID for Cloudfront distribution - AryDNSRecord: - Value: !Ref AryDNSRecord - Description: Custom DNS Record - AryUpdatePolicyName: - Description: Policy to be used to update client files - Value: !FindInMap [EnvMaps, !Ref Env, AryUpdatePolicyName] diff --git a/copilot/export-worker/manifest.yml b/copilot/export-worker/manifest.yml index 83df01f6..23f728d9 100644 --- a/copilot/export-worker/manifest.yml +++ b/copilot/export-worker/manifest.yml @@ -51,7 +51,6 @@ secrets: HID_CLIENT_REDIRECT_URL: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_REDIRECT_URL HID_AUTH_URI: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_AUTH_URI DEEP_FRONTEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_HOST - DEEP_FRONTEND_ARY_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_ARY_HOST EMAIL_FROM: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/EMAIL_FROM DJANGO_ADMINS: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DJANGO_ADMINS CSRF_COOKIE_DOMAIN: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/CSRF_COOKIE_DOMAIN diff --git a/copilot/web/manifest.yml b/copilot/web/manifest.yml index a5674a81..5056e469 100644 --- a/copilot/web/manifest.yml +++ b/copilot/web/manifest.yml @@ -47,7 +47,6 @@ secrets: HID_CLIENT_REDIRECT_URL: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_REDIRECT_URL HID_AUTH_URI: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_AUTH_URI DEEP_FRONTEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_HOST - DEEP_FRONTEND_ARY_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_ARY_HOST EMAIL_FROM: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/EMAIL_FROM DJANGO_ADMINS: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DJANGO_ADMINS CSRF_COOKIE_DOMAIN: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/CSRF_COOKIE_DOMAIN diff --git a/copilot/worker/manifest.yml b/copilot/worker/manifest.yml index 38c1e5b5..39bdeff5 100644 --- a/copilot/worker/manifest.yml +++ b/copilot/worker/manifest.yml @@ -51,7 +51,6 @@ secrets: HID_CLIENT_REDIRECT_URL: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_REDIRECT_URL HID_AUTH_URI: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_AUTH_URI DEEP_FRONTEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_HOST - DEEP_FRONTEND_ARY_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_ARY_HOST EMAIL_FROM: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/EMAIL_FROM DJANGO_ADMINS: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DJANGO_ADMINS CSRF_COOKIE_DOMAIN: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/CSRF_COOKIE_DOMAIN diff --git a/deploy.json b/deploy.json index 971ebbcb..74d2a305 100644 --- a/deploy.json +++ b/deploy.json @@ -3,13 +3,6 @@ "client": { "repo": "https://github.com/the-deep/client", "branch": "release-v2.5.6", - "deploy": true - }, - "ary_client": { - "repo": "https://github.com/the-deep/client", - "branch": "release-only-ary-v1.1.1", - "react_store_repo": "https://github.com/toggle-corp/react-store", - "react_store_branch": "72a9230716d9eebdb4c506d99b64cebe6031b45c", "deploy": false }, "server": { diff --git a/docker-compose-alpha.yml b/docker-compose-alpha.yml index 147cbe6e..2a6d39cf 100644 --- a/docker-compose-alpha.yml +++ b/docker-compose-alpha.yml @@ -12,7 +12,6 @@ x-server: &base_server_setup DJANGO_DEBUG: ${DJANGO_DEBUG:-True} DEEP_ENVIRONMENT: ${DEEP_ENVIRONMENT:-development} DEEP_FRONTEND_HOST: ${DEEP_FRONTEND_HOST:-localhost:3000} - DEEP_FRONTEND_ARY_HOST: ${DEEP_FRONTEND_ARY_HOST:-localhost:3001} DEEP_BACKEND_HOST: ${DEEP_BACKEND_HOST:-localhost:8000} DJANGO_ALLOWED_HOST: ${DJANGO_ALLOWED_HOST:-localhost} SESSION_COOKIE_DOMAIN: ${SESSION_COOKIE_DOMAIN:-localhost} @@ -125,15 +124,6 @@ services: - ./client/:/code - client-static:/build/ - ary-client: - <<: *base_client_setup - image: docker.pkg.github.com/the-deep/client:ary-only - build: - context: ./ary-only-client/ - volumes: - - ./ary-only-client/:/code - - client-ary-static:/build/ - extractor: image: docker.pkg.github.com/the-deep/deepl-service:latest build: @@ -156,7 +146,6 @@ services: - ./nginx.alpha.conf.template:/etc/nginx/templates/default.conf.template:ro # Static files - client-static:/app-assests/client-static:ro - - client-ary-static:/app-assests/client-ary-static:ro - server-static:/app-assests/server-static:ro # Media files - server-media:/app-assests/server-media:ro @@ -166,7 +155,6 @@ services: environment: - NGINX_SERVER_HOST=${DEEP_BACKEND_HOST} - NGINX_CLIENT_HOST=${DEEP_FRONTEND_HOST} - - NGINX_CLIENT_ARY_HOST=${DEEP_FRONTEND_ARY_HOST} ports: - '8001:443' # depends_on: @@ -177,6 +165,5 @@ volumes: postgres-data13: redis-data: client-static: - client-ary-static: server-static: server-media: diff --git a/docker-compose.yml b/docker-compose.yml index 77f4b5e5..0cf406bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,6 @@ x-server: &base_server_setup DJANGO_DEBUG: ${DJANGO_DEBUG:-True} DEEP_ENVIRONMENT: ${DEEP_ENVIRONMENT:-development} DEEP_FRONTEND_HOST: ${DEEP_FRONTEND_HOST:-localhost:3000} - DEEP_FRONTEND_ARY_HOST: ${DEEP_FRONTEND_ARY_HOST:-localhost:3001} DEEP_BACKEND_HOST: ${DEEP_BACKEND_HOST:-localhost:8000} DJANGO_ALLOWED_HOST: ${DJANGO_ALLOWED_HOST:-localhost} SESSION_COOKIE_DOMAIN: ${SESSION_COOKIE_DOMAIN:-localhost} @@ -139,16 +138,6 @@ services: ports: - '3000:3000' - ary-client: - <<: *base_client_setup - image: docker.pkg.github.com/the-deep/ary-only-client:latest - build: - context: ./ary-only-client/ - volumes: - - ./ary-only-client/:/code - ports: - - '3001:3000' - extractor: image: docker.pkg.github.com/the-deep/deepl-service:latest build: diff --git a/docs/Options/GettingStarted.rst b/docs/Options/GettingStarted.rst index c07da614..d3370209 100644 --- a/docs/Options/GettingStarted.rst +++ b/docs/Options/GettingStarted.rst @@ -34,7 +34,6 @@ git clone https://github.com/the-deep/deeper.git deep-project-root git clone https://github.com/the-deep/server.git server git clone https://github.com/the-deep/client.git client -git clone --branch=feature/only-ary https://github.com/the-deep/client.git ./ary-only-client git clone https://github.com/the-deep/deepl-deep-integration.git deepl-service diff --git a/docs/Options/Installation.rst b/docs/Options/Installation.rst index 7c636b87..191d1653 100644 --- a/docs/Options/Installation.rst +++ b/docs/Options/Installation.rst @@ -35,12 +35,6 @@ To clone the client repository, use the following command: git clone https://github.com/the-deep/client.git client -To clone the client repository (ARY branch), use the following command: - -.. code-block:: shell - - git clone --branch=feature/only-ary https://github.com/the-deep/client.git ./ary-only-client - To clone the Deepl services repository, use the following command: .. code-block:: shell @@ -113,4 +107,4 @@ Useful Commands .. code-block:: shell docker compose up --build - \ No newline at end of file + diff --git a/nginx.alpha.conf.template b/nginx.alpha.conf.template index 5835f398..00dddf3a 100644 --- a/nginx.alpha.conf.template +++ b/nginx.alpha.conf.template @@ -46,22 +46,4 @@ server { ssl_certificate_key /nginx-certs/server.key; } - -server { - listen 443 ssl; - server_name $NGINX_CLIENT_ARY_HOST; - - gzip on; - gzip_comp_level 4; - gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; - - location / { - alias /app-assests/client-ary-static/; - try_files $uri /index.html; - } - - ssl_certificate /nginx-certs/server.crt; - ssl_certificate_key /nginx-certs/server.key; -} - # set vim: syntax=nginx diff --git a/secrets-sample.yml b/secrets-sample.yml index 4ae442ea..c2387f6f 100644 --- a/secrets-sample.yml +++ b/secrets-sample.yml @@ -41,9 +41,6 @@ SENTRY_DSN: DEEP_FRONTEND_HOST: prod: app.example.com staging: stagin.example.com -DEEP_FRONTEND_ARY_HOST: - prod: app.example.com - staging: stagin-ary.example.com EMAIL_FROM: staging: The Deep [STAGING] prod: The Deep