Update Foswiki.
Change-Id: I61b612388e65ee3eec0418bcc560778acfcb44b1
diff --git a/foswiki/Dockerfile b/foswiki/Dockerfile
index 6cc8387..f654de5 100644
--- a/foswiki/Dockerfile
+++ b/foswiki/Dockerfile
@@ -1,5 +1 @@
-FROM docker.io/timlegge/docker-foswiki:v1.0.8
-
-RUN apk add build-base gcc abuild binutils perl-app-cpanminus perl-dev
-RUN cpanm Crypt::JWT Crypt::Random
-RUN apk del --purge build-base gcc abuild binutils perl-app-cpanminus perl-dev
+FROM docker.io/timlegge/docker-foswiki:v1.29
diff --git a/foswiki/foswiki.yaml b/foswiki/foswiki.yaml
index fa49ec3..ae42ce3 100644
--- a/foswiki/foswiki.yaml
+++ b/foswiki/foswiki.yaml
@@ -17,7 +17,7 @@
targetPort: http
protocol: TCP
---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: foswiki
@@ -26,20 +26,26 @@
name: foswiki
k8s-app: foswiki
annotations:
- kubernetes.io/ingress.class: traefik
- traefik.ingress.kubernetes.io/preserve-host: "true"
- #traefik.ingress.kubernetes.io/rule-type: PathPrefixStrip
ingress.kubernetes.io/ssl-proxy-headers: X-Forwarded-Proto:https
ingress.kubernetes.io/custom-request-headers: X-Forwarded-Proto:https||X-Forwarded-Port:443
+ kubernetes.io/ingress.class: nginx
+ cert-manager.io/cluster-issuer: letsencrypt-prod
spec:
rules:
- host: foswiki.benkard.de
http:
paths:
- path: /
+ pathType: ImplementationSpecific
backend:
- serviceName: foswiki
- servicePort: http
+ service:
+ name: foswiki
+ port:
+ name: http
+ tls:
+ - hosts:
+ - foswiki.benkard.de
+ secretName: foswiki-tls
---
apiVersion: apps/v1
kind: Deployment
@@ -71,7 +77,7 @@
claimName: foswiki-data
containers:
- name: master
- image: docker.benkard.de/mulk/foswiki:1.0.8-1
+ image: docker.benkard.de/mulk/foswiki:1.29-1
imagePullPolicy: IfNotPresent
resources:
limits: