From 9561cb8d82bbe5ff7ebcff6880382f8bd56f53ae Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Mon, 30 Nov 2020 19:34:31 +0100 Subject: [PATCH] grav on php74/bullseye --- apps/docker-registry/README.md | 4 +--- apps/docker-registry/docker-registry-ui.yaml | 10 +++++----- apps/nodered-deployment.yaml | 9 ++++++++- apps/web/grav/Dockerfile | 4 ++-- apps/web/grav/deployment.yaml | 2 +- apps/web/grav/supervisor.conf | 2 +- prometheus/additional-scrape-configs.yaml | 2 +- prometheus/prometheus-additional.yaml | 4 ++++ 8 files changed, 23 insertions(+), 14 deletions(-) diff --git a/apps/docker-registry/README.md b/apps/docker-registry/README.md index 1b811e2..1c26cc3 100644 --- a/apps/docker-registry/README.md +++ b/apps/docker-registry/README.md @@ -2,8 +2,6 @@ Docker-ui Build it for arm64: -docker build --platform linux/arm64 -t joxit/docker-registry-ui:static -f static.dockerfile github.com/Joxit/docker-registry-ui +docker build --platform linux/arm64 -t docker-registry.lan/docker-registry-ui:arm64 -f static.dockerfile github.com/Joxit/docker-registry-ui - -docker tag 1494c11066f5 docker-registry.lan/docker-registry-ui:arm64 docker push docker-registry.lan/docker-registry-ui:arm64 diff --git a/apps/docker-registry/docker-registry-ui.yaml b/apps/docker-registry/docker-registry-ui.yaml index f179c8a..7708131 100644 --- a/apps/docker-registry/docker-registry-ui.yaml +++ b/apps/docker-registry/docker-registry-ui.yaml @@ -29,8 +29,8 @@ spec: value: "dReg" - name: DELETE_IMAGES value: "true" - - name: REGISTRY_URL - value: "http://docker-registry-ui.lan" + #- name: REGISTRY_URL + # value: "http://docker-registry.lan" - name: PULL_URL value: "http://docker-registry.lan" ports: @@ -47,11 +47,11 @@ spec: port: http resources: requests: - memory: "10Mi" - cpu: "1m" + memory: "20Mi" + cpu: "10m" limits: memory: "32Mi" - cpu: "30m" + cpu: "50m" --- apiVersion: v1 kind: Service diff --git a/apps/nodered-deployment.yaml b/apps/nodered-deployment.yaml index bfda3c9..a46a1c9 100644 --- a/apps/nodered-deployment.yaml +++ b/apps/nodered-deployment.yaml @@ -25,6 +25,13 @@ spec: volumeMounts: - mountPath: /data name: data + resources: + limits: + cpu: "1" + memory: "200Mi" + requests: + memory: "64Mi" + cpu: "50m" volumes: - name: data persistentVolumeClaim: @@ -54,7 +61,7 @@ metadata: nginx.ingress.kubernetes.io/rewrite-target: / spec: rules: - - host: node-red.lan + - host: nodered.lan http: paths: - path: / diff --git a/apps/web/grav/Dockerfile b/apps/web/grav/Dockerfile index 2b63586..cf848a8 100644 --- a/apps/web/grav/Dockerfile +++ b/apps/web/grav/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim ENV DEBIAN_FRONTEND noninteractive ARG GRAV_VERSION=1.6.28 @@ -22,7 +22,7 @@ RUN apt-get remove -y --purge ${DEV_PKGS} exim4* && \ RUN mkdir /run/php && \ chown www-data:www-data /var/log /run/php && \ - mkdir -p /etc/php/7.3/fpm/pool.d + mkdir -p /etc/php/7.4/fpm/pool.d ADD docker-entrypoint.sh / ADD supervisor.conf /etc/supervisor.conf diff --git a/apps/web/grav/deployment.yaml b/apps/web/grav/deployment.yaml index 075e158..b266212 100644 --- a/apps/web/grav/deployment.yaml +++ b/apps/web/grav/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: grav-pages mountPath: /var/www/grav - name: grav-etc-php-fpm-www-conf - mountPath: /etc/php/7.3/fpm/pool.d + mountPath: /etc/php/7.4/fpm/pool.d - image: nginx:alpine name: nginx imagePullPolicy: IfNotPresent diff --git a/apps/web/grav/supervisor.conf b/apps/web/grav/supervisor.conf index 48a45e7..effe437 100644 --- a/apps/web/grav/supervisor.conf +++ b/apps/web/grav/supervisor.conf @@ -10,5 +10,5 @@ user=root [program:php-fpm] -command=/usr/sbin/php-fpm7.3 --nodaemonize --force-stderr +command=/usr/sbin/php-fpm7.4 --nodaemonize --force-stderr user=www-data \ No newline at end of file diff --git a/prometheus/additional-scrape-configs.yaml b/prometheus/additional-scrape-configs.yaml index ef37cd3..d610905 100644 --- a/prometheus/additional-scrape-configs.yaml +++ b/prometheus/additional-scrape-configs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - prometheus-additional.yaml: LSBqb2JfbmFtZTogbmdpbngKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTExMwotIGpvYl9uYW1lOiBteXNxbGQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1hcmlhZGIubGFuOjkxMDQKLSBqb2JfbmFtZTogbXF0dC5tb3NxdWl0dG8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1xdHQubGFuOjkyMzQKLSBqb2JfbmFtZTogaGFwcm94eQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo4MAotIGpvYl9uYW1lOiBvcGVuaGFiMgogIG1ldHJpY3NfcGF0aDogLwogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYXV0by5jaGFvczo5OTk5Ci0gam9iX25hbWU6IG5vZGUKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGR1bW9udC5jaGFvczo5MTAwCiAgICAtIGR1bW9udC53a3M6OTEwMAogICAgLSBhdXRvMDE6OTEwMAogICAgLSBkcnVja2kud2tzOjkxMDAKICAgIC0gZWJpbjAxLmNoYW9zOjkxMDAKICAgIC0gZWJpbjAyLmNoYW9zOjkxMDAKICAgIC0gcmlvdDAxLmNoYW9zOjkxMDAKICAgIC0gdHJ1aGU6OTEwMAogICAgLSB0dW1vci5jaGFvczo5MTAwCiAgICAtIHdvaG56OjkxMDAKICAgIC0geW9yaS5jaGFvczo5MTAwCg== + prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbmdpbngKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTExMwotIGpvYl9uYW1lOiBteXNxbGQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1hcmlhZGIubGFuOjkxMDQKLSBqb2JfbmFtZTogbXF0dC5tb3NxdWl0dG8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1xdHQubGFuOjkyMzQKLSBqb2JfbmFtZTogaGFwcm94eQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo4MAotIGpvYl9uYW1lOiBvcGVuaGFiMgogIG1ldHJpY3NfcGF0aDogLwogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYXV0by5jaGFvczo5OTk5Ci0gam9iX25hbWU6IG5vZGUKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGR1bW9udC5jaGFvczo5MTAwCiAgICAtIGR1bW9udC53a3M6OTEwMAogICAgLSBhdXRvMDE6OTEwMAogICAgLSBkcnVja2kud2tzOjkxMDAKICAgIC0gZWJpbjAxLmNoYW9zOjkxMDAKICAgIC0gZWJpbjAyLmNoYW9zOjkxMDAKICAgIC0gcmlvdDAxLmNoYW9zOjkxMDAKICAgIC0gdHJ1aGU6OTEwMAogICAgLSB0dW1vci5jaGFvczo5MTAwCiAgICAtIHdvaG56OjkxMDAKICAgIC0geW9yaS5jaGFvczo5MTAwCg== kind: Secret metadata: creationTimestamp: null diff --git a/prometheus/prometheus-additional.yaml b/prometheus/prometheus-additional.yaml index 8478834..15b17cc 100644 --- a/prometheus/prometheus-additional.yaml +++ b/prometheus/prometheus-additional.yaml @@ -1,3 +1,7 @@ +- job_name: gitea + static_configs: + - targets: + - git-ui.lan - job_name: nginx static_configs: - targets: