Skip to content

openldap-minion: Install pytest-salt-factories #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhansen wants to merge 3 commits into
base: main
Choose a base branch
from
Open

openldap-minion: Install pytest-salt-factories #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a658d7
virt-minion: Fix `make build`
rhansen Oct 26, 2022
7c00e8b
openlap-minion, virt-minion: Use full `ghcr.io` name
rhansen Oct 26, 2022
06b86b1
openldap-minion: Install `pytest-salt-factories`
rhansen Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions custom/openldap-minion/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
NAME_TAG = ghcr.io/saltstack/salt-ci-containers/openldap-minion:latest
SALT_PATH ?= $(shell python -c 'import os, salt; print(os.path.abspath(salt.__file__ + "../../.."))')

all: build

build:
docker build -t openldap-minion:latest -f latest.Dockerfile .
docker build -t '$(NAME_TAG)' -f latest.Dockerfile .

run:
if [ -d $(SALT_PATH) ]; then \
Expand All @@ -15,9 +16,9 @@ run:
--name openldap-minion \
-it \
--mount type=bind,source=$(SALT_PATH),target=/salt \
openldap-minion:latest \
'$(NAME_TAG)' \
sh; \
fi

clean:
docker rmi openldap-minion
docker rmi '$(NAME_TAG)'
2 changes: 2 additions & 0 deletions custom/openldap-minion/latest.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ RUN install_packages \
python3-jinja2 \
python3-ldap \
python3-msgpack \
python3-pip \
python3-pycryptodome \
python3-yaml \
python3-zmq
RUN pip install pytest-salt-factories
USER 1001
7 changes: 4 additions & 3 deletions custom/virt-minion/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
NAME_TAG = ghcr.io/saltstack/salt-ci-containers/virt-minion:latest
SALT_PATH ?= $(shell python -c 'import os, salt; print(os.path.abspath(salt.__file__ + "../../.."))')

all: build

build:
docker build -t virt-minion .
docker build -t '$(NAME_TAG)' -f latest.Dockerfile .

run:
if [ -d $(SALT_PATH) ]; then \
Expand All @@ -15,8 +16,8 @@ run:
--name virt-minion-0 \
-it \
--mount type=bind,source=$(SALT_PATH),target=/salt \
virt-minion \
'$(NAME_TAG)' \
sh; \
fi
clean:
docker rmi virt-minion
docker rmi '$(NAME_TAG)'