浏览代码

piccoli aggiustamenti soprattutto su 'password'

mauro 4 月之前
父节点
当前提交
6933a7a87b
共有 6 个文件被更改,包括 11 次插入20 次删除
  1. 0 0
      README.md
  2. 4 0
      docker-compose.yml
  3. 5 7
      gogs/gogs.yml
  4. 2 3
      password/password.sh
  5. 0 4
      setup/setup.sh
  6. 0 6
      setup/setup.yml

+ 0 - 0
README.md


+ 4 - 0
docker-compose.yml

@@ -2,6 +2,7 @@ services:
   homeassistant:
     image: ghcr.io/home-assistant/home-assistant:stable
     privileged: true
+    restart: unless-stopped
     volumes:
       - /mnt/Data/Software/Homeassistant:/config
       - /run/dbus:/run/dbus:ro
@@ -56,6 +57,8 @@ services:
     entrypoint: ['bin/bash','/root/password.sh']
     environment:
       PASSWORDWEB_PORT: 0.0.0.0:3020
+      PASSWORDWEB_FILE: /home/password/PasswordFiles/multiword.txt
+      PASSWORDWEB_PIN: 8
 
   syncthing:
     image: local/syncthing
@@ -81,6 +84,7 @@ services:
     ports:
       - 8080:8080
     entrypoint: ['/bin/bash','/root/nginx.sh']
+    restart: unless-stopped
 
   php-fpm:
     image: local/php-fpm

+ 5 - 7
gogs/gogs.yml

@@ -1,11 +1,9 @@
-FROM alpine:latest
-RUN apk add bash
-RUN apk add git
-RUN apk add shadow
-run apk add gcompat
+FROM debian:latest
+RUN apt update && apt dist-upgrade -y
+RUN apt install git -y
 COPY gogs/gogs.sh /root
-RUN groupadd gogs
-RUN useradd -g gogs -s /bin/false -d /home/gogs gogs
+RUN groupadd -g 1002 gogs
+RUN useradd -g gogs -u 1114 -s /bin/false -d /home/gogs gogs
 RUN chmod a+x /root/gogs.sh
 CMD ['/bin/bash','/root/gogs.sh']
 

+ 2 - 3
password/password.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 cd /home/password/PasswordWeb
 echo "posizione $(pwd)"
-chmod a+x /home/password/PasswordWeb/password
+chmod a+x /home/password/PasswordWeb/PasswordWeb
 echo "Running password"
-/home/password/PasswordWeb/password /home/password/PasswordFiles ${PASSWORDWEB_PORT}
-
+/home/password/PasswordWeb/PasswordWeb -f ${PASSWORDWEB_FILE} -p ${PASSWORDWEB_PORT} -n ${PASSWORDWEB_PIN} -b

+ 0 - 4
setup/setup.sh

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

+ 0 - 6
setup/setup.yml

@@ -1,6 +0,0 @@
-FROM alpine:latest
-RUN apk add mariadb-client
-RUN apk add bash
-COPY setup/setup.sh /root
-RUN chmod a+x /root/setup.sh
-CMD ['/bin/bash','/root/setup.sh']