chaos/docker-salt-master
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #164 from cdalvaro/minor_improvements_ci

Browse Source 
Minor improvements CI
This commit is contained in:
Carlos D. Álvaro
2022-10-05 21:16:24 +02:00
committed by GitHub
parent 1702c7dbd8 195a1741f9
commit bd429cf9b6
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/publish.yml vendored
View File

@@ -123,7 +123,9 @@ jobs:
build-args: | build-args: |
VCS_REF=${{ needs.metadata.outputs.vcs_ref }} VCS_REF=${{ needs.metadata.outputs.vcs_ref }}
BUILD_DATE=${{ needs.metadata.outputs.created_on }} BUILD_DATE=${{ needs.metadata.outputs.created_on }}
cache-from: type=local,src=${{ env.CACHE_PATH }} cache-from: |
type=local,src=${{ env.CACHE_PATH }}
ghcr.io/cdalvaro/docker-salt-master:latest
cache-to: type=local,dest=${{ env.CACHE_PATH }} cache-to: type=local,dest=${{ env.CACHE_PATH }}
push: true push: true
tags: ${{ needs.metadata.outputs.tags }} tags: ${{ needs.metadata.outputs.tags }}

2
assets/sbin/config-reloader
View File

@@ -13,7 +13,9 @@ function check_for_config_changes()
while check_for_config_changes; do while check_for_config_changes; do
log_info "Configuration changes detected. Reloading salt-master ..." log_info "Configuration changes detected. Reloading salt-master ..."
supervisorctl stop salt-api
supervisorctl stop salt-master supervisorctl stop salt-master
killall salt-master; killall -9 salt-master killall salt-master; killall -9 salt-master
supervisorctl start salt-master supervisorctl start salt-master
supervisorctl start salt-api
done done

2
entrypoint.sh
View File

@@ -16,6 +16,8 @@ case "${1}" in
case "${1}" in case "${1}" in
app:start) app:start)
salt-master --versions
log_info "Starting supervisord ..." log_info "Starting supervisord ..."
exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
;; ;;

1
tests/lib/common.sh
View File

@@ -90,6 +90,7 @@ function start_container_and_wait()
docker run --rm --detach --name "${CONTAINER_NAME}" \ docker run --rm --detach --name "${CONTAINER_NAME}" \
--publish 4505:4505 --publish 4506:4506 \ --publish 4505:4505 --publish 4506:4506 \
--env PUID="$(id -u)" --env PGID="$(id -g)" \
--platform "${PLATFORM}" ${DOCKER_ARGS[@]} \ --platform "${PLATFORM}" ${DOCKER_ARGS[@]} \
"${IMAGE_NAME}" || return 1 "${IMAGE_NAME}" || return 1