From 17339d3259f5e1650fb8ed84fe2f2a0615f1b700 Mon Sep 17 00:00:00 2001 From: colben Date: Sun, 3 Jul 2022 15:55:01 +0800 Subject: [PATCH] update --- cloudreve/ADD/ccmd | 93 ++++++++++++++++++++ cloudreve/Demo/SingleNode/README.md | 15 ++++ cloudreve/Demo/SingleNode/docker-compose.yml | 21 +++++ cloudreve/Dockerfile | 7 ++ cloudreve/README.md | 13 +++ cloudreve/cloudreve.sh | 76 ++++++++++++++++ mysql/Dockerfile | 6 +- ops/Dockerfile | 1 - rocky-python/Dockerfile | 2 +- 9 files changed, 229 insertions(+), 5 deletions(-) create mode 100755 cloudreve/ADD/ccmd create mode 100644 cloudreve/Demo/SingleNode/README.md create mode 100644 cloudreve/Demo/SingleNode/docker-compose.yml create mode 100644 cloudreve/Dockerfile create mode 100644 cloudreve/README.md create mode 100755 cloudreve/cloudreve.sh diff --git a/cloudreve/ADD/ccmd b/cloudreve/ADD/ccmd new file mode 100755 index 0000000..928ba00 --- /dev/null +++ b/cloudreve/ADD/ccmd @@ -0,0 +1,93 @@ +#!/bin/bash + +################################################## +# Mount dir # +# - LOG_DIR # +# - DATA_DIR # +################################################## + +set -euo pipefail +export LANG=en_US.UTF-8 +trap Quit EXIT + +PIDS= +GOT_SIGTERM= +LOG_DIR='/var/log/cloudreve' +DATA_DIR='/var/lib/cloudreve' + +function Print { + local file=/dev/null + [ '-f' = "$1" ] && file=$2 && shift && shift + date +"[%F %T] $*" | tee -a $file +} + +function Quit { + Print killing cloudreve ... + while :; do + pkill -f cloudreve && Print killing cloudreve ... || break + sleep 1 + done + Print Container stopped. + test -n "$GOT_SIGTERM" +} + +function ModifyConf { + [ -e $DATA_DIR/cloudreve.ini ] && return 0 + Print Generate cloudreve.ini ... + cat > $DATA_DIR/cloudreve.ini <<-EOF +[System] +Debug = false +Mode = master +Listen = :80 +SessionSecret = $(date +%F | sha256sum | cut -c -64) +HashIDSalt = $(date +%T | sha256sum | cut -c -64) + +#[UnixSocket] +#Listen = /socket/cloudreve + +[Database] +DBFile = $DATA_DIR/cloudreve.db +#Type = mysql +#Port = 3306 +#User = cloudreve +#Password = Cloudreve_1234 +#Host = 127.0.0.1 +#Name = cloudreve +#TablePrefix = cd_ +#Charset = utf8mb4 + +#[Redis] +#Server = 127.0.0.1:6379 +#Password = 123456 +#DB = 9 + +#[CORS] +#AllowOrigins = * +#AllowMethods = OPTIONS,GET,POST +#AllowHeaders = * +#AllowCredentials = false +EOF +} + +function StartProc { + Print Start cloudreve ... + rm -f /socket/cloudreve + /opt/cloudreve -c $DATA_DIR/cloudreve.ini &>> $LOG_DIR/cloudreve.out & + PIDS="$PIDS $!" +} + +function Main { + local pid= + ModifyConf + StartProc + trap "GOT_SIGTERM=1; Print Got SIGTERM ..." SIGTERM + while [ -z "$GOT_SIGTERM" ] && sleep 1; do + for pid in $PIDS; do + [ ! -e /proc/$pid ] && Print Unexpected error! && exit + done + done +} + +# Start here +Main + diff --git a/cloudreve/Demo/SingleNode/README.md b/cloudreve/Demo/SingleNode/README.md new file mode 100644 index 0000000..16c1a8b --- /dev/null +++ b/cloudreve/Demo/SingleNode/README.md @@ -0,0 +1,15 @@ +# 部署 cloudreve + +- 根据实际环境修改 + - docker-compose.yml + +- 创建目录 + ``` + grep '\ /etc/yum.repos.d/mysql-8.0.repo \ diff --git a/ops/Dockerfile b/ops/Dockerfile index 0e330e0..26e069a 100644 --- a/ops/Dockerfile +++ b/ops/Dockerfile @@ -3,7 +3,6 @@ FROM harbor.colben.cn/general/jdk$ARCH:8 MAINTAINER Colben colbenlee@gmail.com RUN tdnf makecache \ && tdnf -y install git openssh openssh-clients openssh-server sshpass jq ansible \ - && echo 'root:Ops_1234' | chpasswd \ && mkdir -m 0700 /root/.ssh \ && sed -i \ -e '/^Port /d' \ diff --git a/rocky-python/Dockerfile b/rocky-python/Dockerfile index 1bc81f6..5470821 100644 --- a/rocky-python/Dockerfile +++ b/rocky-python/Dockerfile @@ -2,6 +2,6 @@ ARG ARCH FROM harbor.colben.cn/general/rocky$ARCH:8 MAINTAINER Colben colbenlee@gmail.com RUN dnf makecache \ - && dnf install gcc python39-devel mysql-devel -y \ + && dnf install gcc gcc-c++ make cmake python39-devel mysql-devel -y \ && rm -rf /var/cache/dnf