diff options
| -rw-r--r-- | .ci/docker/client/etc/my_repos.py | 2 | ||||
| -rwxr-xr-x | .ci/local/test.sh | 4 | ||||
| -rw-r--r-- | .dockerignore | 2 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | cgit/repos/__init__.py | 0 | ||||
| -rw-r--r-- | cgitize/__init__.py (renamed from cgit/__init__.py) | 0 | ||||
| -rw-r--r-- | cgitize/cgit.py (renamed from cgit/repos/cgit.py) | 2 | ||||
| -rw-r--r-- | cgitize/main.py (renamed from cgit/repos/main.py) | 6 | ||||
| -rw-r--r-- | cgitize/repo.py (renamed from cgit/repos/repo.py) | 0 | ||||
| -rw-r--r-- | cgitize/utils.py (renamed from cgit/repos/utils.py) | 0 | ||||
| -rw-r--r-- | examples/my_repos.py | 2 |
14 files changed, 18 insertions, 18 deletions
diff --git a/.ci/docker/client/etc/my_repos.py b/.ci/docker/client/etc/my_repos.py index 9d90f21..58cf542 100644 --- a/.ci/docker/client/etc/my_repos.py +++ b/.ci/docker/client/etc/my_repos.py @@ -1,4 +1,4 @@ -from cgit.repos.repo import Repo +from cgitize.repo import Repo MY_REPOS = ( diff --git a/.ci/local/test.sh b/.ci/local/test.sh index 7f1a958..69a6458 100755 --- a/.ci/local/test.sh +++ b/.ci/local/test.sh @@ -56,7 +56,7 @@ setup_my_repos_py() { mkdir -p -- "$conf_dir" cat <<EOF | tee "$my_repos_path" -from cgit.repos.repo import Repo +from cgitize.repo import Repo MY_REPOS = ( @@ -81,7 +81,7 @@ run() { echo Pulling repository from upstream echo ---------------------------------------------------------------------- - python3 -m cgit.repos.main --config "$cgit_repos_conf_path" + python3 -m cgitize.main --config "$cgit_repos_conf_path" } verify() { diff --git a/.dockerignore b/.dockerignore index 1883461..272da1f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,3 @@ * -!/cgit/** +!/cgitize/** diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6905a7..b97eea3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,4 +55,4 @@ jobs: with: platforms: linux/amd64,linux/armhf push: true - tags: '${{ secrets.DOCKERHUB_USERNAME }}/cgit-repos:latest' + tags: '${{ secrets.DOCKERHUB_USERNAME }}/cgitize:latest' @@ -7,7 +7,7 @@ ARG ssh_sock_path="$ssh_sock_dir/ssh-agent.sock" ENV SSH_AUTH_SOCK "$ssh_sock_path" -COPY ["cgit/", "/usr/src/cgit/"] +COPY ["cgitize/", "/usr/src/cgitize/"] WORKDIR /usr/src -CMD ["python3", "-m", "cgit.repos.main"] +CMD ["python3", "-m", "cgitize.main"] @@ -7,7 +7,7 @@ SHELL := bash .DEFAULT_GOAL := all .SUFFIXES: -PROJECT := cgit-repos +PROJECT := cgitize # Enable buildx support: export DOCKER_CLI_EXPERIMENTAL := enabled # Target platforms (used by buildx): @@ -1,5 +1,5 @@ -cgit repos -========== +cgitize +======= [](https://github.com/egor-tensin/cgit-repos/actions?query=workflow%3ATest) @@ -11,7 +11,7 @@ Usage Adjust the config in [examples/cgit-repos.conf] and pass it using the `--config` parameter: - > python3 -m cgit.repos.main --config path/to/cgit-repos.conf + > python3 -m cgitize.main --config path/to/cgit-repos.conf The repository list is stored in my_repos.py (the `my_repos` setting in the config). @@ -25,7 +25,7 @@ Make sure the required keys are loaded to a ssh-agent. ### Docker -The image is **egortensin/cgit-repos**. +The image is **egortensin/cgitize**. The container reads the config from */etc/cgit-repos/cgit-repos.conf* and writes the repositories to */var/tmp/cgit-repos/output*. If SSH is required, the socket should be mapped to @@ -37,7 +37,7 @@ For example: -v "/path/to/config:/etc/cgit-repos:ro" \ -v "$SSH_AUTH_SOCK:/var/run/cgit-repos/ssh-agent.sock" \ -v "/path/to/output:/var/tmp/cgit-repos/output" \ - egortensin/cgit-repos + egortensin/cgitize ### my_repos.py diff --git a/cgit/repos/__init__.py b/cgit/repos/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/cgit/repos/__init__.py +++ /dev/null diff --git a/cgit/__init__.py b/cgitize/__init__.py index e69de29..e69de29 100644 --- a/cgit/__init__.py +++ b/cgitize/__init__.py diff --git a/cgit/repos/cgit.py b/cgitize/cgit.py index 0f8917a..778b1c9 100644 --- a/cgit/repos/cgit.py +++ b/cgitize/cgit.py @@ -9,7 +9,7 @@ import os import os.path import shutil -import cgit.repos.utils as utils +import cgitize.utils as utils GIT_ENV = os.environ.copy() diff --git a/cgit/repos/main.py b/cgitize/main.py index e5e390f..650c079 100644 --- a/cgit/repos/main.py +++ b/cgitize/main.py @@ -11,9 +11,9 @@ import logging import os.path import sys -from cgit.repos.cgit import CGit, Output -from cgit.repos.repo import BitbucketRepo, GithubRepo, Repo -import cgit.repos.utils as utils +from cgitize.cgit import CGit, Output +from cgitize.repo import BitbucketRepo, GithubRepo, Repo +import cgitize.utils as utils DEFAULT_OUTPUT_DIR = '/var/tmp/cgit-repos/output' diff --git a/cgit/repos/repo.py b/cgitize/repo.py index 4b3072c..4b3072c 100644 --- a/cgit/repos/repo.py +++ b/cgitize/repo.py diff --git a/cgit/repos/utils.py b/cgitize/utils.py index 84337e8..84337e8 100644 --- a/cgit/repos/utils.py +++ b/cgitize/utils.py diff --git a/examples/my_repos.py b/examples/my_repos.py index d0b84b3..75d4787 100644 --- a/examples/my_repos.py +++ b/examples/my_repos.py @@ -1,4 +1,4 @@ -from cgit.repos.repo import BitbucketRepo, GithubRepo, Repo +from cgitize.repo import BitbucketRepo, GithubRepo, Repo MY_REPOS = ( |