diff --git a/.ci/debug.sh b/.ci/debug.sh index 9ecd7b5..0f43277 100755 --- a/.ci/debug.sh +++ b/.ci/debug.sh @@ -3,9 +3,10 @@ set -x DISTRO=${DISTRO:="focal"} +SALT=${SALT:="3005"} STATE=$1 SIFT_VERSION=${2:-stable} -docker run -it --rm --name="sift-package-${STATE}" -p 8080:80 -v `pwd`/sift:/srv/salt/sift teamdfir/sift-saltstack-tester:$DISTRO /bin/bash +docker run -it --rm --name="sift-package-${STATE}" -p 8080:80 -v `pwd`/sift:/srv/salt/sift ghcr.io/teamdfir/sift-saltstack-tester:${SALT}-${DISTRO} /bin/bash diff --git a/.ci/dev-state.sh b/.ci/dev-state.sh index 2ffb954..d23c451 100755 --- a/.ci/dev-state.sh +++ b/.ci/dev-state.sh @@ -3,7 +3,8 @@ set -x DISTRO=${DISTRO:="focal"} +SALT=${SALT:="3005"} STATE=$1 -docker run -it --rm --name="sift-state-${STATE}" -p 8080:80 -v `pwd`/sift:/srv/salt/sift --cap-add SYS_ADMIN teamdfir/sift-saltstack-tester:${DISTRO} \ +docker run -it --rm --name="sift-state-${STATE}" -p 8080:80 -v `pwd`/sift:/srv/salt/sift --cap-add SYS_ADMIN ghcr.io/teamdfir/sift-saltstack-tester:${SALT}-${DISTRO} \ /bin/bash diff --git a/.ci/test-state.sh b/.ci/test-state.sh index d57097b..0e57ddb 100755 --- a/.ci/test-state.sh +++ b/.ci/test-state.sh @@ -3,7 +3,8 @@ set -x DISTRO=${DISTRO:="focal"} +SALT=${SALT:="3005"} STATE=$1 -docker run -it --rm --name="sift-state-${STATE}" -v `pwd`/sift:/srv/salt/sift --cap-add SYS_ADMIN teamdfir/sift-saltstack-tester:${DISTRO} \ +docker run -it --rm --name="sift-state-${STATE}" -v `pwd`/sift:/srv/salt/sift --cap-add SYS_ADMIN ghcr.io/teamdfir/sift-saltstack-tester:${SALT}-${DISTRO} \ salt-call -l debug --local --retcode-passthrough --state-output=mixed state.sls ${STATE} pillar="{sift_user: root}"