Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions build-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@ set -euo pipefail
PREFER_PODMAN="${PREFER_PODMAN:-0}"
PUSH="${PUSH:-0}"
TAG="${TAG:-latest}"
REGISTRY_ORG="${REGISTRY_ORG:-vbartoli}"
SKUPPER_NAME="${SKUPPER_NAME:-skupper}"
REGISTRY_ORG="quay.io/${REGISTRY_ORG:-skupper}/rhsi-plugin"
IMAGE=${REGISTRY_ORG}:${TAG}

if [[ -x "$(command -v podman)" && $PREFER_PODMAN == 1 ]]; then
OCI_BIN="podman"
else
OCI_BIN="docker"
fi

BASE_IMAGE="quay.io/${REGISTRY_ORG}/rhsi-plugin"
IMAGE=${BASE_IMAGE}:${TAG}

echo "Building image '${IMAGE}' with ${OCI_BIN}"
$OCI_BIN build --build-arg SKUPPER_NAME="${SKUPPER_NAME}" -t $IMAGE .
Expand Down
2 changes: 1 addition & 1 deletion manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
spec:
containers:
- name: openshift-site-plugin
image: quay.io/vbartoli/rhsi-plugin:latest
image: quay.io/skupper/rhsi-plugin:latest
ports:
- containerPort: 9443
protocol: TCP
Expand Down
Loading