cgitize 8.0.6__tar.gz → 9.0.0__tar.gz

cgitize-9.0.0/CHANGELOG.md

@@ -0,0 +1,64 @@
+v9.0
+====
+
+### Breaking changes
+
+* Docker images: SSH agent should now be mapped to /ssh/agent.sock (instead of
+/ssh-agent.sock).
+
+v8.0
+====
+
+### Breaking changes
+
+* Since Bitbucket deprecated "app passwords", an Atlassian API token is now
+required in place of those.
+    * In cgitize.toml, the field `bitbucket.username` is replaced with
+`bitbucket.email`, since the API tokens are tied to the Atlassian account now.
+
+v7.0
+====
+
+### Breaking changes
+
+* For forge users, only publicly visible repositories are fetched by default.
+    * New fields in cgitize.toml `{github,bitbucket,gitlab}.users.*.{public,private}`
+control whether to fetch public or private repositories, or both.
+    * The `public` field is set to `true` by default; `private` is `false`.
+
+v6.0
+====
+
+* Major version bumps for the dependencies.
+* Otherwise, no breaking changes.
+
+v5.0
+====
+
+### Breaking changes
+
+* GitHub: private user repositories are also cloned now.
+    * This change is consistent with how Gitlab and Bitbucket backend work.
+    * If `github.token` is set in cgitize.toml, `github.username` must also be
+set.
+
+v5.1
+----
+
+### New features
+
+* In case of an error, a message is displayed in the frontend's header.
+
+v4.0
+====
+
+### Breaking changes
+
+* Fields `access_token` & `app_password` in cgitize.toml renamed to simply
+`token`.
+* Repositories are cloned into directories with the ".git" suffix now.
+
+v3.0
+====
+
+* The latest release that I'm still not too lazy to look up.

{cgitize-8.0.6 → cgitize-9.0.0}/DEVELOPMENT.md

@@ -61,9 +61,10 @@ Upgrading dependencies
 Releases
 --------
 
-* Make a new tag using the semantic versioning policy (you can use [tag-release]
-to do that), review and push it.
 * For a new major version, update the version in the docker-compose definition
 in docker/README.md.
+* Update CHANGELOG.md if necessary.
+* Make a new tag using the semantic versioning policy (you can use [tag-release]
+to do that), review and push it.
 
 [tag-release]: https://github.com/egor-tensin/tag-release

{cgitize-8.0.6 → cgitize-9.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 8.0.6
+Version: 9.0.0
 Summary: Self-host your repositories using cgit
 Author-email: Egor Tensin <egor@tensin.name>
 License-Expression: MIT

{cgitize-8.0.6 → cgitize-9.0.0}/cgitize.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 8.0.6
+Version: 9.0.0
 Summary: Self-host your repositories using cgit
 Author-email: Egor Tensin <egor@tensin.name>
 License-Expression: MIT

{cgitize-8.0.6 → cgitize-9.0.0}/cgitize.egg-info/SOURCES.txt

@@ -1,13 +1,12 @@
-.dockerignore
 .git-blame-ignore-revs
 .gitattributes
 .gitignore
 .python-version
+CHANGELOG.md
 DEVELOPMENT.md
 LICENSE.txt
 Makefile
 README.md
-docker-compose.yml
 prelude.mk
 pyproject.toml
 requirements.txt
@@ -37,9 +36,9 @@ cgitize.egg-info/scm_version.json
 cgitize.egg-info/top_level.txt
 docker/Dockerfile
 docker/README.md
-docker/cgitize.sh
 docker/get_output_dir.py
 docker/in_cron.sh
+docker/run.sh
 docker/frontend/Dockerfile
 docker/frontend/cmd.sh
 docker/frontend/etc/cgitrc
@@ -51,16 +50,15 @@ docker/frontend/usr/lib/cgit/filters/html-converters/md2html
 docs/api.md
 docs/auth.md
 examples/cgitize.toml
-examples/docker/cgitize.toml
 test/__init__.py
 test/set_credentials.sh
-test/integration/docker/.dockerignore
+test/integration/docker/.gitignore
 test/integration/docker/docker-compose.yml
 test/integration/docker/test.sh
-test/integration/docker/cgitize/.gitignore
-test/integration/docker/cgitize/etc/cgitize.toml
+test/integration/docker/etc/cgitize.toml
 test/integration/docker/git_server/Dockerfile
-test/integration/docker/git_server/setup_repo.sh
+test/integration/docker/git_server/entrypoint.sh
+test/integration/docker/git_server/setup.sh
 test/integration/example/test.sh
 test/integration/local/test.sh
 test/unit/__init__.py

{cgitize-8.0.6 → cgitize-9.0.0}/cgitize.egg-info/scm_file_list.json

@@ -1,6 +1,5 @@
 {
   "files": [
-    ".dockerignore",
     ".git-blame-ignore-revs",
     ".gitattributes",
     ".github/dependabot.yml",
@@ -8,6 +7,7 @@
     ".github/workflows/maintenance.yml",
     ".gitignore",
     ".python-version",
+    "CHANGELOG.md",
     "DEVELOPMENT.md",
     "LICENSE.txt",
     "Makefile",
@@ -25,10 +25,8 @@
     "cgitize/url.py",
     "cgitize/utils.py",
     "cgitize/version.py",
-    "docker-compose.yml",
     "docker/Dockerfile",
     "docker/README.md",
-    "docker/cgitize.sh",
     "docker/frontend/Dockerfile",
     "docker/frontend/cmd.sh",
     "docker/frontend/etc/cgit/common",
@@ -39,20 +37,20 @@
     "docker/frontend/usr/lib/cgit/filters/html-converters/md2html",
     "docker/get_output_dir.py",
     "docker/in_cron.sh",
+    "docker/run.sh",
     "docs/api.md",
     "docs/auth.md",
     "examples/cgitize.toml",
-    "examples/docker/cgitize.toml",
     "prelude.mk",
     "pyproject.toml",
     "requirements.txt",
     "test/__init__.py",
-    "test/integration/docker/.dockerignore",
-    "test/integration/docker/cgitize/.gitignore",
-    "test/integration/docker/cgitize/etc/cgitize.toml",
+    "test/integration/docker/.gitignore",
     "test/integration/docker/docker-compose.yml",
+    "test/integration/docker/etc/cgitize.toml",
     "test/integration/docker/git_server/Dockerfile",
-    "test/integration/docker/git_server/setup_repo.sh",
+    "test/integration/docker/git_server/entrypoint.sh",
+    "test/integration/docker/git_server/setup.sh",
     "test/integration/docker/test.sh",
     "test/integration/example/test.sh",
     "test/integration/local/test.sh",

cgitize-9.0.0/cgitize.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "9.0.0",
+  "distance": 0,
+  "node": "gbcfde716275d94b1767a309fe8e35f4c90b834f2",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-14"
+}

{cgitize-8.0.6 → cgitize-9.0.0}/docker/Dockerfile

@@ -35,11 +35,9 @@ RUN apk add -q --no-cache bash git openssh-client tini
 COPY --from=build ["/deps", "/deps/"]
 ENV PYTHONPATH="/deps:/usr/src"
 
-ARG ssh_sock_dir=/
-ARG ssh_sock_path="$ssh_sock_dir/ssh-agent.sock"
-ENV SSH_AUTH_SOCK="$ssh_sock_path"
+ENV SSH_AUTH_SOCK="/ssh/agent.sock"
 
-COPY ["docker/cgitize.sh", "/"]
+COPY ["docker/run.sh", "/"]
 COPY ["docker/get_output_dir.py", "/"]
 COPY ["docker/in_cron.sh", "/"]
 COPY ["cgitize/", "/usr/src/cgitize/"]
@@ -48,6 +46,6 @@ ENV SCHEDULE_ON_START=1
 ENTRYPOINT ["/sbin/tini", "--", "/in_cron.sh"]
 
 WORKDIR /usr/src
-CMD ["/cgitize.sh"]
+CMD ["/run.sh"]
 
 HEALTHCHECK --interval=5m --retries=3 CMD ! test -f /fail

{cgitize-8.0.6 → cgitize-9.0.0}/docker/README.md

@@ -8,7 +8,7 @@ The `SCHEDULE` environment variable controls how often it gets run (see below).
 * Volumes:
     * `/etc/cgitize/cgitize.toml`: configuration file path.
     * `/mnt/cgitize`: by default, cloned repositories will be written here.
-    * `/ssh-agent.sock`: if you use SSH, map the agent socket here.
+    * `/ssh/agent.sock`: if you use SSH, map the agent socket here.
 * Environment variables:
     * `SCHEDULE`: defaults to "once", which makes the container exit after the
 first run.
@@ -49,18 +49,21 @@ services:
       SCHEDULE: '0 */3 * * *'
       # Set CGITIZE_{GITHUB,BITBUCKET,GITLAB}_{USERNAME,TOKEN} variables
       # here or in the config file.
-    image: egortensin/cgitize:8
+    image: egortensin/cgitize:9
     restart: unless-stopped
     volumes:
       - ./example.toml:/etc/cgitize/cgitize.toml:ro
-      - /srv/volumes/cgitize:/mnt/cgitize
+      - repositories:/mnt/cgitize
   frontend:
-    image: egortensin/cgitize-frontend:8
+    image: egortensin/cgitize-frontend:9
     ports:
       - '127.0.0.1:80:80'
     restart: unless-stopped
     volumes:
-      - /srv/volumes/cgitize:/mnt/cgitize:ro
+      - repositories:/mnt/cgitize:ro
+
+volumes:
+  repositories:
 ```
 
 In this configuration, cgitize pulls repositories defined in example.toml every

cgitize-9.0.0/test/integration/docker/docker-compose.yml

@@ -0,0 +1,29 @@
+services:
+  git_server:
+    build:
+      context: .
+      dockerfile: git_server/Dockerfile
+    volumes:
+      - ssh:/ssh
+  cgitize:
+    build:
+      context: ../../..
+      dockerfile: docker/Dockerfile
+    depends_on:
+      - git_server
+    environment:
+      SCHEDULE: once
+    volumes:
+      - ./etc:/etc/cgitize:ro
+      - ./output:/mnt/cgitize
+      - ssh:/ssh:ro
+  frontend:
+    build:
+      context: ../../../docker/frontend
+    ports:
+      - '127.0.0.1:80:80'
+    volumes:
+      - ./output:/mnt/cgitize:ro
+
+volumes:
+  ssh:

cgitize-9.0.0/test/integration/docker/git_server/Dockerfile

@@ -0,0 +1,16 @@
+FROM alpine:3.24
+
+RUN apk add -q --no-cache bash git openssh-client-common openssh-server tini && \
+    echo 'root:root' | chpasswd && \
+    sed -ri 's/^#?PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
+
+USER root
+WORKDIR /root
+
+COPY ["git_server/setup.sh", "./"]
+RUN ./setup.sh
+
+COPY ["git_server/entrypoint.sh", "/"]
+ENTRYPOINT ["/sbin/tini", "--", "/entrypoint.sh"]
+
+CMD ["/usr/sbin/sshd", "-D"]

cgitize-9.0.0/test/integration/docker/git_server/entrypoint.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+set -o errexit -o nounset -o pipefail
+shopt -s inherit_errexit lastpipe
+
+script_name="$( basename -- "${BASH_SOURCE[0]}" )"
+readonly script_name
+
+dump() {
+    local prefix="${FUNCNAME[0]}"
+    [ "${#FUNCNAME[@]}" -gt 1 ] && prefix="${FUNCNAME[1]}"
+
+    local msg
+    for msg; do
+        echo "$script_name: $prefix: $msg"
+    done
+}
+
+readonly ssh_dir=/ssh
+readonly ssh_client_key="$ssh_dir/client_key"
+readonly ssh_client_password='password'
+
+spawn_ssh_agent() {
+    if ! command -v ssh-agent > /dev/null 2>&1; then
+        dump "could not find ssh-agent" >&2
+        return 1
+    fi
+
+    local output
+    output="$( ssh-agent -s -a "$ssh_dir/agent.sock" )"
+
+    echo "$output"
+    eval "$output"
+
+    if [ -z "${SSH_AGENT_PID:+x}" ]; then
+        dump "could not start ssh-agent" >&2
+        return 1
+    fi
+}
+
+setup_ssh_agent() {
+    echo
+    echo ----------------------------------------------------------------------
+    echo Setting up ssh-agent
+    echo ----------------------------------------------------------------------
+
+    spawn_ssh_agent
+
+    local askpass_path
+    askpass_path="$( mktemp )"
+    chmod 0700 -- "$askpass_path"
+
+    echo "#!/usr/bin/env sh" >> "$askpass_path"
+    printf -- 'echo %q' "$ssh_client_password" >> "$askpass_path"
+
+    SSH_ASKPASS="$askpass_path" SSH_ASKPASS_REQUIRE=force DISPLAY= ssh-add "$ssh_client_key" < /dev/null
+}
+
+main() {
+    setup_ssh_agent
+    exec "$@"
+}
+
+main "$@"

cgitize-9.0.0/test/integration/docker/git_server/setup.sh

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+set -o errexit -o nounset -o pipefail
+shopt -s inherit_errexit lastpipe
+
+readonly ssh_dir=/ssh
+readonly ssh_client_password='password'
+
+configure_git() {
+    echo
+    echo ----------------------------------------------------------------------
+    echo Configuring git
+    echo ----------------------------------------------------------------------
+
+    git config --global user.name 'John Doe'
+    git config --global user.email 'John.Doe@example.com'
+    git config --global init.defaultBranch main
+}
+
+generate_ssh_keys() {
+    echo
+    echo ----------------------------------------------------------------------
+    echo Generating SSH keys
+    echo ----------------------------------------------------------------------
+
+    mkdir -p -- "$ssh_dir"
+
+    ssh-keygen -t rsa -b 4096 -f "$ssh_dir/client_key" -N "$ssh_client_password"
+    ssh-keygen -t rsa -b 4096 -f "$ssh_dir/server_key" -N ''
+
+    mkdir ~/.ssh
+
+    cp "$ssh_dir/server_key"     /etc/ssh/ssh_host_ed25519_key
+    cp "$ssh_dir/server_key.pub" /etc/ssh/ssh_host_ed25519_key.pub
+    cp "$ssh_dir/client_key.pub" ~/.ssh/authorized_keys
+
+    chmod 0600 -- /etc/ssh/ssh_host_ed25519_key
+    chmod 0700 -- ~/.ssh/
+    chmod 0600 -- ~/.ssh/authorized_keys
+}
+
+readonly repo_path="$HOME/test_repo"
+
+create_repo() {
+    echo
+    echo ----------------------------------------------------------------------
+    echo Setting up upstream repository
+    echo ----------------------------------------------------------------------
+
+    mkdir -p -- "$repo_path"
+    pushd -- "$repo_path" > /dev/null
+    git init
+    echo '1' > 1.txt
+    git add .
+    git commit -m 'first commit'
+    echo '2' > 2.txt
+    git add .
+    git commit -m 'second commit'
+    popd > /dev/null
+}
+
+main() {
+    configure_git
+    generate_ssh_keys
+    create_repo
+}
+
+main

{cgitize-8.0.6 → cgitize-9.0.0}/test/integration/docker/test.sh

@@ -12,10 +12,8 @@ readonly script_name
 # This is still required with older Compose versions to use TARGETARCH:
 export DOCKER_BUILDKIT=1
 
-readonly ssh_dir="$script_dir/ssh"
-readonly client_key_password='password'
-readonly output_dir="$script_dir/cgitize/output"
-readonly frontend_host=localhost
+readonly output_dir="$script_dir/output"
+readonly frontend_host=127.0.0.1
 
 dump() {
     local prefix="${FUNCNAME[0]}"
@@ -40,8 +38,6 @@ cleanup() {
     echo Cleaning up
     echo ----------------------------------------------------------------------
 
-    remove_ssh_keys
-    kill_ssh_agent
     docker_cleanup
 
     rm -rf -- "$output_dir"
@@ -85,74 +81,6 @@ curl_check_code() {
     fi
 }
 
-generate_ssh_keys() {
-    echo
-    echo ----------------------------------------------------------------------
-    echo Generating SSH keys
-    echo ----------------------------------------------------------------------
-
-    mkdir -p -- "$ssh_dir"
-
-    ssh-keygen -t rsa -b 4096 -f "$ssh_dir/client_key" -N "$client_key_password"
-    ssh-keygen -t rsa -b 4096 -f "$ssh_dir/server_key" -N ''
-}
-
-remove_ssh_keys() {
-    rm -rf -- "$ssh_dir"
-}
-
-kill_ssh_agent() {
-    [ -n "${this_ssh_agent_pid:+x}" ] || return 0
-    dump "killing ssh-agent with PID $this_ssh_agent_pid"
-    kill "$this_ssh_agent_pid"
-}
-
-spawn_ssh_agent() {
-    if ! command -v ssh-agent > /dev/null 2>&1; then
-        dump "could not find ssh-agent" >&2
-        return 1
-    fi
-
-    local output
-    output="$( ssh-agent -s )"
-
-    eval "$output"
-
-    if [ -z "${SSH_AGENT_PID:+x}" ]; then
-        dump "could not start ssh-agent" >&2
-        return 1
-    fi
-
-    this_ssh_agent_pid="$SSH_AGENT_PID"
-}
-
-setup_ssh_agent() {
-    echo
-    echo ----------------------------------------------------------------------
-    echo Setting up ssh-agent
-    echo ----------------------------------------------------------------------
-
-    spawn_ssh_agent
-
-    local key="$ssh_dir/client_key"
-    chmod 0600 -- "$key"
-
-    local askpass_path
-    askpass_path="$( mktemp --tmpdir="$script_dir" )"
-
-    local askpass_rm
-    askpass_rm="$( printf -- 'rm -- %q; trap - RETURN' "$askpass_path" )"
-    trap "$askpass_rm" RETURN
-
-    chmod 0700 -- "$askpass_path"
-
-    local echo_password
-    echo_password="$( printf -- 'echo %q' "$client_key_password" )"
-    echo "$echo_password" > "$askpass_path"
-
-    SSH_ASKPASS="$askpass_path" SSH_ASKPASS_REQUIRE=force DISPLAY= ssh-add "$key" < /dev/null
-}
-
 docker_build() {
     echo
     echo ----------------------------------------------------------------------
@@ -169,8 +97,6 @@ docker_cleanup() {
 }
 
 setup() {
-    generate_ssh_keys
-    setup_ssh_agent
     docker_build
 }
 
@@ -189,11 +115,6 @@ run_cgitize() {
     echo Running cgitize
     echo ----------------------------------------------------------------------
 
-    if [ -z "${SSH_AUTH_SOCK:+x}" ]; then
-        dump 'SSH_AUTH_SOCK is not defined' >&2
-        return 1
-    fi
-    dump "SSH_AUTH_SOCK: $SSH_AUTH_SOCK"
     docker compose run --rm cgitize
 }
 
@@ -219,7 +140,7 @@ verify_git() {
     echo Checking the pulled repository
     echo ----------------------------------------------------------------------
 
-    pushd -- "$script_dir/cgitize/output/test_repo.git" > /dev/null
+    pushd -- "$script_dir/output/test_repo.git" > /dev/null
     git log --oneline
     popd > /dev/null
 }

cgitize-8.0.6/.dockerignore

@@ -1,5 +0,0 @@
-*
-
-!/cgitize/**
-!/docker/**
-!/requirements.txt

cgitize-8.0.6/cgitize.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "8.0.6",
-  "distance": 0,
-  "node": "g0ccb470486d0c01ce1f8442e4298b91c84dfc973",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-12"
-}

cgitize-8.0.6/docker-compose.yml

@@ -1,25 +0,0 @@
-services:
-  cgitize:
-    build:
-      context: .
-      dockerfile: docker/Dockerfile
-    environment:
-      # Every 3 hours:
-      SCHEDULE: '0 */3 * * *'
-    image: egortensin/cgitize:latest
-    restart: unless-stopped
-    volumes:
-      - ./examples/docker:/etc/cgitize:ro
-      - repositories:/mnt/cgitize
-  frontend:
-    build:
-      context: ./docker/frontend
-    image: egortensin/cgitize-frontend:latest
-    ports:
-      - '127.0.0.1:80:80'
-    restart: unless-stopped
-    volumes:
-      - repositories:/mnt/cgitize:ro
-
-volumes:
-  repositories:

cgitize-8.0.6/examples/docker/cgitize.toml

@@ -1,7 +0,0 @@
-clone_via_ssh = false
-clone_url = "http://localhost/{repo}"
-
-[github]
-
-[github.users.me]
-name = "egor-tensin"

cgitize-8.0.6/test/integration/docker/.dockerignore

@@ -1,5 +0,0 @@
-*
-
-!/git_server/**
-/git_server/Dockerfile
-!/ssh/**

cgitize-8.0.6/test/integration/docker/docker-compose.yml

@@ -1,21 +0,0 @@
-services:
-  git_server:
-    build:
-      context: .
-      dockerfile: git_server/Dockerfile
-  cgitize:
-    extends:
-      file: ../../../docker-compose.yml
-      service: cgitize
-    environment:
-      SCHEDULE: once
-    volumes:
-      - ./cgitize/etc:/etc/cgitize:ro
-      - "$SSH_AUTH_SOCK:/ssh-agent.sock"
-      - ./cgitize/output:/mnt/cgitize
-  frontend:
-    extends:
-      file: ../../../docker-compose.yml
-      service: frontend
-    volumes:
-      - ./cgitize/output:/mnt/cgitize:ro

cgitize-8.0.6/test/integration/docker/git_server/Dockerfile

@@ -1,24 +0,0 @@
-FROM alpine:3.24
-
-RUN apk add -q --no-cache bash git openssh-server tini && \
-    echo 'root:root' | chpasswd && \
-    git config --global user.name 'John Doe' && \
-    git config --global user.email 'John.Doe@example.com' && \
-    git config --global init.defaultBranch main && \
-    sed -ri 's/^#?PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
-
-WORKDIR /root
-
-COPY ["ssh/server_key", "/etc/ssh/ssh_host_ed25519_key"]
-COPY ["ssh/server_key.pub", "/etc/ssh/ssh_host_ed25519_key.pub"]
-COPY ["ssh/client_key.pub", "./.ssh/authorized_keys"]
-
-RUN chmod 0600 -- /etc/ssh/ssh_host_ed25519_key && \
-    chmod 0700 -- ./.ssh/ && \
-    chmod 0600 -- ./.ssh/authorized_keys
-
-COPY ["git_server/setup_repo.sh", "./"]
-RUN ./setup_repo.sh
-
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["/usr/sbin/sshd", "-D"]

cgitize-8.0.6/test/integration/docker/git_server/setup_repo.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit -o nounset -o pipefail
-shopt -s inherit_errexit lastpipe
-
-readonly local_repo_path="$HOME/test_repo"
-
-setup_local_repo() {
-    echo
-    echo ----------------------------------------------------------------------
-    echo Setting up upstream repository
-    echo ----------------------------------------------------------------------
-
-    mkdir -p -- "$local_repo_path"
-    pushd -- "$local_repo_path" > /dev/null
-    git init
-    echo '1' > 1.txt
-    git add .
-    git commit -m 'first commit'
-    echo '2' > 2.txt
-    git add .
-    git commit -m 'second commit'
-    popd > /dev/null
-}
-
-main() {
-    setup_local_repo
-}
-
-main