Skip to content

Commit 8da6c25

Browse files
author
Keith Thompson
authored
Merge pull request #16 from coderjourney/move-to-gcloud
Adjust application to run in the Google Cloud.
2 parents 37cc10b + 100708f commit 8da6c25

File tree

3 files changed

+10
-28
lines changed

3 files changed

+10
-28
lines changed

deployments/frontend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
tier: frontend
2525
spec:
2626
containers:
27-
- image: "coderjourney/mealplan-frontend:1.0.0"
27+
- image: us.gcr.io/mealplan-165022/mealplan-frontend:1.0.0
2828
name: nginx
2929
lifecycle:
3030
preStop:

deployments/mealplan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: mealplan
16-
image: "meal_plan:1"
16+
image: us.gcr.io/mealplan-165022/mealplan:1.0.0
1717
ports:
1818
- name: rails
1919
containerPort: 3000

deployments/postgres.yml

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ spec:
3232
configMapKeyRef:
3333
name: mealplan-config
3434
key: postgres_password
35+
- name: PGDATA
36+
valueFrom:
37+
configMapKeyRef:
38+
name: mealplan-config
39+
key: pgdata
3540
ports:
3641
- containerPort: 5432
3742
name: postgres
@@ -40,29 +45,6 @@ spec:
4045
mountPath: /var/lib/postgresql/data
4146
volumes:
4247
- name: postgres-storage
43-
persistentVolumeClaim:
44-
claimName: postgres-pv-claim
45-
---
46-
apiVersion: v1
47-
kind: PersistentVolumeClaim
48-
metadata:
49-
name: postgres-pv-claim
50-
spec:
51-
accessModes:
52-
- ReadWriteOnce
53-
resources:
54-
requests:
55-
storage: 5Gi
56-
volumeName: postgres-pv
57-
---
58-
apiVersion: v1
59-
kind: PersistentVolume
60-
metadata:
61-
name: postgres-pv
62-
spec:
63-
accessModes:
64-
- ReadWriteOnce
65-
capacity:
66-
storage: 5Gi
67-
hostPath:
68-
path: /data/mealplan-postgres
48+
gcePersistentDisk:
49+
fsType: ext4
50+
pdName: postgres-disk

0 commit comments

Comments
 (0)