From fd7b8ad7d7b50a5a534d4353f78d9343b0001bc6 Mon Sep 17 00:00:00 2001 From: KEpartment Date: Thu, 28 Nov 2024 10:37:28 +0000 Subject: [PATCH 1/5] fix: darwin ssh agent --- environments/includes/php-fpm.base.yml | 1 + environments/includes/php-fpm.darwin.yml | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/environments/includes/php-fpm.base.yml b/environments/includes/php-fpm.base.yml index 09110a8..8a0b3fb 100644 --- a/environments/includes/php-fpm.base.yml +++ b/environments/includes/php-fpm.base.yml @@ -6,6 +6,7 @@ x-volumes: &volumes - .${ROLL_WEB_ROOT:-}/:/var/www/html:cached - bashhistory:/bash_history - sshdirectory:/home/www-data/.ssh + - ~/.ssh/known_hosts:/home/www-data/known_hosts x-extra_hosts: &extra_hosts - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0} diff --git a/environments/includes/php-fpm.darwin.yml b/environments/includes/php-fpm.darwin.yml index 9324f73..f986528 100644 --- a/environments/includes/php-fpm.darwin.yml +++ b/environments/includes/php-fpm.darwin.yml @@ -1,7 +1,14 @@ - x-volumes: &volumes - /run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock services: - php-fpm: { volumes: *volumes } - php-debug: { volumes: *volumes } + php-fpm: + environment: + - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:/run/host-services/ssh-auth.sock} + volumes: + *volumes + php-debug: + environment: + - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:/run/host-services/ssh-auth.sock} + volumes: + *volumes \ No newline at end of file From 3e010d68699857df6bc9143eca24da9b2fcad089 Mon Sep 17 00:00:00 2001 From: Henk-Roel van Zijl Date: Mon, 2 Dec 2024 09:17:01 +0100 Subject: [PATCH 2/5] Update version --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 0d91a54..1d0ba9e 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.3.0 +0.4.0 From b82788edc6184fa7f9604b74e77fb81d5d02358b Mon Sep 17 00:00:00 2001 From: KEpartment Date: Mon, 2 Dec 2024 08:54:54 +0000 Subject: [PATCH 3/5] fix compose --- environments/includes/php-fpm.darwin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/includes/php-fpm.darwin.yml b/environments/includes/php-fpm.darwin.yml index f986528..66fb188 100644 --- a/environments/includes/php-fpm.darwin.yml +++ b/environments/includes/php-fpm.darwin.yml @@ -4,11 +4,11 @@ x-volumes: &volumes services: php-fpm: environment: - - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:/run/host-services/ssh-auth.sock} + - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:-/run/host-services/ssh-auth.sock} volumes: *volumes php-debug: environment: - - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:/run/host-services/ssh-auth.sock} + - SSH_AUTH_SOCK=${SSH_AUTH_SOCK_PATH_ENV:-/run/host-services/ssh-auth.sock} volumes: *volumes \ No newline at end of file From b5a52c2b6722d9d28d534d39d5d9c9d9f346fc15 Mon Sep 17 00:00:00 2001 From: Henk-Roel van Zijl Date: Mon, 2 Dec 2024 10:10:21 +0100 Subject: [PATCH 4/5] Update version --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 1d0ba9e..267577d 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.4.0 +0.4.1 From 55d15c51a4562ff32ddf6994307d2d3ef157a947 Mon Sep 17 00:00:00 2001 From: KEpartment Date: Mon, 16 Dec 2024 11:12:01 +0100 Subject: [PATCH 5/5] ssh-agent perms and host key mount --- commands/env.cmd | 5 +++++ environments/includes/php-fpm.base.yml | 2 +- version | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/commands/env.cmd b/commands/env.cmd index 3aba1b0..85a59b5 100644 --- a/commands/env.cmd +++ b/commands/env.cmd @@ -271,3 +271,8 @@ if [[ "${ROLL_PARAMS[0]}" == "down" ]] \ then roll sync stop fi + +## set ssh-agent permissions for container user +if ([[ "${ROLL_PARAMS[0]}" == "up" ]] || [[ "${ROLL_PARAMS[0]}" == "start" ]]) then + roll root chmod 777 /run/host-services/ssh-auth.sock +fi \ No newline at end of file diff --git a/environments/includes/php-fpm.base.yml b/environments/includes/php-fpm.base.yml index 8a0b3fb..b00f85d 100644 --- a/environments/includes/php-fpm.base.yml +++ b/environments/includes/php-fpm.base.yml @@ -6,7 +6,7 @@ x-volumes: &volumes - .${ROLL_WEB_ROOT:-}/:/var/www/html:cached - bashhistory:/bash_history - sshdirectory:/home/www-data/.ssh - - ~/.ssh/known_hosts:/home/www-data/known_hosts + - ~/.ssh/known_hosts:/home/www-data/.ssh/known_hosts x-extra_hosts: &extra_hosts - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0} diff --git a/version b/version index 267577d..70d5b25 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.4.1 +0.4.3 \ No newline at end of file