bump and piwigo

This commit is contained in:
2020-10-10 18:01:05 +02:00
parent 57063b0ec1
commit d1742d82bc
12 changed files with 39 additions and 54 deletions

View File

@@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y \
RUN echo 'PassThroughPattern: .*' >> /etc/apt-cacher-ng/acng.conf
#CMD chown apt-cacher-ng:apt-cacher-ng /var/cache/apt-cacher-ng
CMD chown apt-cacher-ng:apt-cacher-ng /var/cache/apt-cacher-ng
EXPOSE 3142
#USER apt-cacher-ng
USER apt-cacher-ng
#CMD chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/*
CMD /usr/sbin/apt-cacher-ng -c /etc/apt-cacher-ng pidfile=/var/run/apt-cacher-ng/pid SocketPath=/var/run/apt-cacher-ng/socket foreground=1

View File

@@ -38,16 +38,27 @@ metadata:
labels:
app: apt-cacher-ng
spec:
type: LoadBalancer
loadBalancerIP: 172.23.255.1
ports:
- name: apt-cacher-ng
port: 3142
port: 3142
targetPort: 3142
protocol: TCP
selector:
app: apt-cacher-ng
---
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: apt-cacher-ng
spec:
rules:
- host: apt-cache.lan
http:
paths:
- backend:
serviceName: apt-cacher-ng
servicePort: 3142
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
@@ -55,7 +66,7 @@ metadata:
#annotations:
# volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
spec:
storageClassName: csi-s3-slow
storageClassName: nfs-ssd
accessModes:
- ReadWriteOnce
resources:

View File

@@ -3,7 +3,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: docker-registry-ui
namespace: docker-registry
labels:
app: registry-ui
release: docker-registry-ui
@@ -28,9 +27,9 @@ spec:
- name: URL
value: "http://docker-registry.lan"
- name: REGISTRY_TITLE
value: "Docker registry UI"
value: "dReg"
- name: DELETE_IMAGES
value: "false"
value: "true"
- name: REGISTRY_URL
value: "http://docker-registry-ui.lan"
- name: PULL_URL
@@ -53,7 +52,6 @@ spec:
apiVersion: v1
kind: Service
metadata:
namespace: docker-registry
name: docker-registry-ui
labels:
app: registry-ui
@@ -73,7 +71,6 @@ apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: docker-registry-ui
namespace: docker-registry
spec:
rules:
- host: docker-registry-ui.lan

View File

@@ -57,11 +57,10 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: mariadb-pv-claim
#annotations:
# volume.beta.kubernetes.io/storage-provisioner: "nfs-storage"
# volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
annotations:
volume.beta.kubernetes.io/storage-class: "nfs-ssd"
spec:
storageClassName: csi-s3-slow
storageClassName: nfs-ssd
accessModes:
- ReadWriteOnce
resources:

View File

@@ -126,7 +126,7 @@ spec:
resources:
requests:
storage: 2Gi
storageClassName: csi-s3-slow
storageClassName: nfs-ssd
volumeMode: Filesystem
---
apiVersion: v1

View File

@@ -2,7 +2,7 @@
apiVersion: v1
kind: Secret
metadata:
name: pihole-webpassword
name: pihole-password
namespace: default
type: Opaque
data:
@@ -46,7 +46,7 @@ spec:
value: 208.67.222.222
- name: DNS2
value: 208.67.220.220
image: pihole/pihole:latest
image: pihole/pihole:v5.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 10
@@ -145,10 +145,10 @@ kind: PersistentVolumeClaim
metadata:
name: pihole-data
annotations:
volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
volume.beta.kubernetes.io/storage-class: "nfs-ssd"
spec:
#storageClassName: csi-s3-slow
storageClassName: managed-nfs-storage
storageClassName: nfs-ssd
accessModes:
- ReadWriteOnce
resources:
@@ -161,7 +161,6 @@ data:
address=/chaos/192.168.10.1
kind: ConfigMap
metadata:
creationTimestamp: null
name: pihole-custom-dnsmasq
---
apiVersion: v1
@@ -177,7 +176,7 @@ metadata:
namespace: default
spec:
type: LoadBalancer
loadBalancerIP: 172.23.255.254
loadBalancerIP: 172.23.255.253
externalTrafficPolicy: Cluster
ports:
- name: http
@@ -209,7 +208,7 @@ metadata:
namespace: default
spec:
type: LoadBalancer
loadBalancerIP: 172.23.255.254
loadBalancerIP: 172.23.255.253
externalTrafficPolicy: Cluster
ports:
- name: dns-udp