From 7da16def7896f373940133cd134f6cf3cac3818a Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:02:29 +0200 Subject: [PATCH 01/14] .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 72f23a6..1377554 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -csi-s3/storage-csi-s3/cmd/s3driver/s3driver +*.swp From 4b2f5d8c9f9c3b8fff28b5a2b0f01075cb2f5829 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:02:48 +0200 Subject: [PATCH 02/14] merged --- .drone.yml | 167 ------------------ _CI-CD/debian-stable/bla | 0 {apps => _apps}/almond-cloud/Dockerfile | 0 {apps => _apps}/almond-cloud/deployment.yaml | 0 {apps => _apps}/almond-cloud/start.sh | 0 .../almond-cloud/tekton-image-build.yaml | 0 {apps => _apps}/apt-cacher-ng/Dockerfile | 0 .../apt-cacher-ng/live-deployment.yaml | 0 {apps => _apps}/authelia/README.md | 0 .../authelia/configMaps/configuration.yml | 0 {apps => _apps}/authelia/deployment.yaml | 0 {apps => _apps}/codetogether.yaml | 0 {apps => _apps}/curl/Dockerfile | 0 {apps => _apps}/docker-registry/README.md | 0 .../docker-registry/docker-registry-ui.yaml | 0 .../docker-registry/registry-deployment.yaml | 0 {apps => _apps}/dolibarr/Dockerfile | 0 {apps => _apps}/dolibarr/README.md | 0 {apps => _apps}/dolibarr/deployment.yaml | 0 {apps => _apps}/dolibarr/entrypoint.sh | 0 .../dolibarr/nginx-site.configmap.conf | 0 {apps => _apps}/dolibarr/tekton.yaml | 0 {apps => _apps}/gitea.yaml | 0 {apps => _apps}/grav/Dockerfile | 0 {apps => _apps}/grav/README.md | 0 {apps => _apps}/grav/deployment.yaml | 0 {apps => _apps}/grav/docker-entrypoint.sh | 0 {apps => _apps}/grav/etc_php-fpm/www.conf | 0 {apps => _apps}/grav/nginx.conf.yaml | 0 {apps => _apps}/grav/supervisor.conf | 0 {apps => _apps}/mariadb/README.md | 0 .../mariadb/mariadb-deployment.yaml | 0 .../mariadb/mariadb-prometheus/Dockerfile | 0 {apps => _apps}/mariadb/mariadb/Dockerfile | 0 .../mariadb/mariadb/docker-entrypoint.sh | 0 ...age-build-mariadb-prometheus-exporter.yaml | 0 .../mariadb/tekton-image-build-mariadb.yaml | 0 .../mosquitto-prometheus-exporter/Dockerfile | 0 {apps => _apps}/mosquitto/Dockerfile | 0 {apps => _apps}/mosquitto/deployment.yaml | 0 .../mosquitto/docker-entrypoint.sh | 0 {apps => _apps}/nextcloud/Dockerfile | 0 {apps => _apps}/nextcloud/README.md | 0 {apps => _apps}/nextcloud/config.php | 0 {apps => _apps}/nextcloud/deployment.yaml | 0 .../nextcloud/nginx-site.configmap.conf | 0 {apps => _apps}/nextcloud/post-start.sh | 0 {apps => _apps}/nextcloud/tekton.yaml | 0 {apps => _apps}/nodered-deployment.yaml | 0 {apps => _apps}/ntopng.yaml | 0 {apps => _apps}/pihole-deployment.yaml | 0 {apps => _apps}/piwigo/Dockerfile | 0 {apps => _apps}/piwigo/deployment.yaml | 0 {apps => _apps}/piwigo/remote_sync.pl | 0 {apps => _apps}/postgresql-deploy.yaml | 0 {apps => _apps}/redis.yaml | 0 {apps => _apps}/rompr/Dockerfile | 0 {apps => _apps}/rompr/README.md | 0 {apps => _apps}/rompr/files/nginx_default | 0 {apps => _apps}/rompr/files/run-httpd | 0 {apps => _apps}/smarthome/Containerfile | 0 {apps => _apps}/smarthome/home-assistant.yaml | 0 {apps => _apps}/smarthome/socat/Containerfile | 0 {apps => _apps}/smarthome/supervisor.conf | 0 {apps => _apps}/smarthome/zwave2mqtt.yaml | 0 bin/.find_changes.sh.swp | Bin 0 -> 12288 bytes bin/find_changes.sh | 16 +- 67 files changed, 7 insertions(+), 176 deletions(-) delete mode 100644 .drone.yml create mode 100644 _CI-CD/debian-stable/bla rename {apps => _apps}/almond-cloud/Dockerfile (100%) rename {apps => _apps}/almond-cloud/deployment.yaml (100%) rename {apps => _apps}/almond-cloud/start.sh (100%) rename {apps => _apps}/almond-cloud/tekton-image-build.yaml (100%) rename {apps => _apps}/apt-cacher-ng/Dockerfile (100%) rename {apps => _apps}/apt-cacher-ng/live-deployment.yaml (100%) rename {apps => _apps}/authelia/README.md (100%) rename {apps => _apps}/authelia/configMaps/configuration.yml (100%) rename {apps => _apps}/authelia/deployment.yaml (100%) rename {apps => _apps}/codetogether.yaml (100%) rename {apps => _apps}/curl/Dockerfile (100%) rename {apps => _apps}/docker-registry/README.md (100%) rename {apps => _apps}/docker-registry/docker-registry-ui.yaml (100%) rename {apps => _apps}/docker-registry/registry-deployment.yaml (100%) rename {apps => _apps}/dolibarr/Dockerfile (100%) rename {apps => _apps}/dolibarr/README.md (100%) rename {apps => _apps}/dolibarr/deployment.yaml (100%) rename {apps => _apps}/dolibarr/entrypoint.sh (100%) rename {apps => _apps}/dolibarr/nginx-site.configmap.conf (100%) rename {apps => _apps}/dolibarr/tekton.yaml (100%) rename {apps => _apps}/gitea.yaml (100%) rename {apps => _apps}/grav/Dockerfile (100%) rename {apps => _apps}/grav/README.md (100%) rename {apps => _apps}/grav/deployment.yaml (100%) rename {apps => _apps}/grav/docker-entrypoint.sh (100%) rename {apps => _apps}/grav/etc_php-fpm/www.conf (100%) rename {apps => _apps}/grav/nginx.conf.yaml (100%) rename {apps => _apps}/grav/supervisor.conf (100%) rename {apps => _apps}/mariadb/README.md (100%) rename {apps => _apps}/mariadb/mariadb-deployment.yaml (100%) rename {apps => _apps}/mariadb/mariadb-prometheus/Dockerfile (100%) rename {apps => _apps}/mariadb/mariadb/Dockerfile (100%) rename {apps => _apps}/mariadb/mariadb/docker-entrypoint.sh (100%) rename {apps => _apps}/mariadb/tekton-image-build-mariadb-prometheus-exporter.yaml (100%) rename {apps => _apps}/mariadb/tekton-image-build-mariadb.yaml (100%) rename {apps => _apps}/mosquitto-prometheus-exporter/Dockerfile (100%) rename {apps => _apps}/mosquitto/Dockerfile (100%) rename {apps => _apps}/mosquitto/deployment.yaml (100%) rename {apps => _apps}/mosquitto/docker-entrypoint.sh (100%) rename {apps => _apps}/nextcloud/Dockerfile (100%) rename {apps => _apps}/nextcloud/README.md (100%) rename {apps => _apps}/nextcloud/config.php (100%) rename {apps => _apps}/nextcloud/deployment.yaml (100%) rename {apps => _apps}/nextcloud/nginx-site.configmap.conf (100%) rename {apps => _apps}/nextcloud/post-start.sh (100%) rename {apps => _apps}/nextcloud/tekton.yaml (100%) rename {apps => _apps}/nodered-deployment.yaml (100%) rename {apps => _apps}/ntopng.yaml (100%) rename {apps => _apps}/pihole-deployment.yaml (100%) rename {apps => _apps}/piwigo/Dockerfile (100%) rename {apps => _apps}/piwigo/deployment.yaml (100%) rename {apps => _apps}/piwigo/remote_sync.pl (100%) rename {apps => _apps}/postgresql-deploy.yaml (100%) rename {apps => _apps}/redis.yaml (100%) rename {apps => _apps}/rompr/Dockerfile (100%) rename {apps => _apps}/rompr/README.md (100%) rename {apps => _apps}/rompr/files/nginx_default (100%) rename {apps => _apps}/rompr/files/run-httpd (100%) rename {apps => _apps}/smarthome/Containerfile (100%) rename {apps => _apps}/smarthome/home-assistant.yaml (100%) rename {apps => _apps}/smarthome/socat/Containerfile (100%) rename {apps => _apps}/smarthome/supervisor.conf (100%) rename {apps => _apps}/smarthome/zwave2mqtt.yaml (100%) create mode 100644 bin/.find_changes.sh.swp diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 23dbeb1..0000000 --- a/.drone.yml +++ /dev/null @@ -1,167 +0,0 @@ -- kind: pipeline - name: Build Docker Images - platform: - arch: arm64 - os: linux - steps: - - commands: - - git diff-tree --no-commit-id --name-only HEAD -r - image: cr.wks/debian-stable - name: git log - - - image: plugins/docker - name: debian-stable - settings: - cache_from: cr.wks/debian-stable:latest - context: _CI-CD/debian-stable - dockerfile: _CI-CD/debian-stable/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/debian-stable - tags: - - latest - - image: plugins/docker - name: debian-stable-build-essential - settings: - cache_from: cr.wks/debian-stable-build-essential:latest - context: _CI-CD/debian-stable-build-essential - dockerfile: _CI-CD/debian-stable-build-essential/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/debian-stable-build-essential - tags: - - latest - - image: plugins/docker - name: debian-stable-openwrt - settings: - cache_from: cr.wks/debian-stable-openwrt:latest - context: _CI-CD/debian-stable-openwrt - dockerfile: _CI-CD/debian-stable-openwrt/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/debian-stable-openwrt - tags: - - latest - - image: plugins/docker - name: debian-golang - settings: - cache_from: cr.wks/debian-golang:latest - context: _CI-CD/debian-golang - dockerfile: _CI-CD/debian-golang/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/debian-golang - tags: - - latest - - image: plugins/docker - name: debian-stable-php-fpm - settings: - cache_from: cr.wks/debian-stable-php-fpm:latest - context: _CI-CD/debian-stable-php-fpm - dockerfile: _CI-CD/debian-stable-php-fpm/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/debian-stable-php-fpm - tags: - - latest - - image: plugins/docker - name: distcc - settings: - cache_from: cr.wks/distcc:latest - context: _CI-CD/distcc - dockerfile: _CI-CD/distcc/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/distcc - tags: - - latest - - image: plugins/docker - name: debian-testing - settings: - cache_from: cr.wks/debian-testing:latest - context: _CI-CD/debian-testing - dockerfile: _CI-CD/debian-testing/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/debian-testing - tags: - - latest - - - image: plugins/docker - name: rompr - settings: - cache_from: cr.wks/rompr:latest - context: apps/rompr - dockerfile: apps/rompr/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/rompr - tags: - - latest - - image: plugins/docker - name: apt-cacher-ng - settings: - cache_from: cr.wks/apt-cacher-ng:latest - context: apps/apt-cacher-ng - dockerfile: apps/apt-cacher-ng/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/apt-cacher-ng - tags: - - latest - - image: plugins/docker - name: curl - settings: - cache_from: cr.wks/curl:latest - context: apps/curl - dockerfile: apps/curl/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/curl - tags: - - latest - - image: plugins/docker - name: mosquitto - settings: - cache_from: cr.wks/mosquitto:latest - context: apps/mosquitto - dockerfile: apps/mosquitto/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/mosquitto - tags: - - latest - - image: plugins/docker - name: mosquitto-prometheus-exporter - settings: - cache_from: cr.wks/mosquitto-prometheus-exporter:latest - context: apps/mosquitto-prometheus-exporter - dockerfile: apps/mosquitto-prometheus-exporter/Dockerfile - experimental: "true" - insecure: "true" - purge: "false" - registry: http://cr.wks - repo: cr.wks/mosquitto-prometheus-exporter - tags: - - latest - type: docker diff --git a/_CI-CD/debian-stable/bla b/_CI-CD/debian-stable/bla new file mode 100644 index 0000000..e69de29 diff --git a/apps/almond-cloud/Dockerfile b/_apps/almond-cloud/Dockerfile similarity index 100% rename from apps/almond-cloud/Dockerfile rename to _apps/almond-cloud/Dockerfile diff --git a/apps/almond-cloud/deployment.yaml b/_apps/almond-cloud/deployment.yaml similarity index 100% rename from apps/almond-cloud/deployment.yaml rename to _apps/almond-cloud/deployment.yaml diff --git a/apps/almond-cloud/start.sh b/_apps/almond-cloud/start.sh similarity index 100% rename from apps/almond-cloud/start.sh rename to _apps/almond-cloud/start.sh diff --git a/apps/almond-cloud/tekton-image-build.yaml b/_apps/almond-cloud/tekton-image-build.yaml similarity index 100% rename from apps/almond-cloud/tekton-image-build.yaml rename to _apps/almond-cloud/tekton-image-build.yaml diff --git a/apps/apt-cacher-ng/Dockerfile b/_apps/apt-cacher-ng/Dockerfile similarity index 100% rename from apps/apt-cacher-ng/Dockerfile rename to _apps/apt-cacher-ng/Dockerfile diff --git a/apps/apt-cacher-ng/live-deployment.yaml b/_apps/apt-cacher-ng/live-deployment.yaml similarity index 100% rename from apps/apt-cacher-ng/live-deployment.yaml rename to _apps/apt-cacher-ng/live-deployment.yaml diff --git a/apps/authelia/README.md b/_apps/authelia/README.md similarity index 100% rename from apps/authelia/README.md rename to _apps/authelia/README.md diff --git a/apps/authelia/configMaps/configuration.yml b/_apps/authelia/configMaps/configuration.yml similarity index 100% rename from apps/authelia/configMaps/configuration.yml rename to _apps/authelia/configMaps/configuration.yml diff --git a/apps/authelia/deployment.yaml b/_apps/authelia/deployment.yaml similarity index 100% rename from apps/authelia/deployment.yaml rename to _apps/authelia/deployment.yaml diff --git a/apps/codetogether.yaml b/_apps/codetogether.yaml similarity index 100% rename from apps/codetogether.yaml rename to _apps/codetogether.yaml diff --git a/apps/curl/Dockerfile b/_apps/curl/Dockerfile similarity index 100% rename from apps/curl/Dockerfile rename to _apps/curl/Dockerfile diff --git a/apps/docker-registry/README.md b/_apps/docker-registry/README.md similarity index 100% rename from apps/docker-registry/README.md rename to _apps/docker-registry/README.md diff --git a/apps/docker-registry/docker-registry-ui.yaml b/_apps/docker-registry/docker-registry-ui.yaml similarity index 100% rename from apps/docker-registry/docker-registry-ui.yaml rename to _apps/docker-registry/docker-registry-ui.yaml diff --git a/apps/docker-registry/registry-deployment.yaml b/_apps/docker-registry/registry-deployment.yaml similarity index 100% rename from apps/docker-registry/registry-deployment.yaml rename to _apps/docker-registry/registry-deployment.yaml diff --git a/apps/dolibarr/Dockerfile b/_apps/dolibarr/Dockerfile similarity index 100% rename from apps/dolibarr/Dockerfile rename to _apps/dolibarr/Dockerfile diff --git a/apps/dolibarr/README.md b/_apps/dolibarr/README.md similarity index 100% rename from apps/dolibarr/README.md rename to _apps/dolibarr/README.md diff --git a/apps/dolibarr/deployment.yaml b/_apps/dolibarr/deployment.yaml similarity index 100% rename from apps/dolibarr/deployment.yaml rename to _apps/dolibarr/deployment.yaml diff --git a/apps/dolibarr/entrypoint.sh b/_apps/dolibarr/entrypoint.sh similarity index 100% rename from apps/dolibarr/entrypoint.sh rename to _apps/dolibarr/entrypoint.sh diff --git a/apps/dolibarr/nginx-site.configmap.conf b/_apps/dolibarr/nginx-site.configmap.conf similarity index 100% rename from apps/dolibarr/nginx-site.configmap.conf rename to _apps/dolibarr/nginx-site.configmap.conf diff --git a/apps/dolibarr/tekton.yaml b/_apps/dolibarr/tekton.yaml similarity index 100% rename from apps/dolibarr/tekton.yaml rename to _apps/dolibarr/tekton.yaml diff --git a/apps/gitea.yaml b/_apps/gitea.yaml similarity index 100% rename from apps/gitea.yaml rename to _apps/gitea.yaml diff --git a/apps/grav/Dockerfile b/_apps/grav/Dockerfile similarity index 100% rename from apps/grav/Dockerfile rename to _apps/grav/Dockerfile diff --git a/apps/grav/README.md b/_apps/grav/README.md similarity index 100% rename from apps/grav/README.md rename to _apps/grav/README.md diff --git a/apps/grav/deployment.yaml b/_apps/grav/deployment.yaml similarity index 100% rename from apps/grav/deployment.yaml rename to _apps/grav/deployment.yaml diff --git a/apps/grav/docker-entrypoint.sh b/_apps/grav/docker-entrypoint.sh similarity index 100% rename from apps/grav/docker-entrypoint.sh rename to _apps/grav/docker-entrypoint.sh diff --git a/apps/grav/etc_php-fpm/www.conf b/_apps/grav/etc_php-fpm/www.conf similarity index 100% rename from apps/grav/etc_php-fpm/www.conf rename to _apps/grav/etc_php-fpm/www.conf diff --git a/apps/grav/nginx.conf.yaml b/_apps/grav/nginx.conf.yaml similarity index 100% rename from apps/grav/nginx.conf.yaml rename to _apps/grav/nginx.conf.yaml diff --git a/apps/grav/supervisor.conf b/_apps/grav/supervisor.conf similarity index 100% rename from apps/grav/supervisor.conf rename to _apps/grav/supervisor.conf diff --git a/apps/mariadb/README.md b/_apps/mariadb/README.md similarity index 100% rename from apps/mariadb/README.md rename to _apps/mariadb/README.md diff --git a/apps/mariadb/mariadb-deployment.yaml b/_apps/mariadb/mariadb-deployment.yaml similarity index 100% rename from apps/mariadb/mariadb-deployment.yaml rename to _apps/mariadb/mariadb-deployment.yaml diff --git a/apps/mariadb/mariadb-prometheus/Dockerfile b/_apps/mariadb/mariadb-prometheus/Dockerfile similarity index 100% rename from apps/mariadb/mariadb-prometheus/Dockerfile rename to _apps/mariadb/mariadb-prometheus/Dockerfile diff --git a/apps/mariadb/mariadb/Dockerfile b/_apps/mariadb/mariadb/Dockerfile similarity index 100% rename from apps/mariadb/mariadb/Dockerfile rename to _apps/mariadb/mariadb/Dockerfile diff --git a/apps/mariadb/mariadb/docker-entrypoint.sh b/_apps/mariadb/mariadb/docker-entrypoint.sh similarity index 100% rename from apps/mariadb/mariadb/docker-entrypoint.sh rename to _apps/mariadb/mariadb/docker-entrypoint.sh diff --git a/apps/mariadb/tekton-image-build-mariadb-prometheus-exporter.yaml b/_apps/mariadb/tekton-image-build-mariadb-prometheus-exporter.yaml similarity index 100% rename from apps/mariadb/tekton-image-build-mariadb-prometheus-exporter.yaml rename to _apps/mariadb/tekton-image-build-mariadb-prometheus-exporter.yaml diff --git a/apps/mariadb/tekton-image-build-mariadb.yaml b/_apps/mariadb/tekton-image-build-mariadb.yaml similarity index 100% rename from apps/mariadb/tekton-image-build-mariadb.yaml rename to _apps/mariadb/tekton-image-build-mariadb.yaml diff --git a/apps/mosquitto-prometheus-exporter/Dockerfile b/_apps/mosquitto-prometheus-exporter/Dockerfile similarity index 100% rename from apps/mosquitto-prometheus-exporter/Dockerfile rename to _apps/mosquitto-prometheus-exporter/Dockerfile diff --git a/apps/mosquitto/Dockerfile b/_apps/mosquitto/Dockerfile similarity index 100% rename from apps/mosquitto/Dockerfile rename to _apps/mosquitto/Dockerfile diff --git a/apps/mosquitto/deployment.yaml b/_apps/mosquitto/deployment.yaml similarity index 100% rename from apps/mosquitto/deployment.yaml rename to _apps/mosquitto/deployment.yaml diff --git a/apps/mosquitto/docker-entrypoint.sh b/_apps/mosquitto/docker-entrypoint.sh similarity index 100% rename from apps/mosquitto/docker-entrypoint.sh rename to _apps/mosquitto/docker-entrypoint.sh diff --git a/apps/nextcloud/Dockerfile b/_apps/nextcloud/Dockerfile similarity index 100% rename from apps/nextcloud/Dockerfile rename to _apps/nextcloud/Dockerfile diff --git a/apps/nextcloud/README.md b/_apps/nextcloud/README.md similarity index 100% rename from apps/nextcloud/README.md rename to _apps/nextcloud/README.md diff --git a/apps/nextcloud/config.php b/_apps/nextcloud/config.php similarity index 100% rename from apps/nextcloud/config.php rename to _apps/nextcloud/config.php diff --git a/apps/nextcloud/deployment.yaml b/_apps/nextcloud/deployment.yaml similarity index 100% rename from apps/nextcloud/deployment.yaml rename to _apps/nextcloud/deployment.yaml diff --git a/apps/nextcloud/nginx-site.configmap.conf b/_apps/nextcloud/nginx-site.configmap.conf similarity index 100% rename from apps/nextcloud/nginx-site.configmap.conf rename to _apps/nextcloud/nginx-site.configmap.conf diff --git a/apps/nextcloud/post-start.sh b/_apps/nextcloud/post-start.sh similarity index 100% rename from apps/nextcloud/post-start.sh rename to _apps/nextcloud/post-start.sh diff --git a/apps/nextcloud/tekton.yaml b/_apps/nextcloud/tekton.yaml similarity index 100% rename from apps/nextcloud/tekton.yaml rename to _apps/nextcloud/tekton.yaml diff --git a/apps/nodered-deployment.yaml b/_apps/nodered-deployment.yaml similarity index 100% rename from apps/nodered-deployment.yaml rename to _apps/nodered-deployment.yaml diff --git a/apps/ntopng.yaml b/_apps/ntopng.yaml similarity index 100% rename from apps/ntopng.yaml rename to _apps/ntopng.yaml diff --git a/apps/pihole-deployment.yaml b/_apps/pihole-deployment.yaml similarity index 100% rename from apps/pihole-deployment.yaml rename to _apps/pihole-deployment.yaml diff --git a/apps/piwigo/Dockerfile b/_apps/piwigo/Dockerfile similarity index 100% rename from apps/piwigo/Dockerfile rename to _apps/piwigo/Dockerfile diff --git a/apps/piwigo/deployment.yaml b/_apps/piwigo/deployment.yaml similarity index 100% rename from apps/piwigo/deployment.yaml rename to _apps/piwigo/deployment.yaml diff --git a/apps/piwigo/remote_sync.pl b/_apps/piwigo/remote_sync.pl similarity index 100% rename from apps/piwigo/remote_sync.pl rename to _apps/piwigo/remote_sync.pl diff --git a/apps/postgresql-deploy.yaml b/_apps/postgresql-deploy.yaml similarity index 100% rename from apps/postgresql-deploy.yaml rename to _apps/postgresql-deploy.yaml diff --git a/apps/redis.yaml b/_apps/redis.yaml similarity index 100% rename from apps/redis.yaml rename to _apps/redis.yaml diff --git a/apps/rompr/Dockerfile b/_apps/rompr/Dockerfile similarity index 100% rename from apps/rompr/Dockerfile rename to _apps/rompr/Dockerfile diff --git a/apps/rompr/README.md b/_apps/rompr/README.md similarity index 100% rename from apps/rompr/README.md rename to _apps/rompr/README.md diff --git a/apps/rompr/files/nginx_default b/_apps/rompr/files/nginx_default similarity index 100% rename from apps/rompr/files/nginx_default rename to _apps/rompr/files/nginx_default diff --git a/apps/rompr/files/run-httpd b/_apps/rompr/files/run-httpd similarity index 100% rename from apps/rompr/files/run-httpd rename to _apps/rompr/files/run-httpd diff --git a/apps/smarthome/Containerfile b/_apps/smarthome/Containerfile similarity index 100% rename from apps/smarthome/Containerfile rename to _apps/smarthome/Containerfile diff --git a/apps/smarthome/home-assistant.yaml b/_apps/smarthome/home-assistant.yaml similarity index 100% rename from apps/smarthome/home-assistant.yaml rename to _apps/smarthome/home-assistant.yaml diff --git a/apps/smarthome/socat/Containerfile b/_apps/smarthome/socat/Containerfile similarity index 100% rename from apps/smarthome/socat/Containerfile rename to _apps/smarthome/socat/Containerfile diff --git a/apps/smarthome/supervisor.conf b/_apps/smarthome/supervisor.conf similarity index 100% rename from apps/smarthome/supervisor.conf rename to _apps/smarthome/supervisor.conf diff --git a/apps/smarthome/zwave2mqtt.yaml b/_apps/smarthome/zwave2mqtt.yaml similarity index 100% rename from apps/smarthome/zwave2mqtt.yaml rename to _apps/smarthome/zwave2mqtt.yaml diff --git a/bin/.find_changes.sh.swp b/bin/.find_changes.sh.swp new file mode 100644 index 0000000000000000000000000000000000000000..510115fe092304630b37b43272e7d1b34c3826a2 GIT binary patch literal 12288 zcmeI&F>ezw6bJBEkPu4?DjSn~3F@6H_flA(G(!}SE)rBiqA(z+E@xk2ak0bYs;VLZ z@e%kO@FCdP5gQD^z{tc0;5oexurvz;=x^!C@w;cA@3&cTzxAMZSKQd#B5oIn-i254 z^XFFS?FS;|eDd^GXlsv7FQXUA#RF5t*)VmJSh?(}E~Ocz13iiR#>Tm^YM&okPHaww z3#^C|2tZ&VfrBcS*O%$q)vcDVZv<=N((2wqQ&9u~2tWV=5P$##AOHaf{2v0reLABNE&UzcVx&8`1Hw zn>=co$L;3Bq;r4%yfNQUaHqGs&HFBl)iXcMKlcgW&w_cS|H+FfQ~KAQ6i0M8G=&zW nPL=S}Zwh~R-?UrQP1<2ZN@qn{^5#3Dn^0qIe%-#G@*VqM9pQt1 literal 0 HcmV?d00001 diff --git a/bin/find_changes.sh b/bin/find_changes.sh index 88b0bdd..7796656 100755 --- a/bin/find_changes.sh +++ b/bin/find_changes.sh @@ -1,16 +1,14 @@ #!/bin/bash declare -A CH - - - CH=() +i=0 while read line; do WHAT=$(dirname ${line}) - echo "LIN: ${line} WHAT: ${WHAT}" - echo $CH -done < <(git diff-tree --no-commit-id --name-only HEAD -r) -echo ${CH} - + #echo "LIN: ${line} WHAT: ${WHAT}" + CH[$i]=$WHAT + i=$((i++)) +done < <(git diff-tree --no-commit-id --name-only HEAD -r| egrep '^_') +echo "UNIQ:" UNIQ=$(echo ${CH} |sort |uniq) -echo ${UNIQ} \ No newline at end of file +echo ${UNIQ} From 542fc027206dc21580b86c640e691bc9d044b349 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:05:43 +0200 Subject: [PATCH 03/14] more changes --- _apps/nextcloud/bla | 0 bin/.find_changes.sh.swp | Bin 12288 -> 0 bytes bin/find_changes.sh | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 _apps/nextcloud/bla delete mode 100644 bin/.find_changes.sh.swp diff --git a/_apps/nextcloud/bla b/_apps/nextcloud/bla new file mode 100644 index 0000000..e69de29 diff --git a/bin/.find_changes.sh.swp b/bin/.find_changes.sh.swp deleted file mode 100644 index 510115fe092304630b37b43272e7d1b34c3826a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&F>ezw6bJBEkPu4?DjSn~3F@6H_flA(G(!}SE)rBiqA(z+E@xk2ak0bYs;VLZ z@e%kO@FCdP5gQD^z{tc0;5oexurvz;=x^!C@w;cA@3&cTzxAMZSKQd#B5oIn-i254 z^XFFS?FS;|eDd^GXlsv7FQXUA#RF5t*)VmJSh?(}E~Ocz13iiR#>Tm^YM&okPHaww z3#^C|2tZ&VfrBcS*O%$q)vcDVZv<=N((2wqQ&9u~2tWV=5P$##AOHaf{2v0reLABNE&UzcVx&8`1Hw zn>=co$L;3Bq;r4%yfNQUaHqGs&HFBl)iXcMKlcgW&w_cS|H+FfQ~KAQ6i0M8G=&zW nPL=S}Zwh~R-?UrQP1<2ZN@qn{^5#3Dn^0qIe%-#G@*VqM9pQt1 diff --git a/bin/find_changes.sh b/bin/find_changes.sh index 7796656..ba54b5e 100755 --- a/bin/find_changes.sh +++ b/bin/find_changes.sh @@ -9,6 +9,6 @@ while read line; do CH[$i]=$WHAT i=$((i++)) done < <(git diff-tree --no-commit-id --name-only HEAD -r| egrep '^_') -echo "UNIQ:" +#echo "UNIQ:" UNIQ=$(echo ${CH} |sort |uniq) echo ${UNIQ} From 4579621b03d68fd873bdbd3ab09e85573573896d Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:07:27 +0200 Subject: [PATCH 04/14] more changes --- _CI-CD/debian-stable/bla | 0 _apps/nextcloud/bla | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 _CI-CD/debian-stable/bla delete mode 100644 _apps/nextcloud/bla diff --git a/_CI-CD/debian-stable/bla b/_CI-CD/debian-stable/bla deleted file mode 100644 index e69de29..0000000 diff --git a/_apps/nextcloud/bla b/_apps/nextcloud/bla deleted file mode 100644 index e69de29..0000000 From dafa848d805a8873b4db6e43a261e225b38e5d39 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:09:07 +0200 Subject: [PATCH 05/14] more changes --- _apps/curl/bla | 0 _apps/piwigo/bla | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 _apps/curl/bla create mode 100644 _apps/piwigo/bla diff --git a/_apps/curl/bla b/_apps/curl/bla new file mode 100644 index 0000000..e69de29 diff --git a/_apps/piwigo/bla b/_apps/piwigo/bla new file mode 100644 index 0000000..e69de29 From 60417861fc9d0ef8a8e30c435da9002eccd3bf9f Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:13:27 +0200 Subject: [PATCH 06/14] more changes --- _apps/curl/bla | 0 _apps/piwigo/bla | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 _apps/curl/bla delete mode 100644 _apps/piwigo/bla diff --git a/_apps/curl/bla b/_apps/curl/bla deleted file mode 100644 index e69de29..0000000 diff --git a/_apps/piwigo/bla b/_apps/piwigo/bla deleted file mode 100644 index e69de29..0000000 From 8c967883925374e28e7cedd3f7c22a057b90e11e Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:17:50 +0200 Subject: [PATCH 07/14] Sun 21 Apr 17:17:50 CEST 2024 --- _apps/mosquitto-prometheus-exporter/bla | 0 _apps/mosquitto/bla | 0 bin/find_changes.sh | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 _apps/mosquitto-prometheus-exporter/bla create mode 100644 _apps/mosquitto/bla diff --git a/_apps/mosquitto-prometheus-exporter/bla b/_apps/mosquitto-prometheus-exporter/bla new file mode 100644 index 0000000..e69de29 diff --git a/_apps/mosquitto/bla b/_apps/mosquitto/bla new file mode 100644 index 0000000..e69de29 diff --git a/bin/find_changes.sh b/bin/find_changes.sh index ba54b5e..7c58067 100755 --- a/bin/find_changes.sh +++ b/bin/find_changes.sh @@ -2,7 +2,7 @@ declare -A CH CH=() i=0 - +echo $(git --version) while read line; do WHAT=$(dirname ${line}) #echo "LIN: ${line} WHAT: ${WHAT}" From 98234e569a0d9e2d889f642dbd942f6154009515 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:23:21 +0200 Subject: [PATCH 08/14] WHOA Sun 21 Apr 17:23:21 CEST 2024 --- .drone.jsonnet | 2 +- _CI-CD/debian-testing/Dockerfile | 4 ++-- bin/find_changes.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 0763758..e076143 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -34,7 +34,7 @@ local build(dir, package) = { steps: [ { name: 'git log', - image: 'cr.wks/debian-stable', + image: 'cr.wks/debian-testing', commands: [ 'bin/find_changes.sh' ] }, # [ diff --git a/_CI-CD/debian-testing/Dockerfile b/_CI-CD/debian-testing/Dockerfile index 9b01ee8..1a87df7 100644 --- a/_CI-CD/debian-testing/Dockerfile +++ b/_CI-CD/debian-testing/Dockerfile @@ -4,7 +4,7 @@ RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/so sed -i 's@security.debian.org@apt-cache.service.nr5/security.debian.org@g' /etc/apt/sources.list.d/debian.sources RUN apt-get update && apt-get install -y \ - dnsutils procps nmap bash iputils-ping bash + dnsutils procps nmap bash iputils-ping bash git RUN apt-get remove -y --purge man-db ;\ apt-get autoremove -y --purge ;\ @@ -13,4 +13,4 @@ RUN apt-get remove -y --purge man-db ;\ rm -rf /var/cache/apt/* ADD docker-entrypoint.sh / -ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/bin/find_changes.sh b/bin/find_changes.sh index 7c58067..bd44419 100755 --- a/bin/find_changes.sh +++ b/bin/find_changes.sh @@ -5,7 +5,7 @@ i=0 echo $(git --version) while read line; do WHAT=$(dirname ${line}) - #echo "LIN: ${line} WHAT: ${WHAT}" + echo "LIN: ${line} WHAT: ${WHAT}" CH[$i]=$WHAT i=$((i++)) done < <(git diff-tree --no-commit-id --name-only HEAD -r| egrep '^_') From ccbe462a76506b16f6bacfe934206d77dc90ae57 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:26:41 +0200 Subject: [PATCH 09/14] building testing with git --- .drone.jsonnet | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index e076143..e4f1cc9 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,11 +1,11 @@ local dirs = ['_CI-CD', 'apps']; -local packages = ['debian-stable', 'debian-stable-build-essential', 'debian-stable-openwrt', +#local packages = ['debian-stable', 'debian-stable-build-essential', 'debian-stable-openwrt', 'debian-golang', 'debian-stable-php-fpm', 'distcc', 'debian-testing']; -#local packages = ['debian-stable-openwrt']; +local packages = ['debian-testing']; -local apps = ['rompr', 'apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter']; -#local apps = ['rompr']; +#local apps = ['rompr', 'apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter']; +local apps = ['rompr']; local build(dir, package) = { name: '%(package)s' % { package: package }, @@ -47,4 +47,30 @@ local build(dir, package) = { # ] ], }, + { + kind: 'pipeline', + type: 'docker', + name: '_CI-CD', + platform: { + os: 'linux', + arch: 'arm64', + }, + steps: [ + build('_CI-CD', pkg) + for pkg in packages + ], + }, + { + kind: 'pipeline', + type: 'docker', + name: 'apps', + platform: { + os: 'linux', + arch: 'arm64', + }, + steps: [ + build('apps', app) + for app in apps + ], + }, ] From 4ccfd0d6481f8be1d9c633966ec1af597d26b528 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:27:46 +0200 Subject: [PATCH 10/14] building testing with git --- .drone.jsonnet | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index e4f1cc9..19297cd 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,7 +1,6 @@ local dirs = ['_CI-CD', 'apps']; -#local packages = ['debian-stable', 'debian-stable-build-essential', 'debian-stable-openwrt', - 'debian-golang', 'debian-stable-php-fpm', 'distcc', 'debian-testing']; +#local packages = ['debian-stable', 'debian-stable-build-essential', 'debian-stable-openwrt', 'debian-golang', 'debian-stable-php-fpm', 'distcc', 'debian-testing']; local packages = ['debian-testing']; #local apps = ['rompr', 'apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter']; From 35ec70792c52a113cfab4f8fec23b77c48c31db2 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:36:58 +0200 Subject: [PATCH 11/14] klappt das so? Ja ne? --- _CI-CD/debian-testing/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_CI-CD/debian-testing/Dockerfile b/_CI-CD/debian-testing/Dockerfile index 1a87df7..d4b9f9c 100644 --- a/_CI-CD/debian-testing/Dockerfile +++ b/_CI-CD/debian-testing/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:testing-slim +FROM debian:testing-slim:latest RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/sources.list.d/debian.sources && \ sed -i 's@security.debian.org@apt-cache.service.nr5/security.debian.org@g' /etc/apt/sources.list.d/debian.sources From 3dac0b92f14acae5e312dba475e5c13c87d7856c Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:38:45 +0200 Subject: [PATCH 12/14] klappt das so? Ja ne? - man-db darf bleiben --- _CI-CD/debian-testing/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_CI-CD/debian-testing/Dockerfile b/_CI-CD/debian-testing/Dockerfile index d4b9f9c..8304bb3 100644 --- a/_CI-CD/debian-testing/Dockerfile +++ b/_CI-CD/debian-testing/Dockerfile @@ -6,8 +6,7 @@ RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/so RUN apt-get update && apt-get install -y \ dnsutils procps nmap bash iputils-ping bash git -RUN apt-get remove -y --purge man-db ;\ - apt-get autoremove -y --purge ;\ +RUN apt-get autoremove -y --purge ;\ apt-get clean -y ;\ rm -rf /var/lib/apt/lists/* ;\ rm -rf /var/cache/apt/* From 5b5c21b67beb7d54655e1d7dc87e8964790c92b9 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 17:44:07 +0200 Subject: [PATCH 13/14] klappt das so? Ja ne? - man-db darf bleiben --- _CI-CD/debian-testing/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_CI-CD/debian-testing/Dockerfile b/_CI-CD/debian-testing/Dockerfile index 8304bb3..d485bf8 100644 --- a/_CI-CD/debian-testing/Dockerfile +++ b/_CI-CD/debian-testing/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:testing-slim:latest +FROM debian:testing-slim RUN sed -i 's@deb.debian.org@apt-cache.service.nr5/deb.debian.org@g' /etc/apt/sources.list.d/debian.sources && \ sed -i 's@security.debian.org@apt-cache.service.nr5/security.debian.org@g' /etc/apt/sources.list.d/debian.sources From 65318147c7e2e544019f0f57abb3b0c4bea85a66 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 21 Apr 2024 19:23:45 +0200 Subject: [PATCH 14/14] with git/testing --- .drone.jsonnet | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 19297cd..158c0f6 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,9 +1,9 @@ local dirs = ['_CI-CD', 'apps']; -#local packages = ['debian-stable', 'debian-stable-build-essential', 'debian-stable-openwrt', 'debian-golang', 'debian-stable-php-fpm', 'distcc', 'debian-testing']; -local packages = ['debian-testing']; +local packages = ['debian-stable', 'debian-stable-build-essential', 'debian-stable-openwrt', 'debian-golang', 'debian-stable-php-fpm', 'distcc', 'debian-testing']; +#local packages = ['debian-testing']; -#local apps = ['rompr', 'apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter']; +local apps = ['rompr', 'apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter']; local apps = ['rompr']; local build(dir, package) = {