Skip to content

Commit ccd7dbb

Browse files
committed
Merge branch '5.6_homer' of github.com:LearnWithHomer/squidex into 5.6_homer
2 parents aa0da58 + b49a037 commit ccd7dbb

File tree

2 files changed

+49
-2
lines changed

2 files changed

+49
-2
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ build: info
3232

3333
deploy: build _login
3434
docker tag ${DOCKER_IMAGE}:latest ${DOCKER_IMAGE}:${VERSION}
35-
docker push ${DOCKER_IMAGE}:latest
3635
docker push ${DOCKER_IMAGE}:${VERSION}
3736
@echo "DOCKER_TAG=${VERSION}" >> $GITHUB_ENV
3837

k8s/staging/v2/squidex-fastly-beta.yaml

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ spec:
4949
spec:
5050
containers:
5151
- name: squidex
52-
image: 597764168253.dkr.ecr.us-east-1.amazonaws.com/homer-squidex:${SQUIDEX_FASTLY_BETA_VERSION_TAG}
52+
# image: 597764168253.dkr.ecr.us-east-1.amazonaws.com/homer-squidex:${SQUIDEX_FASTLY_BETA_VERSION_TAG}
53+
image: squidex/squidex:4.5.1
5354
imagePullPolicy: Always
5455
resources:
5556
requests:
@@ -197,3 +198,50 @@ spec:
197198
backend:
198199
serviceName: squidex
199200
servicePort: 80
201+
202+
---
203+
apiVersion: v1
204+
kind: Service
205+
metadata:
206+
name: squidex-cache-invalidator
207+
namespace: squidex-fastly-beta
208+
spec:
209+
type: ClusterIP
210+
selector:
211+
app: squidex-cache-invalidator
212+
ports:
213+
- protocol: TCP
214+
port: 80
215+
targetPort: 8080
216+
217+
---
218+
apiVersion: apps/v1
219+
kind: Deployment
220+
metadata:
221+
namespace: squidex-fastly-beta
222+
name: squidex-cache-invalidator
223+
labels:
224+
app: squidex-cache-invalidator
225+
spec:
226+
replicas: 1
227+
selector:
228+
matchLabels:
229+
app: squidex-cache-invalidator
230+
template:
231+
metadata:
232+
annotations:
233+
iam.amazonaws.com/role: k8s-cloudfront-cache-invalidation ##Used for kiam
234+
labels:
235+
app: squidex-cache-invalidator
236+
spec:
237+
containers:
238+
- name: squidex-cache-invalidator
239+
image: 597764168253.dkr.ecr.us-east-1.amazonaws.com/squidex-cache-invalidator:master-5f68e3c-TEST
240+
imagePullPolicy: Always
241+
ports:
242+
- containerPort: 8080
243+
env:
244+
- name: PORT
245+
value: "8080"
246+
- name: FASTLY_URL_BASE
247+
value: "https://squidex-fastly-beta.learnwithhomer.com"

0 commit comments

Comments
 (0)