rompr new

.drone.jsonnet

@@ -1,7 +1,8 @@
-local dirs = ['_CI-CD', 'apps'];
+#local dirs = ['_CI-CD', 'apps'];
+local dirs = ['apps'];
 
 local packages = ['debian-stable', 'debian-stable-build-essential', 'debian-stable-openwrt', 
-                    'debian-golang', 'debian-stable-php-fpm', 'distcc', 'debian-testing'];
+                    'debian-golang', 'debian-stable-php-fpm', 'debian-testing'];
 #local packages = ['debian-stable-openwrt'];
 
 local apps = ['rompr', 'apt-cacher-ng', 'curl', 'mosquitto', 'mosquitto-prometheus-exporter'];
@@ -34,8 +35,8 @@ local build(dir, package) = {
     steps: [
       {
        name: 'git log',
-       image: 'cr.wks/debian-stable',
-       commands: [ 'bin/find_changes.sh' ]
+       image: 'cr.wks/debian-testing',
+       commands: [ 'bin/find_changes.sh', 'ls -la' ]
        },
      #  [
      # build('_CI-CD', app)
@@ -47,4 +48,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
+    ],
+  },
 ]

.drone.yml

@@ -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

.gitignore

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

_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-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/rompr/Dockerfile

@@ -1,10 +1,9 @@
-FROM cr.wks/debian-stable-php-fpm
+FROM cr.chaos/debian-stable-php-fpm as baseimage
 
-ARG ROMPR_VERSION=2.14
+ARG ROMPR_VERSION=2.24
 # Install packages
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
-  	apt-get -y install \
+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 /etc/php/*/fpm
+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/8.2/fpm/php.ini && \
-    sed -ri -e  's/^memory_limit =.*/memory_limit = 128M/g' /etc/php/8.2/fpm/php.ini && \
-    sed -ri -e  's/^max_execution_time =.*/max_execution_time = 1800/g' /etc/php/8.2/fpm/php.ini && \
-    sed -ri -e  's/^post_max_size =.*/post_max_size = 256M/g' /etc/php/8.2/fpm/php.ini && \
-    sed -ri -e  's/^upload_max_filesize =.*/upload_max_filesize = 8M/g' /etc/php/8.2/fpm/php.ini && \
-    sed -ri -e  's/^max_file_uploads =.*/max_file_uploads = 50/g' /etc/php/8.2/fpm/php.ini && \
-    sed -ri -e  's/^display_errors =.*/display_errors = On/g' /etc/php/8.2/fpm/php.ini && \
-    sed -ri -e  's/^display_startup_errors =.*/display_startup_errors = On/g' /etc/php/8.2/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 php8.2-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/files/nginx_default

@@ -20,7 +20,7 @@ server {
            index index.php;
            location ~ \.php {
                 try_files $uri index.php =404;
-                fastcgi_pass unix:/run/php/php8.2-fpm.sock;
+                fastcgi_pass 127.0.0.1:9000;
                 fastcgi_index index.php;
                 fastcgi_param SCRIPT_FILENAME $request_filename;
                 include /etc/nginx/fastcgi_params;

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/php8.2-fpm restart
+/etc/init.d/php8.4-fpm restart
 exec /usr/sbin/nginx -g 'daemon off;'

bin/find_changes.sh

@@ -1,16 +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}"
-   echo $CH
-done < <(git diff-tree --no-commit-id --name-only HEAD -r)
-echo ${CH}
-
+    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}
+echo ${UNIQ}