Fix getting seafile server URL

.github/workflows/docker-publish.yml

@@ -2,20 +2,14 @@ name: Docker
 
 on:
   push:
-    # Publish `master` as Docker `latest` image.
     branches:
       - master
-
-    # Publish `v1.2.3` tags as releases.
     tags:
       - '*'
 
-  # Run tests for any PRs.
   pull_request:
 
 jobs:
-  # Run tests.
-  # See also https://docs.docker.com/docker-hub/builds/automated-testing/
   test:
     runs-on: ubuntu-latest
 
@@ -31,10 +25,7 @@ jobs:
             docker build . --file Dockerfile
           fi
 
-  # Push image to GitHub Packages.
-  # See also https://docs.docker.com/docker-hub/builds/
   push:
-    # Ensure test job passes before pushing image.
     needs: test
 
     runs-on: ubuntu-latest
@@ -49,3 +40,5 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: snegov/seafile-client
           tag_with_ref: true
+          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.key | apt-key add - && \
-    echo deb http://deb.seadrive.org buster main | tee /etc/apt/sources.list.d/seafile.list && \
+    echo 'deb [arch=amd64] http://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

README.md

@@ -14,7 +14,6 @@ services:
     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>
@@ -26,8 +25,7 @@ services:
 
 ## Environment variables:
  - `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
  - `PASSWORD=<password>`                Seafile account password
  - `DATA_DIR=<directory-path-to-sync>`  The path where to put the files

docker-compose.example.yml

@@ -7,7 +7,6 @@ services:
     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_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

@@ -15,7 +15,6 @@ def main():
     parser.add_argument("--gid", default=os.getenv("SEAFILE_GID"), type=int)
     parser.add_argument("--data-dir", default=os.getenv("DATA_DIR"))
     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()