openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 06:46:36 +01:00
Code Issues Releases Activity

*: use podman instead of docker

Browse Source 
Signed-off-by: Steve Milner <smilner@redhat.com>
This commit is contained in:
Steve Milner
2018-09-05 13:58:55 -04:00
committed by Alex Crawford
parent 77cc46f9a5
commit c234fc3f95
13 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/maintenance/clean-aws.sh
View File

@@ -4,7 +4,7 @@ usage() {
cat <<EOF
$(basename "$0") deletes AWS resources tagged with tags specified in a tag file.
Requires that 'docker' and 'jq' are installed.
Requires that 'podman' and 'jq' are installed.
AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environmental variables must be set.
@@ -86,7 +86,7 @@ while [ $# -gt 0 ]; do
shift
done
if ! command -V docker >/dev/null || ! command -V jq >/dev/null; then
if ! command -V podman >/dev/null || ! command -V jq >/dev/null; then
echo "Missing required dependencies" >&2
exit 1
fi
@@ -155,9 +155,9 @@ if [ ! $force ]; then
fi
fi
trap 'docker stop grafiti-deleter; exit' EXIT
trap 'podman stop grafiti-deleter; exit' EXIT
docker run -t --rm --name grafiti-deleter \
podman run -t --rm --name grafiti-deleter \
-v "$tmp_dir":/tmp/config:z \
-e AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" \
-e AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \

8
scripts/maintenance/tag-aws.sh
View File

@@ -5,7 +5,7 @@ usage() {
$(basename "$0") tags AWS resources with 'expirationDate: some-date-string',
defaulting to tomorrow's date, and excludes all resources tagged with
tag keys/values specified in an 'exclude' file. Requires that 'docker' is
tag keys/values specified in an 'exclude' file. Requires that 'podman' is
installed.
AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environmental variables must be set.
@@ -101,7 +101,7 @@ while [ $# -gt 0 ]; do
shift
done
if ! command -V docker >/dev/null; then
if ! command -V podman >/dev/null; then
echo "Missing required dependencies" >&2
exit 1
fi
@@ -181,9 +181,9 @@ if [ ! $force ]; then
fi
fi
trap 'docker stop grafiti-tagger; exit' EXIT
trap 'podman stop grafiti-tagger; exit' EXIT
docker run -t --rm --name grafiti-tagger \
podman run -t --rm --name grafiti-tagger \
-v "$tmp_dir":/tmp/config:z \
-e AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" \
-e AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \