Skip to content

treewide: s/DOCKER/PODMAN/g #296

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

Merged
charliemirabile merged 1 commit into from
Sep 24, 2025
Merged

treewide: s/DOCKER/PODMAN/g #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions git/admin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
set -e

DOCKER_COMPOSE=${DOCKER_COMPOSE:-podman-compose}
PODMAN_COMPOSE=${PODMAN_COMPOSE:-podman-compose}

$DOCKER_COMPOSE exec git ./create-repo.sh "$@"
$PODMAN_COMPOSE exec git ./create-repo.sh "$@"
4 changes: 2 additions & 2 deletions orbit/warpdrive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

set -e

DOCKER_COMPOSE=${DOCKER_COMPOSE:-podman-compose}
PODMAN_COMPOSE=${PODMAN_COMPOSE:-podman-compose}

$DOCKER_COMPOSE exec orbit ./hyperspace.py "$@"
$PODMAN_COMPOSE exec orbit ./hyperspace.py "$@"
16 changes: 8 additions & 8 deletions test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
# of the furthest right failing command or zero if no command failed (o pipefail)
set -exuo pipefail

DOCKER=${DOCKER:-podman}
DOCKER_COMPOSE=${DOCKER_COMPOSE:-podman-compose}
PODMAN=${PODMAN:-podman}
PODMAN_COMPOSE=${PODMAN_COMPOSE:-podman-compose}

require() { command -v "$1" > /dev/null || { echo "error: $1 command required yet absent" ; exit 1 ; } ; }
require curl
require jq
require flake8
require "${DOCKER}"
require "${DOCKER_COMPOSE}"
require "${PODMAN}"
require "${PODMAN_COMPOSE}"

# Check for shell script style compliance with shellcheck
./script-lint.sh
Expand All @@ -40,7 +40,7 @@ exec jq -r -n "env.SINGULARITY_HOSTNAME"

SINGULARITY_HOSTNAME=${SINGULARITY_HOSTNAME:-"${HOSTNAME_FROM_DOTENV}"}

${DOCKER} cp singularity_nginx_1:/etc/ssl/nginx/fullchain.pem test/ca_cert.pem
${PODMAN} cp singularity_nginx_1:/etc/ssl/nginx/fullchain.pem test/ca_cert.pem

CURL_OPTS=( \
--verbose \
Expand Down Expand Up @@ -150,10 +150,10 @@ curl --url "pop3s://$SINGULARITY_HOSTNAME" \
orbit/warpdrive.sh -u resu -p ssap -n

# Limit `resu`'s access to the empty inbox
${DOCKER_COMPOSE} exec denis /usr/local/bin/restrict_access /var/lib/email/journal/journal -d resu
${PODMAN_COMPOSE} exec denis /usr/local/bin/restrict_access /var/lib/email/journal/journal -d resu

# Update list of email to include new message
${DOCKER_COMPOSE} exec denis /usr/local/bin/init_journal /var/lib/email/journal/journal /var/lib/email/journal/temp /var/lib/email/mail
${PODMAN_COMPOSE} exec denis /usr/local/bin/init_journal /var/lib/email/journal/journal /var/lib/email/journal/temp /var/lib/email/mail

# Check that the user can get the most recent message sent to the server
curl --url "pop3s://$SINGULARITY_HOSTNAME/1" \
Expand All @@ -173,7 +173,7 @@ curl --url "pop3s://$SINGULARITY_HOSTNAME" \


# Remove limit on `resu`'s access to the inbox
${DOCKER_COMPOSE} exec denis /usr/local/bin/restrict_access /var/lib/email/journal/journal -a resu
${PODMAN_COMPOSE} exec denis /usr/local/bin/restrict_access /var/lib/email/journal/journal -a resu

# Check that `resu` can now get the most recent message sent to the server
curl --url "pop3s://$SINGULARITY_HOSTNAME/1" \
Expand Down