diff --git a/Dockerfile b/Dockerfile index 579ecd8..3440e55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,5 +18,6 @@ COPY data/config.yaml /app/data/config.yaml RUN apk add --no-cache bash ENV SSH_KNOWN_HOSTS=/app/data/known_hosts +ENV SSH_KEY_PATH=/app/data/id_rsa CMD ["./controlla", "--config-file", "/app/data/config.yaml"] \ No newline at end of file diff --git a/README.md b/README.md index f1ee649..a79662d 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ docker build -t controlla . docker run --rm \ -v $(pwd)/config.yaml:/app/data/config.yaml \ -v $(pwd)/skipped.yaml:/app/data/skipped.yaml \ - -v ~/.ssh/id_rsa:/app/id_rsa:ro \ + -v ~/.ssh/id_rsa:/app/data/id_rsa:ro \ -e TELEGRAM_TOKEN=your_telegram_token \ -e TELEGRAM_CHAT_ID=your_chat_id \ controlla @@ -127,6 +127,7 @@ trigger: - `CONTROLLA__DOCKERHUB__USERNAME` — username for private DockerHub access (if needed) - `CONTROLLA__DOCKERHUB__PASSWORD` — token for private DockerHub access (if needed) - `SSH_KNOWN_HOSTS` - path in container for known_host file (Default: /app/data/known_hosts) +- `SSH_KEY_PATH` - path in container for ssh key file (Default: /app/data/id_rsa) --- diff --git a/data/config.yaml b/data/config.yaml index cbc71d8..1d0242b 100644 --- a/data/config.yaml +++ b/data/config.yaml @@ -2,7 +2,6 @@ git: repo_url: "git@example.git" local_repo_path: ./data/repos/myrepo branch: "main" - ssh_key_path: "./data/id_rsa" checker: watch_folder: services diff --git a/internal/config/config.go b/internal/config/config.go index 9d86fdf..9263403 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -39,6 +39,7 @@ func LoadConfig(path string) (*AppConfig, error) { viper.BindEnv("github_token", "CONTROLLA__GITHUB__TOKEN") viper.BindEnv("telegram_token", "CONTROLLA__TELEGRAM__TOKEN") viper.BindEnv("telegram_chat_id", "CONTROLLA__TELEGRAM__CHAT__ID") + viper.BindEnv("git.ssh_key_path", "SSH_KEY_PATH") viper.SetConfigFile(path) viper.SetConfigType("yaml")