Merge pull request #7 from jlord31/dev

v1
jlord31 · Sep 3, 2022 · 7d04c96 · 7d04c96
2 parents 97ec09b + d8df326
commit 7d04c96
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,13 +20,13 @@ script:
   - docker build -t udagram-api-user ./udagram-api-user
   - docker tag udagram-api-user jlord31/udagram-api-user:v1
   - docker build -t udagram-frontend ./udagram-frontend
-  - docker tag udagram-frontend jlord31/udagram-frontend:v2
+  - docker tag udagram-frontend jlord31/udagram-frontend:v3
   - docker build -t udagram-reverseproxy ./udagram-reverseproxy
   - docker tag udagram-reverseproxy jlord31/reverseproxy:v1
 
 after_success:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
   - docker push jlord31/udagram-api-feed:v1
   - docker push jlord31/udagram-api-user:v1
-  - docker push jlord31/udagram-frontend:v2
+  - docker push jlord31/udagram-frontend:v3
   - docker push jlord31/reverseproxy:v1
diff --git a/env-configmap.yaml b/env-configmap.yaml
@@ -11,6 +11,6 @@ data:
   AWS_REGION: us-east-1
   AWS_PROFILE: default
   JWT_SECRET: testing
-  URL: http://localhost:8080
+  URL: http://ae1e992f1b09b425ca4bd0b14fde80fc-2012011553.us-east-1.elb.amazonaws.com:8080
   POSTGRES_USERNAME: postgres
   POSTGRES_PASSWORD: data1234
diff --git a/udagram-frontend/frontend-deployment.yaml b/udagram-frontend/frontend-deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: udagram-frontend
-        image: jlord31/udagram-frontend:v2
+        image: jlord31/udagram-frontend:v3
         ports:
-        - containerPort: 8100
+        - containerPort: 80
 
diff --git a/udagram-frontend/frontend-service.yaml b/udagram-frontend/frontend-service.yaml
@@ -6,7 +6,7 @@ metadata:
     run: udagram-frontend
 spec:
   ports:
-  - port: 8100
+  - port: 80
     protocol: TCP
   selector:
     run: udagram-frontend
diff --git a/udagram-frontend/src/environments/environment.prod.ts b/udagram-frontend/src/environments/environment.prod.ts
@@ -5,7 +5,7 @@
 export const environment = {
   production: false,
   appName: 'Udagram',
-  apiHost: 'http://a541480d04eb54ef996b8d14e99cb524-2098055360.us-east-1.elb.amazonaws.com:8080/api/v0'
+  apiHost: 'http://ae1e992f1b09b425ca4bd0b14fde80fc-2012011553.us-east-1.elb.amazonaws.com:8080/api/v0'
 };
 
 /*

diff --git a/udagram-frontend/src/environments/environment.ts b/udagram-frontend/src/environments/environment.ts
@@ -5,9 +5,8 @@
 export const environment = {
   production: false,
   appName: 'Udagram',
-  apiHost: 'http://a541480d04eb54ef996b8d14e99cb524-2098055360.us-east-1.elb.amazonaws.com:8080/api/v0'
+  apiHost: 'http://ae1e992f1b09b425ca4bd0b14fde80fc-2012011553.us-east-1.elb.amazonaws.com:8080/api/v0'
 };
-
 /*
  * For easier debugging in development mode, you can import the following file
  * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.

diff --git a/udagram-reverseproxy/reverseproxy-deployment.yaml b/udagram-reverseproxy/reverseproxy-deployment.yaml
@@ -1,18 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: udagram-reverseproxy
+  name: reverseproxy
   labels:
-    app: udagram-reverseproxy
+    app: reverseproxy
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app: udagram-reverseproxy
+      app: reverseproxy
   template:
     metadata:
       labels:
-        app: udagram-reverseproxy
+        app: reverseproxy
     spec:
       containers:
       - name: reverseproxy

diff --git a/udagram-reverseproxy/reverseproxy-service.yaml b/udagram-reverseproxy/reverseproxy-service.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: udagram-reverseproxy
+  name: reverseproxy
   labels:
-    run: udagram-reverseproxy
+    run: reverseproxy
 spec:
   ports:
   - port: 8080
     protocol: TCP
   selector:
-    run: udagram-reverseproxy
+    run: reverseproxy