From 24af1dff018cc2897dcb33f67e9cfdda078686d4 Mon Sep 17 00:00:00 2001 From: juancho Date: Sun, 7 Dec 2025 11:45:58 -0500 Subject: [PATCH] Eliminar archivos y configuraciones obsoletas de Docker y scripts en el proyecto onedrive --- {onedrive/cron => cron}/Dockerfile | 0 {onedrive/cron => cron}/README.md | 0 {onedrive/cron => cron}/docker-compose.yml | 22 ++++++------- {onedrive/cron => cron}/requirements.txt | 2 +- {onedrive/cron => cron}/script.sh | 0 docker-compose.yml | 33 +++++++++++++++++++ {onedrive/engine => engine}/Dockerfile | 0 {onedrive/engine => engine}/README.md | 0 .../engine => engine}/docker-compose.yml | 30 ++++++++--------- nosleep-oracle/Dockerfile | 13 -------- nosleep-oracle/test.sh | 1 - rclone-gui/Dockerfile | 19 ----------- rclone-gui/docker-compose.yaml | 15 --------- rclone-gui/test.sh | 1 - rclone-webdav/Dockerfile | 21 ------------ rclone-webdav/docker-compose.yaml | 11 ------- rclone-webdav/test.sh | 4 --- 17 files changed, 60 insertions(+), 112 deletions(-) rename {onedrive/cron => cron}/Dockerfile (100%) rename {onedrive/cron => cron}/README.md (100%) rename {onedrive/cron => cron}/docker-compose.yml (97%) rename {onedrive/cron => cron}/requirements.txt (94%) rename {onedrive/cron => cron}/script.sh (100%) create mode 100644 docker-compose.yml rename {onedrive/engine => engine}/Dockerfile (100%) rename {onedrive/engine => engine}/README.md (100%) rename {onedrive/engine => engine}/docker-compose.yml (95%) delete mode 100644 nosleep-oracle/Dockerfile delete mode 100644 nosleep-oracle/test.sh delete mode 100644 rclone-gui/Dockerfile delete mode 100644 rclone-gui/docker-compose.yaml delete mode 100644 rclone-gui/test.sh delete mode 100644 rclone-webdav/Dockerfile delete mode 100644 rclone-webdav/docker-compose.yaml delete mode 100644 rclone-webdav/test.sh diff --git a/onedrive/cron/Dockerfile b/cron/Dockerfile similarity index 100% rename from onedrive/cron/Dockerfile rename to cron/Dockerfile diff --git a/onedrive/cron/README.md b/cron/README.md similarity index 100% rename from onedrive/cron/README.md rename to cron/README.md diff --git a/onedrive/cron/docker-compose.yml b/cron/docker-compose.yml similarity index 97% rename from onedrive/cron/docker-compose.yml rename to cron/docker-compose.yml index 670aaf4..5841c27 100644 --- a/onedrive/cron/docker-compose.yml +++ b/cron/docker-compose.yml @@ -1,12 +1,12 @@ ---- -services: - odcron: - build: . - container_name: odcron - environment: - - IP=host:8080 # Cambia esto por la IP y puerto deseado - - PASSWORD=pass # Cambia esto por la contraseña deseada - - REFRESH_TOKEN=tokenit # Cambia esto por el token deseado - restart: unless-stopped - hostname: odcron +--- +services: + odcron: + build: . + container_name: odcron + environment: + - IP=host:8080 # Cambia esto por la IP y puerto deseado + - PASSWORD=pass # Cambia esto por la contraseña deseada + - REFRESH_TOKEN=tokenit # Cambia esto por el token deseado + restart: unless-stopped + hostname: odcron network_mode: bridge \ No newline at end of file diff --git a/onedrive/cron/requirements.txt b/cron/requirements.txt similarity index 94% rename from onedrive/cron/requirements.txt rename to cron/requirements.txt index 56ae43f..651d147 100644 --- a/onedrive/cron/requirements.txt +++ b/cron/requirements.txt @@ -1,2 +1,2 @@ -requests +requests schedule \ No newline at end of file diff --git a/onedrive/cron/script.sh b/cron/script.sh similarity index 100% rename from onedrive/cron/script.sh rename to cron/script.sh diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2932df8 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,33 @@ +--- +services: + odengin: + build: ./odengin # Ajusta la ruta al directorio con su Dockerfile + container_name: odengin + environment: + - E5_CLIENT_ID=id + - E5_CLIENT_SECRET=secret + - E5_REFRESH_TOKEN=tokenit + - WEB_APP_PASSWORD=123 + - E5_WEB_APP_PASSWORD=123 + ports: + - 8089:8080 + restart: unless-stopped + hostname: odengin + networks: + - odeng-net + + odcron: + build: ./odcron # Ajusta la ruta al directorio con su Dockerfile + container_name: odcron + environment: + - IP=odengin:8080 # Usa el nombre del servicio para comunicación interna + - PASSWORD=pass + - REFRESH_TOKEN=tokenit + restart: unless-stopped + hostname: odcron + networks: + - odeng-net + +networks: + odeng-net: + driver: bridge diff --git a/onedrive/engine/Dockerfile b/engine/Dockerfile similarity index 100% rename from onedrive/engine/Dockerfile rename to engine/Dockerfile diff --git a/onedrive/engine/README.md b/engine/README.md similarity index 100% rename from onedrive/engine/README.md rename to engine/README.md diff --git a/onedrive/engine/docker-compose.yml b/engine/docker-compose.yml similarity index 95% rename from onedrive/engine/docker-compose.yml rename to engine/docker-compose.yml index e84055e..461819b 100644 --- a/onedrive/engine/docker-compose.yml +++ b/engine/docker-compose.yml @@ -1,16 +1,16 @@ ---- -services: - odengin: - build: . - container_name: odengin - environment: - - E5_CLIENT_ID=id - - E5_CLIENT_SECRET=secret - - E5_REFRESH_TOKEN=tokenit - - WEB_APP_PASSWORD=123 - - E5_WEB_APP_PASSWORD=123 - ports: - - 8089:8080 - restart: unless-stopped - hostname: odengin +--- +services: + odengin: + build: . + container_name: odengin + environment: + - E5_CLIENT_ID=id + - E5_CLIENT_SECRET=secret + - E5_REFRESH_TOKEN=tokenit + - WEB_APP_PASSWORD=123 + - E5_WEB_APP_PASSWORD=123 + ports: + - 8089:8080 + restart: unless-stopped + hostname: odengin network_mode: bridge \ No newline at end of file diff --git a/nosleep-oracle/Dockerfile b/nosleep-oracle/Dockerfile deleted file mode 100644 index bfbc2dc..0000000 --- a/nosleep-oracle/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu - -RUN apt update && apt upgrade -y && apt install wget -y - -RUN wget https://github.com/layou233/NeverIdle/releases/download/0.2.3/NeverIdle-linux-arm64 -O NeverIdle - -RUN chmod 777 NeverIdle - -COPY . . - -RUN chmod +x test.sh - -ENTRYPOINT ./test.sh diff --git a/nosleep-oracle/test.sh b/nosleep-oracle/test.sh deleted file mode 100644 index 01fb6f5..0000000 --- a/nosleep-oracle/test.sh +++ /dev/null @@ -1 +0,0 @@ -./NeverIdle -c 2h1m2s -m 2 -n 4h diff --git a/rclone-gui/Dockerfile b/rclone-gui/Dockerfile deleted file mode 100644 index c3f4495..0000000 --- a/rclone-gui/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM ubuntu - -RUN apt update && apt upgrade -y && apt autoremove -y && apt install python3 python3-pip -y && apt install git nano wget -y - -ENV URL_DESCARGA_RCLONE="https://downloads.rclone.org/v1.69.1/rclone-v1.69.1-linux-amd64.deb" - -EXPOSE 5572 - -WORKDIR /app - -RUN wget $URL_DESCARGA_RCLONE - -RUN dpkg -i rclone-v1.69.1-linux-amd64.deb - -RUN wget https://raw.githubusercontent.com/kadma/pruebasdocker/main/rclone-gui/test.sh - -RUN chmod +x test.sh - -ENTRYPOINT ./test.sh diff --git a/rclone-gui/docker-compose.yaml b/rclone-gui/docker-compose.yaml deleted file mode 100644 index edfb2c0..0000000 --- a/rclone-gui/docker-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -services: - rclone-webdav: - build: - context: . - dockerfile: Dockerfile - container_name: rclone-gui - environment: - - USER_RCLONE=adm - - PASSWORD_RCLONE=pass - volumes: - - /path/to/config:/root/.config/rclone - restart: unless-stopped - network_mode: bridge - hostname: rclone-gui \ No newline at end of file diff --git a/rclone-gui/test.sh b/rclone-gui/test.sh deleted file mode 100644 index f17880d..0000000 --- a/rclone-gui/test.sh +++ /dev/null @@ -1 +0,0 @@ -rclone rcd --rc-web-gui --rc-addr :5572 --rc-serve --rc-user=$USER_RCLONE --rc-pass=$PASSWORD_RCLONE --rc-no-auth --config "/root/.config/rclone/rclone.conf" --user-agent "Mozilla" --transfers 24 diff --git a/rclone-webdav/Dockerfile b/rclone-webdav/Dockerfile deleted file mode 100644 index e21e461..0000000 --- a/rclone-webdav/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM ubuntu - -RUN apt update && apt upgrade -y && apt autoremove -y && apt install python3 python3-pip -y && apt install git nano wget -y - -ENV URL_DESCARGA_RCLONE="https://downloads.rclone.org/v1.66.0/rclone-v1.66.0-linux-amd64.deb" - -WORKDIR /app - -RUN wget $URL_DESCARGA_RCLONE - -RUN dpkg -i rclone-v1.66.0-linux-amd64.deb - -RUN rm rclone-v1.66.0-linux-amd64.deb - -ENV USER_RCLONE=adm PASSWORD_RCLONE=pass - -RUN wget https://raw.githubusercontent.com/kadma/pruebasdocker/main/rclone-webdav/test.sh - -RUN chmod +x test.sh - -ENTRYPOINT ./test.sh diff --git a/rclone-webdav/docker-compose.yaml b/rclone-webdav/docker-compose.yaml deleted file mode 100644 index fce9291..0000000 --- a/rclone-webdav/docker-compose.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -services: - rclone-webdav: - build: - context: . - dockerfile: Dockerfile - container_name: rclone-webdav - volumes: - - /path/to/config:/root/.config/rclone - restart: unless-stopped - network_mode: bridge diff --git a/rclone-webdav/test.sh b/rclone-webdav/test.sh deleted file mode 100644 index cdf9a41..0000000 --- a/rclone-webdav/test.sh +++ /dev/null @@ -1,4 +0,0 @@ -rclone serve webdav --vfs-cache-mode writes --addr :80 drive: --buffer-size 250M --vfs-read-chunk-size 256M --ignore-size --ignore-checksum --update & -rclone serve webdav --vfs-cache-mode writes --addr :81 drive1: --buffer-size 250M --vfs-read-chunk-size 256M --ignore-size --ignore-checksum --update & -rclone serve webdav --vfs-cache-mode writes --addr :82 drive2: --buffer-size 250M --vfs-read-chunk-size 256M --ignore-size --ignore-checksum --update & -rclone serve webdav --vfs-cache-mode writes --addr :83 drive3: --buffer-size 250M --vfs-read-chunk-size 256M --ignore-size --ignore-checksum --update