diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml index 484f353a..62109deb 100644 --- a/docker-compose.aur-dev.yml +++ b/docker-compose.aur-dev.yml @@ -16,6 +16,10 @@ services: git: restart: always + environment: + - AUR_CONFIG=/aurweb/conf/config + # SSH_CMDLINE should be updated to production's ssh cmdline. + - SSH_CMDLINE=${SSH_CMDLINE:-ssh ssh://aur@localhost:2222} volumes: - ${GIT_DATA_DIR}:/aurweb/aur.git - ./data:/aurweb/data diff --git a/docker-compose.yml b/docker-compose.yml index c39d38bf..26b7d62c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,6 +100,7 @@ services: init: true environment: - AUR_CONFIG=/aurweb/conf/config + - SSH_CMDLINE=${SSH_CMDLINE:-ssh ssh://aur@localhost:2222} entrypoint: /docker/git-entrypoint.sh command: /docker/scripts/run-sshd.sh ports: diff --git a/docker/git-entrypoint.sh b/docker/git-entrypoint.sh index 4d15bcb9..cfa1879b 100755 --- a/docker/git-entrypoint.sh +++ b/docker/git-entrypoint.sh @@ -54,8 +54,8 @@ fi # Set some defaults needed for pathing and ssh uris. sed -ri "s|^(repo-path) = .+|\1 = /aurweb/aur.git/|" $AUR_CONFIG_DEFAULTS -ssh_cmdline='ssh ssh://aur@localhost:2222' -sed -ri "s|^(ssh-cmdline) = .+|\1 = $ssh_cmdline|" $AUR_CONFIG_DEFAULTS +# SSH_CMDLINE can be provided via override in docker-compose.aur-dev.yml. +sed -ri "s|^(ssh-cmdline) = .+$|\1 = ${SSH_CMDLINE}|" $AUR_CONFIG_DEFAULTS # Setup SSH Keys. ssh-keygen -A