aggiornamento

console/console.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "Running"
+touch /var/log/ilniente
+tail -f /var/log/ilniente

console/console.yml

@@ -0,0 +1,8 @@
+FROM debian:stable
+run apt update -y
+run apt upgrade -y
+run apt install mariadb-client -y
+run apt install bash -y
+COPY console/console.sh /root
+RUN chmod a+x /root/console.sh
+CMD ['/bin/bash','/root/setup.sh']

docker-compose.yml

@@ -1,10 +1,21 @@
 services:
+  homeassistant:
+    image: ghcr.io/home-assistant/home-assistant:stable
+    privileged: true
+    volumes:
+      - /mnt/Data/Software/Homeassistant:/config
+      - /run/dbus:/run/dbus:ro
+    environment:
+     TZ: Europe/Rome
+    ports:
+      - 8123:8123
+  
   mariadb:
     image: local/mariadb
     build: 
       dockerfile: ./mariadb/mariadb.yml
     volumes:
-      - mariadb-data:/var/lib/mysql
+      - /home/MariaDb/var/lib/mysql:/var/lib/mysql
     restart: unless-stopped
     ports:
       - 3306:3306
@@ -12,14 +23,14 @@ services:
     environment:
       MARIADB_PASSWORD: "PassworD"
 
-  setup:
-    image: local/setup
+  console:
+    image: console
     build:
-      dockerfile: ./setup/setup.yml
+      dockerfile: ./console/console.yml
     volumes:
-      - /mnt/Data/Volumes/Shared-data:/home/shared-data
-      - archivio-data:/mnt/Data
-    entrypoint: ['bin/bash','/root/setup.sh']
+      - /mnt/Data/Software/Shared_data:/home/shared_data
+      - archivio_data:/mnt/Data
+    entrypoint: ['bin/bash','/root/console.sh']
     restart: unless-stopped 
 
   gogs:
@@ -27,7 +38,7 @@ services:
     build: 
       dockerfile: ./gogs/gogs.yml
     volumes:
-      - gogs-data:/home/gogs
+      - /mnt/Data/Software/Gogs:/home/gogs
     restart: unless-stopped
     ports:
       - 3000:3000
@@ -38,80 +49,114 @@ services:
     build: 
       dockerfile: ./password/password.yml
     volumes:
-      - password-data:/home/password
+      - /mnt/Data/Software/Password:/home/password
     restart: unless-stopped
     ports:
       - 3020:3020
     entrypoint: ['bin/bash','/root/password.sh']
     environment:
-      PASSWORDWEB_PORT: 3020
+      PASSWORDWEB_PORT: 0.0.0.0:3020
 
   syncthing:
     image: local/syncthing
     build: 
       dockerfile: ./syncthing/syncthing.yml
     volumes:
-      - /mnt/Data/Volumes/Syncthing:/home/syncthing
-      - archivio-data:/mnt/Data/Archivio
-      - scansioni-data:/mnt/Data/Scansioni
+      - /home/Syncthing:/home/syncthing
+      - archivio_data:/mnt/Data/Archivio
+      - scansioni_data:/mnt/Data/Scansioni
+      - software_data:/mnt/Data/Software
     restart: unless-stopped
     ports:
       - 8384:8384
-    entrypoint: ['bin/bash','/root/syncthing.sh']
+    entrypoint: ['/bin/bash','/root/syncthing.sh']
 
-volumes:
-  mariadb-data:
-    driver: local
-    driver_opts:
-      device: /mnt/Data/Volumes/MariaDb/var/lib/mysql
-      type: local
-      o: bind
+  nginx:
+    image: local/nginx
+    build:
+      dockerfile: ./nginx/nginx.yml
+    volumes:
+      - archivio_data:/mnt/Data/Archivio
+      - /mnt/Data/Software/Nginx/etc:/etc/nginx
+    ports:
+      - 8080:8080
+    entrypoint: ['/bin/bash','/root/nginx.sh']
 
-  gogs-data:
-    driver: local
-    driver_opts:
-      device: /mnt/Data/Volumes/Gogs
-      type: local
-      o: bind
+  php-fpm:
+    image: local/php-fpm
+    build:
+      dockerfile: ./php-fpm/php-fpm.yml
+    depends_on:
+      - nginx 
+    restart: unless-stopped
+    entrypoint: ['/bin/bash','/root/php-fpm.sh']
+
+  mqtt:
+    image: local/mqtt
+    build:
+      dockerfile: ./mqtt/mqtt.yml
+    restart: unless-stopped
+    ports:
+      - 1883:1883
+    entrypoint: ['/bin/bash','/root/mqtt.sh']
+    volumes:
+      - mqtt_etc:/mnt/Software
+
+  #lychee:
+  #  image: local/lychee
+  #  build:
+  #    dockerfile: ./lychee/lychee.yml
+  #  depends_on:
+  #    - nginx
+  #    - php-fpm
+  #  #restart: unless-stopped
 
-  shared-data:
+volumes:
+  mariadb_data:
+  gogs_data:
+  shared_data:
+  password_data:
+  syncthing_data:
+
+  archivio_data:
     driver: local
     driver_opts:
-      device: /mnt/Data/Volumes/Shared-data
-      type: local
-      o: bind
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw"
+      device: ":/mnt/Data/Archivio"
 
-  password-data:
+  scansioni_data:
     driver: local
     driver_opts:
-      device: /mnt/Data/Volumes/Password
-      type: local
-      o: bind
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw"
+      device: ":/mnt/Data/Scansioni"
 
-  syncthing-syncthing:
+  software_data:
     driver: local
     driver_opts:
-      device: /mnt/Data/Volumes/Syncthing
-      type: local
-      o: bind
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw"
+      device: ":/mnt/Data/Software"
 
-  syncthing-data:
+  nextcloud_data:
     driver: local
     driver_opts:
-      device: /mnt/Data
-      type: local
-      o: bind
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw"
+      device: ":/mnt/Data/Software/Nextcloud_data"
 
-  archivio-data:
+  nextcloud_etc:
     driver: local
     driver_opts:
       type: nfs
       o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Archivio"
+      device: ":/mnt/Data/Software/Nextcloud_etc"
 
-  scansioni-data:
+  mqtt_etc:
     driver: local
     driver_opts:
       type: nfs
       o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Scansioni"
+      device: ":/mnt/Data/Software"
+

mqtt/mqtt.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+echo "posizione $(pwd)"
+/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
+touch /tmp/null
+tail -f /tmp/null

mqtt/mqtt.yml

@@ -0,0 +1,14 @@
+FROM  debian:stable
+RUN apt update -y
+RUN apt upgrade -y
+RUN apt install -y  mosquitto
+run groupadd -g 1002 mqtt
+run useradd -g mqtt -u 1114 -s /bin/false -d /home/mqtt mqtt
+COPY mqtt/mqtt.sh /root/
+RUN chmod a+x /root/mqtt.sh
+RUN mkdir /run/mosquitto
+RUN chown mosquitto:mosquitto /run/mosquitto
+RUN rm -rvf /etc/mosquitto
+RUN ln -s /mnt/Software/Mqtt /etc/mosquitto
+CMD ['/bin/bash','/root/mqtt.sh']
+

nginx/Dockerfile

@@ -0,0 +1,11 @@
+FROM debian:stable
+RUN apt update -y
+RUN apt upgrade -y
+RUN apt update -y
+run apt install -y procps
+run apt install -y nginx-full
+COPY nginx/nginx.sh /root/
+RUN chmod a+x /root/nginx.sh
+CMD ['/usr/bin/nginx',]
+entrypoint ['/bin/bash','/root/nginx.sh']
+

nginx/nginx.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "posizione $(pwd)"
+touch /tmp/null
+tail -f /tmp/null

nginx/nginx.yml

@@ -0,0 +1,11 @@
+FROM debian:stable
+RUN apt update -y
+RUN apt upgrade -y
+RUN apt update -y
+run apt install -y procps
+run apt install -y nginx-full
+COPY nginx/nginx.sh /root/
+RUN chmod a+x /root/nginx.sh
+CMD ['/usr/bin/nginx',]
+entrypoint ['/bin/bash','/root/nginx.sh']
+

nginx/php.ymp

@@ -0,0 +1,14 @@
+FROM debian:stable
+RUN apt update -y
+RUN apt upgrade -y
+run apt install -y nginx-full
+RUN apt -y install lsb-release ca-certificates curl
+RUN apt -y install curl
+RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+RUN dpkg -i /tmp/debsuryorg-archive-keyring.deb
+RUN sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y
+COPY nginx/nginx.sh /root/
+RUN chmod a+x /root/nginx.sh
+CMD ['/bin/bash','/root/nginx.sh']
+

php-fpm/php-fpm.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "posizione $(pwd)"
+touch /tmp/null
+tail -f /tmp/null

php-fpm/php-fpm.yml

@@ -0,0 +1,27 @@
+FROM local/nginx:latest
+RUN apt -y install lsb-release ca-certificates curl
+RUN apt -y install curl
+RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+RUN dpkg -i /tmp/debsuryorg-archive-keyring.deb
+RUN sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y
+run apt dist-upgrade -y
+run apt install php8.3-fpm -y
+run apt install php8.3-mysql -y
+run apt install php8.3-ctype -y
+run apt install php8.3-curl -y
+run apt install php8.3-dom -y
+run apt install php8.3-fileinfo -y
+run apt install php8.3-gd -y
+run apt install php8.3-xmlrpc -y
+run apt install php8.3-mbstring -y
+run apt install php8.3-posix -y
+run apt install php8.3-xml -y
+run apt install php8.3-zip -y
+run apt install -y php8.3-redis
+run apt install -y php8.3-memcache
+run apt install -y php8.3-memcached
+COPY php-fpm/php-fpm.sh /root/
+RUN chmod a+x /root/php-fpm.sh
+CMD ['/bin/bash','/root/php-fpm.sh']
+

redis/redis.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+echo "posizione $(pwd)"
+#redis
+#memcache
+touch /tmp/null
+tail -f /tmp/null

redis/redis.yml

@@ -0,0 +1,10 @@
+FROM debian:stable
+run apt update
+run apt dist-upgrade -y
+run apt install -y redis-server
+run apt install -y memcached
+
+COPY redis/redis.sh /root/
+RUN chmod a+x /root/redis.sh
+CMD ['/bin/bash','/root/redis.sh']
+

syncthing/syncthing.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 cd /home/syncthing
 echo "posizione $(pwd)"
-ls -al
 ls -al /usr/bin/syncthing
-su -s /bin/bash storage -c syncthing
-
+su -s /bin/bash storage -c "syncthing"
+touch /tmp/null
+tail -f /tmp/null

syncthing/syncthing.yml

@@ -1,8 +1,7 @@
-FROM alpine:latest
-RUN apk add bash
-run apk add gcompat
-run apk add shadow
-run apk add syncthing
+FROM  debian:stable
+RUN apt update -y
+RUN apt upgrade -y
+run apt install -y  syncthing
 run groupadd -g 1002 storage
 run useradd -g storage -u 1114 -s /bin/false -d /home/syncthing storage
 COPY syncthing/syncthing.sh /root/