rompr new

.drone.jsonnet

@@ -1,10 +1,12 @@
-local dirs = ['_CI-CD', 'apps'];
+#local dirs = ['_CI-CD', 'apps'];
+local dirs = ['apps'];
 
-local packages = ['debian-stable', 'debian-testing', 'debian-stable-build-essential', 'debian-golang', 'debian-stable-php-fpm', 'distcc'];
-#local packages = ['debian-golang'];
+local packages = ['debian-stable', 'debian-stable-build-essential', 'debian-stable-openwrt', 
+                    'debian-golang', 'debian-stable-php-fpm', 'debian-testing'];
+#local packages = ['debian-stable-openwrt'];
 
-local apps = ['apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter'];
-#local apps = ['mosquitto-prometheus-exporter'];
+local apps = ['rompr', 'apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter'];
+#local apps = ['rompr'];
 
 local build(dir, package) = {
   name: '%(package)s' % { package: package },
@@ -14,24 +16,51 @@ local build(dir, package) = {
     dockerfile: '%(dir)s/%(package)s/Dockerfile' % { dir: dir, package: package },
     registry: 'http://cr.wks',
     insecure: 'true',
+    purge: 'false',
+    experimental: 'true',
     tags: ['latest'],
     repo: 'cr.wks/%(package)s' % { package: package },
+    cache_from: 'cr.wks/%(package)s:latest' % { package: package },
   },
 };
 [
   {
     kind: 'pipeline',
     type: 'docker',
-    name: '_CI-CD',
+    name: 'Build Changes',
     platform: {
       os: 'linux',
       arch: 'arm64',
     },
     steps: [
-      build('_CI-CD', pkg)
-      for pkg in packages
+      {
+       name: 'git log',
+       image: 'cr.wks/debian-testing',
+       commands: [ 'bin/find_changes.sh', 'ls -la' ]
+       },
+     #  [
+     # build('_CI-CD', app)
+     # for app in packages
+     # ],
+     # [
+     #  build('apps', app)
+     # for app in apps
+     # ]
     ],
   },
+ #{
+ #   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',

.gitignore

@@ -1 +1 @@
-csi-s3/storage-csi-s3/cmd/s3driver/s3driver
+*.swp

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>kubernetes</name>
+	<name>docker-images</name>
 	<comment></comment>
 	<projects>
 	</projects>

_CI-CD/debian-stable-openwrt/Dockerfile

@@ -0,0 +1,14 @@
+FROM cr.wks/debian-stable-build-essential
+
+RUN apt update -y; \
+        apt install -y build-essential ccache ecj fastjar file g++ gawk \
+              gettext git java-propose-classpath libelf-dev libncurses5-dev \
+              libncursesw5-dev libssl-dev python3 python3-dev unzip wget \
+              python3-distutils python3-setuptools rsync subversion swig time \
+              xsltproc zlib1g-dev make distcc distcc-pump nfs-common clang flex bison g++ gawk \
+              gcc-multilib-mips-linux-gnu git libncurses-dev libssl-dev  && \
+       apt-get remove --purge -y exim* && \
+	   apt-get autoremove --purge -y && \
+       apt-get clean -y && \                                                                                           
+       rm -rf /var/lib/apt/lists/* && \                                                                                
+       rm -rf /var/cache/apt/*

_CI-CD/debian-stable-php-fpm/Dockerfile

@@ -1,11 +1,11 @@
-FROM cr.wks/debian-stable
+FROM debian:stable AS baseimage
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y \
 	dnsutils procps nmap bash iputils-ping bash openssl \
 	php-fpm php-zip php-sqlite3 php-pgsql php-mysqli php-json php-readline \
-	php-xml php-ldap php-imap php-intl php-xmlrpc php-imagick php-gd php-cli php-curl \
-	php-bz2 php-mbstring php-memcache php-redis
+	php-xml php-intl php-xmlrpc php-imagick php-gd php-cli php-curl \
+	php-bz2 php-mbstring
 	
 #cleanup
 RUN	apt-get remove -y --purge man-db ;\
@@ -14,6 +14,8 @@ RUN	apt-get remove -y --purge man-db ;\
 	rm -rf /var/lib/apt/lists/* ;\
 	rm -rf /var/cache/apt/*
 
-ADD etc_php-fpm/www.conf /etc/php/7.4/fpm/pool.d
+FROM baseimage as final
+
+ADD etc_php-fpm/www.conf /etc/php/8.4/fpm/pool.d
 ADD docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]

_CI-CD/debian-stable/Dockerfile

@@ -4,12 +4,12 @@ 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
+	man-db- \
+    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/*
 ADD docker-entrypoint.sh /
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]

_CI-CD/debian-testing/Dockerfile

@@ -4,13 +4,12 @@ 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 ;\ 
+RUN	apt-get autoremove -y --purge ;\ 
 	apt-get clean -y ;\ 
 	rm -rf /var/lib/apt/lists/* ;\
 	rm -rf /var/cache/apt/*
 	
 ADD docker-entrypoint.sh /
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]

apps/almond-cloud/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:stable
 ENV DEBIAN_FRONTEND noninteractive
 ARG DEVPKGS="git make cmake gcc g++ python-dev libsqlcipher-dev"
 
@@ -34,4 +34,4 @@ RUN	apt-get remove -y --purge ${DEVPKGS} && \
 	
 USER almond-cloud
 WORKDIR /home/almond-cloud
-ENTRYPOINT ["/opt/almond-cloud/start.sh"]
+ENTRYPOINT ["/opt/almond-cloud/start.sh"]

apps/apt-cacher-ng/Dockerfile

@@ -8,5 +8,5 @@ RUN apt-get update && apt-get install -y \
 
 RUN echo 'PassThroughPattern: .*' >> /etc/apt-cacher-ng/acng.conf
 
-EXPOSE      3142
+EXPOSE 3142
 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

apps/apt-cacher-ng/tekton.yaml

@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-apt-cacher-ng
-spec:
-  pipelineRef:
-    name: kaniko-pipeline
-  params:
-    - name: git-url
-      value: http://git-ui.lan/chaos/kubernetes.git
-    - name: git-revision
-      value: master
-    - name: path-to-image-context
-      value: apps/apt-cacher-ng
-    - name: path-to-dockerfile
-      value: apps/apt-cacher-ng/Dockerfile
-    - name: image-name
-      value: cr.lan/apt-cacher-ng
-  workspaces:
-    - name: git-source
-      persistentVolumeClaim:
-        claimName: tektoncd-workspaces
-      subPath: tekton/apt-cacher-ng

apps/curl/Dockerfile

@@ -1,5 +1,4 @@
 FROM cr.wks/debian-stable
-
 RUN apt-get update && apt-get install -y \
 	curl procps && \
 	apt-get clean -y && \ 

apps/curl/tekton.yaml

@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-curl
-spec:
-  pipelineRef:
-    name: kaniko-pipeline
-  params:
-    - name: git-url
-      value: http://git-ui.lan/chaos/kubernetes.git
-    - name: git-revision
-      value: master
-    - name: path-to-image-context
-      value: apps/curl
-    - name: path-to-dockerfile
-      value: apps/curl/Dockerfile
-    - name: image-name
-      value: cr.lan/curl
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/curl

apps/grav/tekton.yaml

@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: img-grav
-spec:
-  pipelineRef:
-    name: kaniko-pipeline
-  params:
-    - name: git-url
-      value: http://git-ui.lan/chaos/kubernetes.git
-    - name: git-revision
-      value: master
-    - name: path-to-image-context
-      value: apps/grav
-    - name: path-to-dockerfile
-      value: apps/grav/Dockerfile
-    - name: image-name
-      value: cr.lan/grav
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/grav

apps/mosquitto-prometheus-exporter/Dockerfile

@@ -1,12 +1,19 @@
-FROM cr.wks/debian-golang
+FROM cr.wks/debian-golang AS build
 
 ENV GOARCH=arm64
 ENV GOPATH=/usr/src/gopath
 ENV GOCACHE=/usr/src/gocache
 RUN go env
-RUN cat /etc/os-release
 WORKDIR /usr/src
-RUN go get github.com/sapcc/mosquitto-exporter
-RUN go mode download
-RUN make -j4 build CGO_ENABLED=0
-RUN ls -al
+RUN go install github.com/sapcc/mosquitto-exporter@latest
+#RUN go mod download
+
+FROM cr.wks/debian-stable
+LABEL source_repository="https://github.com/sapcc/mosquitto-exporter"
+
+COPY --from=build /usr/src/gopath/bin/mosquitto-exporter /mosquitto-exporter
+RUN chmod 0755 /mosquitto-exporter
+
+EXPOSE 9234
+
+ENTRYPOINT [ "/mosquitto-exporter" ]

apps/rompr/Dockerfile

@@ -1,10 +1,9 @@
-FROM cr.lan/debian-stable-php-fpm
+FROM cr.chaos/debian-stable-php-fpm as baseimage
 
-ARG ROMPR_VERSION=1.61
+ARG ROMPR_VERSION=2.24
 # Install packages
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && \
-  	apt-get -y install \
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get -y install \
       nginx \
       curl \
       unzip
@@ -19,21 +18,24 @@ RUN mkdir -p /app /rompr
 RUN unzip -d /app rompr.zip && rm rompr.zip
 RUN ln -sf /rompr/prefs /app/rompr/prefs; ln -sf /rompr/albumart /app/rompr/albumart;
 RUN chown -R www-data:www-data /app/rompr /rompr
-RUN pwd; ls -la .;ls -la /workspace/source;
+RUN pwd; ls -la .;ls -la /etc/php/
 ADD files/nginx_default /etc/nginx/sites-available/default
 RUN mkdir -p /run/php/
+
+FROM baseimage as final
+
 #Environment variables to configure php
-RUN sed -ri -e  's/^allow_url_fopen =.*/allow_url_fopen = On/g' /etc/php/7.4/fpm/php.ini
-RUN sed -ri -e  's/^memory_limit =.*/memory_limit = 128M/g' /etc/php/7.4/fpm/php.ini
-RUN sed -ri -e  's/^max_execution_time =.*/max_execution_time = 1800/g' /etc/php/7.4/fpm/php.ini
-RUN sed -ri -e  's/^post_max_size =.*/post_max_size = 256M/g' /etc/php/7.4/fpm/php.ini
-RUN sed -ri -e  's/^upload_max_filesize =.*/upload_max_filesize = 8M/g' /etc/php/7.4/fpm/php.ini
-RUN sed -ri -e  's/^max_file_uploads =.*/max_file_uploads = 50/g' /etc/php/7.4/fpm/php.ini
-RUN sed -ri -e  's/^display_errors =.*/display_errors = On/g' /etc/php/7.4/fpm/php.ini
-RUN sed -ri -e  's/^display_startup_errors =.*/display_startup_errors = On/g' /etc/php/7.4/fpm/php.ini
+RUN sed -ri -e  's/^allow_url_fopen =.*/allow_url_fopen = On/g' /etc/php/8.4/fpm/php.ini && \
+    sed -ri -e  's/^memory_limit =.*/memory_limit = 128M/g' /etc/php/8.4/fpm/php.ini && \
+    sed -ri -e  's/^max_execution_time =.*/max_execution_time = 1800/g' /etc/php/8.4/fpm/php.ini && \
+    sed -ri -e  's/^post_max_size =.*/post_max_size = 256M/g' /etc/php/8.4/fpm/php.ini && \
+    sed -ri -e  's/^upload_max_filesize =.*/upload_max_filesize = 8M/g' /etc/php/8.4/fpm/php.ini && \
+    sed -ri -e  's/^max_file_uploads =.*/max_file_uploads = 50/g' /etc/php/8.4/fpm/php.ini && \
+    sed -ri -e  's/^display_errors =.*/display_errors = On/g' /etc/php/8.4/fpm/php.ini && \
+    sed -ri -e  's/^display_startup_errors =.*/display_startup_errors = On/g' /etc/php/8.4/fpm/php.ini
 
 RUN echo "<?php phpinfo(); ?>" > /app/rompr/phpinfo.php
-RUN update-rc.d php7.4-fpm defaults
+RUN update-rc.d php8.4-fpm defaults
 ADD files/run-httpd /usr/local/bin/
 RUN chmod 755 /usr/local/bin/run-httpd
 EXPOSE 80

apps/rompr/README.md

@@ -1,3 +1,5 @@
-lighttpd is configured in etc_lighttpd
-generate a configmap with:
-	kubectl create configmap rompr-lighttpd-config --from-file etc_lighthttpd/
+Run with:
+
+```podman run --pull=always -d --replace -p 127.0.0.1:8081:80 \
+           --mount=type=bind,source=/var/lib/rompr,destination=/rompr \
+           --tz=Europe/Berlin --name=rompr cr.wks/rompr:latest```

apps/rompr/deployment.yaml

@@ -1,73 +0,0 @@
----
-apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
-kind: Deployment
-metadata:
-  name: rompr
-spec:
-  selector:
-    matchLabels:
-      app: rompr
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        app: rompr
-    spec:
-      containers:
-      - image: cr.lan/rompr
-        name: rompr
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 80
-          name: http
-        volumeMounts:
-        - name: rompr-data
-          mountPath: /rompr
-      volumes:
-      - name: rompr-data
-        persistentVolumeClaim:
-          claimName: rompr-data
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: rompr
-spec:
-  ports:
-  - name: http
-    port: 80
-  selector:
-    app: rompr
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: rompr
-  annotations:
-    kubernetes.io/ingress.class: nginx
-spec:
-  rules:
-  - host: musik.lan
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: rompr
-            port: 
-              name: http
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: rompr-data
-spec:
-  storageClassName: nfs-ssd
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 6Gi
-      

apps/rompr/files/run-httpd

@@ -4,5 +4,5 @@ mkdir -p /var/log/nginx
 set -e
 mkdir -p /rompr/albumart /rompr/prefs
 chown www-data:www-data -R /rompr/albumart /rompr/prefs
-/etc/init.d/php7.4-fpm restart
+/etc/init.d/php8.4-fpm restart
 exec /usr/sbin/nginx -g 'daemon off;'

apps/rompr/tekton.yaml

@@ -1,23 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  name: build-rompr
-spec:
-  pipelineRef:
-    name: kaniko-pipeline
-  params:
-    - name: git-url
-      value: http://git-ui.lan/chaos/kubernetes.git
-    - name: git-revision
-      value: master
-    - name: path-to-image-context
-      value: apps/rompr
-    - name: path-to-dockerfile
-      value: ./Dockerfile
-    - name: image-name
-      value: cr.lan/rompr
-  workspaces:
-      - name: git-source
-        persistentVolumeClaim:
-          claimName: tektoncd-workspaces
-        subPath: tekton/kaniko-pipelines

bin/find_changes.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+declare -A CH
+CH=()
+i=0
+echo $(git --version)
+while read line; do
+    WHAT=$(dirname ${line})
+    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}