fixed environment variable passing

main
Andre Challier 2024-03-27 18:27:50 +01:00
parent 108ecfe1f1
commit ab8e2b2cfb
3 changed files with 13 additions and 7 deletions

3
.env
View File

@ -2,4 +2,5 @@ WEBHOOK_GIT_DATA_PATH=/path/to/webhook-git/data
WEBHOOK_SECRET=1234 WEBHOOK_SECRET=1234
NGINX_NETWORK=network-name NGINX_NETWORK=network-name
WEBHOOK_GIT_NETWORK=network-name WEBHOOK_GIT_NETWORK=network-name
GIT_SERVER=git.example.com GIT_SERVER_PROGRAMM=git.example.com
GIT_SERVER_ASSETS=git.example.com

View File

@ -7,6 +7,9 @@ services:
- static-files:/usr/share/nginx/html - static-files:/usr/share/nginx/html
networks: networks:
- nginx-network - nginx-network
environment:
- GIT_SERVER_ASSETS=${GIT_SERVER_ASSETS}
- GIT_SERVER_ASSETS=${GIT_SERVER_ASSETS}
webhooks-git: webhooks-git:
build: build:

View File

@ -79,17 +79,19 @@ else
fi fi
# Create or append known_hosts # Create or append known_hosts
ssh-keyscan -H "${GIT_SERVER_PROGRAMM}" >> "${path_ssh}/known_hosts" ssh-keyscan -H "$GIT_SERVER_PROGRAMM" >> "${path_ssh}/known_hosts"
ssh-keyscan -H "${GIT_SERVER_ASSETS}" >> "${path_ssh}/known_hosts" ssh-keyscan -H "$GIT_SERVER_ASSETS" >> "${path_ssh}/known_hosts"
echo "git and ssh configured." echo "git and ssh configured."
echo "Programm webhook public key (deploy key):" echo "|--- Programm webhook public key (deploy key): --------------------|"
echo "|------------------------------------------------------------------|"
cat "${path_ssh}"/programm-webhook.deploy.ed25519.pub cat "${path_ssh}"/programm-webhook.deploy.ed25519.pub
echo "|------------------------------------------------------------------|" echo "|------------------------------------------------------------------|"
echo "Assets webhook public key (deploy key):" echo "|--- Assets webhook public key (deploy key): ----------------------|"
echo "|------------------------------------------------------------------|"
cat "${path_ssh}"/assets-webhook.deploy.ed25519.pub cat "${path_ssh}"/assets-webhook.deploy.ed25519.pub
echo "|---- Config ------------------------------------------------------|"
cat "${path_ssh}"/config
echo "|---- known_hosts -------------------------------------------------|"
cat "${path_ssh}"/known_hosts
echo "|------------------------------------------------------------------|" echo "|------------------------------------------------------------------|"
# Initialize assets # Initialize assets