Update README

fix

.github/workflows/docker-publish.yml

@@ -0,0 +1,53 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run tests
+        run: |
+          if [ -f docker-compose.test.yml ]; then
+            docker-compose --file docker-compose.test.yml build
+            docker-compose --file docker-compose.test.yml run sut
+          else
+            docker build . --file Dockerfile
+          fi
+
+  push:
+    needs: test
+
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: snegov/seafile-client
+          tag_with_ref: true
+          add_git_labels: true
+          push: ${{ startsWith(github.ref, 'refs/tags/') }}
+
+      - uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: snegov/seafile-client
+          tags: latest
+          add_git_labels: true
+          push: ${{ startsWith(github.ref, 'refs/tags/') }}

Dockerfile

@@ -1,10 +1,10 @@
 FROM python:3-slim
 
-RUN apt-get update && apt-get install gnupg -y && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install gnupg curl -y && rm -rf /var/lib/apt/lists/*
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61 && \
+RUN curl https://linux-clients.seafile.com/seafile.asc | apt-key add - && \
-    echo deb http://deb.seadrive.org buster main | tee /etc/apt/sources.list.d/seafile.list && \
+    echo 'deb [arch=amd64] https://linux-clients.seafile.com/seafile-deb/buster/ stable main' > /etc/apt/sources.list.d/seafile.list && \
     apt-get update -y && \
-    apt-get install -y seafile-cli procps curl grep && \
+    apt-get install -y seafile-cli procps grep && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /seafile-client
@@ -20,4 +20,6 @@ RUN chmod +x /seafile-client/start.py && \
     chown seafile:seafile -R /seafile-client && \
     su - seafile -c "seaf-cli init -d /seafile-client"
 
+VOLUME /seafile-client/seafile-data
+
 CMD ["./start.py"]

README.md

@@ -1,35 +1,42 @@
 # docker-seafile-client
-Run a seafile client inside docker witch can sync files from seafile repositories
+Runs a seafile client in docker with possibility to sync seafile repositories.
-
-See docker-compose how to use.
 
 ## Docker-compose example:
 ```yaml
 version: '3'
+
 services:
   seafile-client:
     restart: always
     image: snegov/seafile-client
-    container_name: seafile-client
     environment:
       - LIBRARY_ID=<your-library-id-here>
       - SERVER_HOST=<server-host>
-      - SERVER_PORT=<server-port>
       - USERNAME=<username>
       - PASSWORD=<password>
-      - DATA_DIR=<directory-path-to-sync>
       - SEAFILE_UID=<your_uid>
       - SEAFILE_GID=<your_gid>
+    hostname: docker-seafile-client
     volumes:
-      - <host-volume-path>:<directory-path-to-sync>
+      - seafile-data:/seafile-client/seafile-data
+      - <host-volume-path>:/data
+
+volumes:
+  seafile-data:
 ```
 
+Library id could be found from "My Libraries" page in Seafile webUI - link to each library contains library ID in it.
+
+Inside container libraries' content will be put in `/data` directory, so map your host directory to it.
+
+`hostname` parameter in docker-compose will set client name in Seafile's "Linked devices" admin page. Resulting name will be prefixed by "terminal-".
+
+Also you could check [docker-compose example](docker-compose.example.yml).
+
 ## Environment variables:
- - `LIBRARY_ID=<your-library-id-here>`  ID of library to sync; multiple libraries could be separated by colon `:`
+ - `LIBRARY_ID=<your-library-id-here>`  ID of library to sync; multiple libraries could be separated by colon `:`.
- - `SERVER_HOST=<server-host>`          Hostname of your seafile server, eg: seafile.example.com
+ - `SERVER_HOST=<server-host>`          Hostname of your seafile server, eg: `seafile.example.com`. If you're using non-standart port, specify it here, eg: `seafile.example.com:8080`.
- - `SERVER_PORT=<server-port>`          Which port the server is hosted on: usually 443 (https) or 80 (http)
+ - `USERNAME=<username>`                Seafile account username.
- - `USERNAME=<username>`                Seafile account username
+ - `PASSWORD=<password>`                Seafile account password.
- - `PASSWORD=<password>`                Seafile account password
+ - `SEAFILE_UID=<uid>`                  Downloaded files will have this uid.
- - `DATA_DIR=<directory-path-to-sync>`  The path where to put the files
+ - `SEAFILE_GID=<gid>`                  Downloaded files will have this gid.
- - `SEAFILE_UID=<uid>`                  Downloaded files will have this uid
- - `SEAFILE_GID=<gid>`                  Downloaded files will have this gid

docker-compose.example.yml

@@ -1,17 +1,21 @@
 version: '3'
+
 services:
   seafile-client:
     restart: always
     image: snegov/seafile-client
-    container_name: seafile-client
     environment:
-      - LIBRARY_ID=<your-library-id-here>
+      - LIBRARY_ID="79867cbf-2944-488d-9105-859463ecdf9e:8078e3ff-b2a0-450a-b4dd-c1ed9ef18294"
-      - SERVER_HOST=<server-host>
+      - SERVER_HOST=seafile.example.com
-      - SERVER_PORT=<server-port>
+      - USERNAME=user
-      - USERNAME=<username>
+      - PASSWORD=password
-      - PASSWORD=<password>
+      - SEAFILE_UID=1000
-      - DATA_DIR=<directory-path-to-sync>
+      - SEAFILE_GID=100
-      - SEAFILE_UID=<your_uid>
+    hostname: docker-seafcli
-      - SEAFILE_GID=<your_gid>
     volumes:
-      - <host-volume-path>:<directory-path-to-sync>
+      - seafile-data:/seafile-client/seafile-data
+      - /home/johndow/seafile:/data
+
+
+volumes:
+  seafile-data:

seafile_client/client.py

@@ -2,6 +2,7 @@ import logging
 import os
 import subprocess
 import time
+from urllib.parse import urlparse
 
 import requests
 
@@ -14,8 +15,9 @@ logging.basicConfig(format="%(asctime)s %(message)s",
 
 
 class SeafileClient:
-    def __init__(self, host: str, port: int, user: str, passwd: str):
+    def __init__(self, host: str, user: str, passwd: str):
-        self.url = f"https://{host}:{port}"
+        up = urlparse(requests.get(f"http://{host}").url)
+        self.url = f"{up.scheme}://{up.netloc}"
         self.user = user
         self.password = passwd
         self.__token = None

start.py

@@ -11,11 +11,10 @@ from seafile_client.misc import setup_uid, create_dir
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("--uid", default=os.getenv("SEAFILE_UID"), type=int)
+    parser.add_argument("--uid", default=os.getenv("SEAFILE_UID", default=1000), type=int)
-    parser.add_argument("--gid", default=os.getenv("SEAFILE_GID"), type=int)
+    parser.add_argument("--gid", default=os.getenv("SEAFILE_GID", default=100), type=int)
-    parser.add_argument("--data-dir", default=os.getenv("DATA_DIR"))
+    parser.add_argument("--data-dir", default=os.getenv("DATA_DIR", default="/data"))
     parser.add_argument("--host", default=os.getenv("SERVER_HOST"))
-    parser.add_argument("--port", default=os.getenv("SERVER_PORT"), type=int)
     parser.add_argument("--username", default=os.getenv("USERNAME"))
     parser.add_argument("--password", default=os.getenv("PASSWORD"))
     parser.add_argument("--libs", default=os.getenv("LIBRARY_ID"))
@@ -24,7 +23,7 @@ def main():
     setup_uid(args.uid, args.gid)
     start_seaf_daemon()
     create_dir(args.data_dir)
-    client = SeafileClient(args.host, args.port, args.username, args.password)
+    client = SeafileClient(args.host, args.username, args.password)
     for lib_id in args.libs.split(sep=":"):
         client.sync_lib(lib_id, args.data_dir)
     client.watch_status()