fixed no connection to SOCKET_IO

DefangLabs · May 27, 2024 · 6334917 · 6334917
1 parent a0b02ee
commit 6334917
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/samples/angular-express/compose.dev.yaml b/samples/angular-express/compose.dev.yaml
@@ -24,6 +24,8 @@ services:
       resources:
         reservations:
           memory: 64M
+    depends_on:
+      - backend
 
   backend:
     build:

diff --git a/samples/angular-express/compose.yaml b/samples/angular-express/compose.yaml
@@ -5,14 +5,14 @@ services:
     build:
       context: ./frontend
       args:
-        - SOCKET_IO_URL=http://backend:3000
+        - SOCKET_IO_URL=SOCKET_IO_URL=https://chrisyhjiang-backend--3000.prod1.defang.dev
     ports:
       - target: 80
         published: 80
         protocol: tcp
         mode: ingress
     environment:
-      - SOCKET_IO_URL=http://backend:3000
+      - SOCKET_IO_URL=SOCKET_IO_URL=https://chrisyhjiang-backend--3000.prod1.defang.dev
     restart: unless-stopped
     deploy:
       resources:

diff --git a/samples/angular-express/frontend/.dockerignore b/samples/angular-express/frontend/.dockerignore
@@ -33,3 +33,4 @@ bower_components/
 .DS_Store
 Thumbs.db
 desktop.ini
+.angular
diff --git a/samples/angular-express/frontend/Dockerfile b/samples/angular-express/frontend/Dockerfile
@@ -13,8 +13,8 @@ RUN npm install
 # Copy the local code to the container image
 COPY . .
 
-# Build the Angular app
-ARG SOCKET_IO_URL
+# Build the Angular app with the production environment
+ARG SOCKET_IO_URL=https://chrisyhjiang-backend--3000.prod1.defang.dev
 RUN sed -i "s|SOCKET_IO_URL: ''|SOCKET_IO_URL: '${SOCKET_IO_URL}'|g" src/environments/environment.prod.ts
 RUN npm run build -- --configuration production
 

diff --git a/samples/angular-express/frontend/angular.json b/samples/angular-express/frontend/angular.json
@@ -29,6 +29,12 @@
           },
           "configurations": {
             "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
               "budgets": [
                 {
                   "type": "initial",

diff --git a/samples/angular-express/frontend/src/environments/environment.prod.ts b/samples/angular-express/frontend/src/environments/environment.prod.ts
@@ -1,4 +1,4 @@
 export const environment = {
   production: true,
-  SOCKET_IO_URL: ''
+  SOCKET_IO_URL: 'https://chrisyhjiang-backend--3000.prod1.defang.dev' // your backend container domain
 };
diff --git a/samples/hasura/compose.dev.yaml b/samples/hasura/compose.dev.yaml
@@ -11,11 +11,11 @@ services:
     depends_on:
       - postgres
     restart: on-failure
-    environment: 
+    environment:
       - HASURA_GRAPHQL_DATABASE_URL=postgres://postgres:postgres@postgres:5432/postgres
       - HASURA_GRAPHQL_ADMIN_SECRET=password
     volumes:
       - ./hasura:/hasura
 
 volumes:
-  postgres_data:
+  postgres_data: