fix: switch to default ports which should work well with Cloudflare (4e3b78e2) · Commits · Isfand Yar Khan / ever-demand

.deploy/api/Dockerfile

+6 −6

Original line number	Diff line number	Diff line
		@@ -129,9 +129,9 @@ ENV API_HOST=${API_HOST:-api}
		ENV API_PORT=${API_PORT:-5500}
		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:5500}
		ENV HTTPPORT=${HTTPPORT:-5500}
		ENV HTTPSPORT=${HTTPSPORT:-5501}
		ENV GQLPORT=${GQLPORT:-5555}
		ENV GQLPORT_SUBSCRIPTIONS=${GQLPORT_SUBSCRIPTIONS:-5050}
		ENV HTTPSPORT=${HTTPSPORT:-2087}
		ENV GQLPORT=${GQLPORT:-8443}
		ENV GQLPORT_SUBSCRIPTIONS=${GQLPORT_SUBSCRIPTIONS:-2086}
		ENV STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY}
		ENV URBAN_AIRSHIP_KEY=${URBAN_AIRSHIP_KEY}
		ENV URBAN_AIRSHIP_SECRET=${URBAN_AIRSHIP_SECRET}
		@@ -169,9 +169,9 @@ ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
		ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}

		# 5500 for HTTP
		# 5501 for HTTPS
		# 5555 for GraphQL
		# 5050 for GraphQL Subscriptions (WebSockets)
		# 2087 for HTTPS
		# 8443 for GraphQL
		# 2086 for GraphQL Subscriptions (WebSockets)

		EXPOSE ${HTTPPORT} ${HTTPSPORT} ${GQLPORT} ${GQLPORT_SUBSCRIPTIONS}

.deploy/k8s/k8s-manifest.demo.yaml

+24 −24

Original line number	Diff line number	Diff line
		@@ -122,11 +122,11 @@ metadata:
		service.beta.kubernetes.io/do-loadbalancer-name: 'apidemo.ever.co'
		service.beta.kubernetes.io/do-loadbalancer-protocol: 'http2'

		# GraphQL Subscriptions use WebSockets on Port 5050
		service.beta.kubernetes.io/do-loadbalancer-http-ports: '5050'
		# GraphQL Subscriptions use WebSockets on Port 2086
		service.beta.kubernetes.io/do-loadbalancer-http-ports: '2086'

		# Rest API works on 443, GraphQL API works on 5555
		service.beta.kubernetes.io/do-loadbalancer-http2-ports: '443,5555'
		# Rest API works on 443, GraphQL API works on 8443
		service.beta.kubernetes.io/do-loadbalancer-http2-ports: '443,8443'

		# Replace with your Certificate Id. You can get a list of Ids with 'doctl compute certificate list'
		service.beta.kubernetes.io/do-loadbalancer-certificate-id: 'a93346c1-d63b-4c33-84c5-4589787428ca'
		@@ -147,12 +147,12 @@ spec:
		targetPort: 5500
		- name: gql-api-http
		protocol: TCP
		port: 5555
		targetPort: 5555
		port: 8443
		targetPort: 8443
		- name: gql-subscriptions-ws
		protocol: TCP
		port: 5050
		targetPort: 5050
		port: 2086
		targetPort: 2086

		---
		apiVersion: apps/v1
		@@ -185,12 +185,12 @@ spec:
		value: '5500'
		# We use LB, so no need to expose HTTPS, only HTTPS required
		# - name: HTTPSPORT
		# value: '5501'
		# value: '2087'
		- name: GQLPORT
		value: '5555'
		value: '8443'
		# WebSockets (WS) used for GraphQL Subscriptions
		- name: GQLPORT_SUBSCRIPTIONS
		value: '5050'
		value: '2086'
		- name: ADMIN_PASSWORD_RESET
		value: 'true'
		- name: FAKE_DATA_GENERATOR
		@@ -225,11 +225,11 @@ spec:
		- containerPort: 5500
		protocol: TCP
		# We use LB, so no need to expose HTTPS, only HTTP required
		# - containerPort: 5501
		# - containerPort: 2087
		# protocol: TCP
		- containerPort: 5555
		- containerPort: 8443
		protocol: TCP
		- containerPort: 5050
		- containerPort: 2086
		protocol: TCP
		---
		apiVersion: apps/v1
		@@ -260,9 +260,9 @@ spec:
		# - name: SERVICES_ENDPOINT
		# value: ''
		- name: GQL_ENDPOINT
		value: 'https://apidemo.ever.co:5555/graphql'
		value: 'https://apidemo.ever.co:8443/graphql'
		- name: GQL_SUBSCRIPTIONS_ENDPOINT
		value: 'ws://apidemo.ever.co:5050/subscriptions'
		value: 'ws://apidemo.ever.co:2086/subscriptions'
		- name: SENTRY_DSN
		value: 'https://7cd381188b6f446ca0e69185227b9031@o51327.ingest.sentry.io/4397292'
		- name: CHATWOOT_SDK_TOKEN
		@@ -313,9 +313,9 @@ spec:
		# - name: SERVICES_ENDPOINT
		# value: ''
		- name: GQL_ENDPOINT
		value: 'http://apidemo.ever.co:5555/graphql'
		value: 'http://apidemo.ever.co:8443/graphql'
		- name: GQL_SUBSCRIPTIONS_ENDPOINT
		value: 'ws://apidemo.ever.co:5050/subscriptions'
		value: 'ws://apidemo.ever.co:2086/subscriptions'
		- name: SENTRY_DSN
		value: 'https://7cd381188b6f446ca0e69185227b9031@o51327.ingest.sentry.io/4397292'
		- name: CHATWOOT_SDK_TOKEN
		@@ -366,9 +366,9 @@ spec:
		# - name: SERVICES_ENDPOINT
		# value: ''
		- name: GQL_ENDPOINT
		value: 'http://apidemo.ever.co:5555/graphql'
		value: 'http://apidemo.ever.co:8443/graphql'
		- name: GQL_SUBSCRIPTIONS_ENDPOINT
		value: 'ws://apidemo.ever.co:5050/subscriptions'
		value: 'ws://apidemo.ever.co:2086/subscriptions'
		- name: SENTRY_DSN
		value: 'https://7cd381188b6f446ca0e69185227b9031@o51327.ingest.sentry.io/4397292'
		- name: CHATWOOT_SDK_TOKEN
		@@ -419,9 +419,9 @@ spec:
		# - name: SERVICES_ENDPOINT
		# value: ''
		- name: GQL_ENDPOINT
		value: 'http://apidemo.ever.co:5555/graphql'
		value: 'http://apidemo.ever.co:8443/graphql'
		- name: GQL_SUBSCRIPTIONS_ENDPOINT
		value: 'ws://apidemo.ever.co:5050/subscriptions'
		value: 'ws://apidemo.ever.co:2086/subscriptions'
		- name: SENTRY_DSN
		value: 'https://7cd381188b6f446ca0e69185227b9031@o51327.ingest.sentry.io/4397292'
		- name: CHATWOOT_SDK_TOKEN
		@@ -472,9 +472,9 @@ spec:
		# - name: SERVICES_ENDPOINT
		# value: ''
		- name: GQL_ENDPOINT
		value: 'http://apidemo.ever.co:5555/graphql'
		value: 'http://apidemo.ever.co:8443/graphql'
		- name: GQL_SUBSCRIPTIONS_ENDPOINT
		value: 'ws://apidemo.ever.co:5050/subscriptions'
		value: 'ws://apidemo.ever.co:2086/subscriptions'
		- name: SENTRY_DSN
		value: 'https://7cd381188b6f446ca0e69185227b9031@o51327.ingest.sentry.io/4397292'
		- name: CHATWOOT_SDK_TOKEN

docker-compose.yml

+3 −3

Original line number	Diff line number	Diff line
		@@ -131,9 +131,9 @@ services:
		# - core_node_modules:/srv/ever/packages/core/node_modules
		ports:
		- 5500:5500
		- 5501:5501
		- 5050:5050
		- 5555:5555
		- 2087:2087
		- 2086:2086
		- 8443:8443
		networks:
		- overlay

packages/admin-web-angular/.env.template

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,10 +4,10 @@

		# Don't forget to update scripts/.ts and src/environments/.ts on changes!

		HTTPS_SERVICES_ENDPOINT=https://localhost:5501
		HTTPS_SERVICES_ENDPOINT=https://localhost:2087
		SERVICES_ENDPOINT=http://localhost:5500
		GQL_ENDPOINT=http://localhost:5555/graphql
		GQL_SUBSCRIPTIONS_ENDPOINT=ws://localhost:5050/subscriptions
		GQL_ENDPOINT=http://localhost:8443/graphql
		GQL_SUBSCRIPTIONS_ENDPOINT=ws://localhost:2086/subscriptions

		# Insert below Google Maps API Key and make sure you restrict access to it
		GOOGLE_MAPS_API_KEY=

packages/admin-web-angular/graphql.config.json

+3 −3

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		"schema": {
		"README_request": "To request the schema from a url instead, remove the 'file' JSON property above (and optionally delete the default graphql.schema.json file).",
		"request": {
		"url": "http://localhost:5555/graphql",
		"url": "http://localhost:8443/graphql",
		"method": "POST",
		"README_postIntrospectionQuery": "Whether to POST an introspectionQuery to the url. If the url always returns the schema JSON, set to false and consider using GET",
		"postIntrospectionQuery": true,
		@@ -19,8 +19,8 @@
		"README_endpoints": "A list of GraphQL endpoints that can be queried from '.graphql' files in the IDE",
		"endpoints": [
		{
		"name": "Default (http://localhost:5555/graphql)",
		"url": "http://localhost:5555/graphql",
		"name": "Default (http://localhost:8443/graphql)",
		"url": "http://localhost:8443/graphql",
		"options": {
		"headers": {
		"user-agent": "JS GraphQL"