Skip to content

P
promotions-service
Commit b1702a0e authored by Ben Anderson's avatar Ben Anderson
Browse files
Options

Resolved merge conflicts and updated deployment file

parents fbd532be 40d6b69a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
deployment.yaml
View file @ b1702a0e
...@@ -14,13 +14,13 @@ spec: ...@@ -14,13 +14,13 @@ spec:
spec: spec:
containers: containers:
- name: afp-promotions-container - name: afp-promotions-container
image: nexus.mynisum.com/afp-promotions:6 image: nexus.mynisum.com/afp-promotions:7
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8082 - containerPort: 8082
env: env:
- name: PORT - name: PORT
value: "8080" value: "8082"
- name: MONGOCONNECTION - name: MONGOCONNECTION
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
...@@ -37,6 +37,6 @@ spec: ...@@ -37,6 +37,6 @@ spec:
type: LoadBalancer type: LoadBalancer
ports: ports:
- port: 8082 - port: 8082
targetPort: 8080 targetPort: 8082
selector: selector:
app: afp-promotions app: afp-promotions
\ No newline at end of file
src/main/resources/application.properties
View file @ b1702a0e
server.port=8082
server.port=8080
spring.data.mongodb.uri=${MONGOCONNECTION} spring.data.mongodb.uri=${MONGOCONNECTION}
spring.data.mongodb.database=products-promotions-DB
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment