Compare commits

...

5 Commits
master ... py3

Author SHA1 Message Date
24aea9ae06
python3
Some checks reported errors
continuous-integration/drone/push Build was killed
continuous-integration/drone/tag Build is failing
2020-02-22 14:34:41 +01:00
27b1aa1db4
update drone yaml 2020-02-22 14:34:35 +01:00
shimunn
c4162eb700 use adapted riffol version
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2019-04-21 13:27:52 +02:00
shimunn
35731c0135 afix urllib version
Some checks are pending
continuous-integration/drone/push Build is failing
2019-04-21 13:26:59 +02:00
shimunn
54ad7cbcf9 detecht rasp pi
Some checks reported errors
continuous-integration/drone/push Build was killed
2019-04-20 18:11:15 +02:00
4 changed files with 16 additions and 11 deletions

View File

@ -1,13 +1,15 @@
pipeline:
nginx-conf:
kind: pipeline
name: default
steps:
- name: nginx-conf
image: nginx:mainline
commands:
- cp -r nginx /etc/nginx
- nginx -t
docker:
- name: docker
image: plugins/docker
repo: repo.shimun.net/shimun/seafile
tag: riffol
auto_tag: true
registry: repo.shimun.net
storage_path: /drone/.docker
secrets: ["docker_username", "docker_password"]
@ -15,3 +17,5 @@ pipeline:
cache_from: ["repo.shimun.net/shimun/seafile", "repo.shimun.net/shimun/seafile:nginx-deb", "repo.shimun.net/shimun/seafile:alpine"]
use_cache: true
pull_image: false
when:
event: tag

View File

@ -1,6 +1,6 @@
FROM rust:1.34 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 32b
FROM nginx:mainline
@ -12,7 +12,7 @@ ENV SEAF=/opt/seafile
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 python3 sqlite3 python-mysqldb python-pil curl libjansson4 libfuse2 python-pip python-pip-whl python-setuptools \
&& pip install -r /tmp/requirements.txt && apt remove -y python-pip \
&& rm -rf /var/lib/apt/lists/* /tmp/requirements.txt

View File

@ -3,4 +3,6 @@ scriptine
setuptools
simplejson
python-memcached
urllib3
pyyaml
requests==2.18.4
requests_oauthlib==0.8.0

View File

@ -8,10 +8,7 @@ version_re = "seafile-server-?_?([\d\.]*)"
seaf_home = os.environ["SEAF"] or "/opt/seafile"
def available(page):
(arch, _) = platform.architecture()
if arch == "64bit":
arch = "x86-64"
else: arch = "i386"
arch = platform.machine()
link = "http(s?):\/\/[^ \"\(\)\<\>]*%s_?%s.tar.gz" % (version_re ,arch)
resp = requests.get(page)
available = {}
@ -99,6 +96,8 @@ def download(url, version):
return 0
def install_command(url, version):
if platform.machine() == "armv7l":
url = "https://github.com/haiwen/seafile-rpi/releases/download/v%s/seafile-server_%s_stable_pi.tar.gz" % (version,version)
pkg = download(url, version)
tmp = tempfile.mkdtemp()
if pkg and call(["/bin/sh", "-c", 'cd %s; tar xzvf %s' % (tmp, pkg)]) == 0: