6 Commits
arch ... riffol

Author SHA1 Message Date
33af52ff54 keep seafdav deps current
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2020-04-14 15:26:21 +02:00
5b07f77f53 keep python deps current
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2020-04-14 15:16:54 +02:00
6fabfb2aab python3
Some checks reported errors
continuous-integration/drone/push Build was killed
2020-04-14 14:15:03 +02:00
99748c70aa update rust
All checks were successful
continuous-integration/drone/push Build is passing
2019-07-25 18:06:40 +02:00
e9e595ef68 use drone cache [CI SKIP] 2019-07-25 17:17:40 +02:00
d05de406f8 appropriate number for never
Some checks reported errors
continuous-integration/drone/push Build was killed
2019-07-25 17:10:30 +02:00
3 changed files with 16 additions and 11 deletions

View File

@ -11,7 +11,7 @@ pipeline:
registry: repo.shimun.net registry: repo.shimun.net
storage_path: /drone/.docker storage_path: /drone/.docker
secrets: ["docker_username", "docker_password"] secrets: ["docker_username", "docker_password"]
storage_path: /drone/.docker storage_path: /drone/cache/.docker
cache_from: ["repo.shimun.net/shimun/seafile", "repo.shimun.net/shimun/seafile:nginx-deb", "repo.shimun.net/shimun/seafile:alpine"] cache_from: ["repo.shimun.net/shimun/seafile", "repo.shimun.net/shimun/seafile:nginx-deb", "repo.shimun.net/shimun/seafile:alpine"]
use_cache: true use_cache: true
pull_image: false pull_image: false

View File

@ -1,4 +1,4 @@
FROM rust:1.34 AS riffol_build FROM rust:1.36-slim AS riffol_build
RUN cargo install --git https://github.com/shimunn/riffol.git --branch print_error RUN cargo install --git https://github.com/shimunn/riffol.git --branch print_error
@ -12,16 +12,21 @@ ENV SEAF=/opt/seafile
COPY requirements.txt /tmp/requirements.txt COPY requirements.txt /tmp/requirements.txt
RUN apt update && apt install locales -y && apt install -y --no-install-recommends procps openssl python2.7 sqlite3 python-mysqldb python-pil curl libjansson4 libfuse2 python-pip python-pip-whl python-setuptools \ RUN apt update && apt install locales -y && apt install -y --no-install-recommends procps openssl python2.7 sqlite3 python-mysqldb python-pil curl libjansson4 libfuse2 python-pip python-pip-whl python-setuptools python3 sqlite3 python3 python3-pip python3-setuptools python3-ldap \
&& pip install -r /tmp/requirements.txt && apt remove -y python-pip \
&& rm -rf /var/lib/apt/lists/* /tmp/requirements.txt && rm -rf /var/lib/apt/lists/* /tmp/requirements.txt
#ENV RIFFOL_VERSION libc-2.24 RUN python3 -m pip install --upgrade pip && rm -r /root/.cache/pip
#ENV RIFFOL_HASH e6aea0a91abe74dc0892b0814a0485f16ce8b738b4672b4980b15a398c013e974d5d1b6c27eed69899196cc21014e407f7ff74ee5636a8690ebd639fe0ca5abb
#RUN curl -L https://github.com/riboseinc/riffol/releases/download/0.1.0/riffol-$RIFFOL_VERSION.tar.gz -o /tmp/riffol-$RIFFOL_VERSION.tar.gz && \ RUN pip3 install --timeout=3600 click termcolor colorlog pymysql \
# echo "$RIFFOL_HASH /tmp/riffol-$RIFFOL_VERSION.tar.gz" | sha512sum --check && \ django==1.11.29 && rm -r /root/.cache/pip
# tar -xvzf /tmp/riffol-$RIFFOL_VERSION.tar.gz -C /usr/sbin/ && \
# rm /tmp/riffol-$RIFFOL_VERSION.tar.gz ADD https://raw.githubusercontent.com/haiwen/seahub/master/requirements.txt /tmp/hub-requirements.txt
RUN pip3 install --timeout=3600 -r /tmp/hub-requirements.txt
ADD https://raw.githubusercontent.com/haiwen/seafdav/master/requirements.txt /tmp/dav-requirements.txt
RUN pip3 install --timeout=3600 -r /tmp/dav-requirements.txt
COPY --from=riffol_build /usr/local/cargo/bin/riffol /usr/sbin/ COPY --from=riffol_build /usr/local/cargo/bin/riffol /usr/sbin/

View File

@ -21,7 +21,7 @@ function last_update {
if [ -e "$LATEST/install_date" ]; then if [ -e "$LATEST/install_date" ]; then
date -d $(cat "$LATEST/install_date") "+%s" date -d $(cat "$LATEST/install_date") "+%s"
else else
echo 0 echo 1000000
fi fi
} }