Skip to content

Commit 4975e48

Browse files
committed
Revert "chore: simplify sed usage on mac"
This reverts commit 7ae90ea.
1 parent 7ae90ea commit 4975e48

1 file changed

Lines changed: 18 additions & 13 deletions

File tree

kind-gpu-sim.sh

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ else
1919
PID_CMD="pidof"
2020
fi
2121

22-
# Allows building bundles in Mac replacing BSD 'sed' command by GNU-compatible 'gsed'
23-
if command -v which gsed 2>/dev/null; then
24-
SED=sed
25-
else
26-
SED=gsed
27-
fi
28-
2922
for arg in "$@"; do
3023
case "$arg" in
3124
--registry-port=*)
@@ -149,9 +142,15 @@ function build_and_push_images() {
149142

150143
if [ "$CONTAINER_RUNTIME" = "podman" ]; then
151144
echo "Patching NVIDIA Dockerfile for Podman compatibility..."
152-
${SED} -i 's|^FROM redhat/ubi9-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
153-
${SED} -i 's|^FROM public.ecr.aws/ubi9/ubi-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
154-
${SED} -i 's|^FROM registry.access.redhat.com/ubi9/ubi9-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
145+
if [ "$IS_MACOS" = true ]; then
146+
sed -i '' 's|^FROM redhat/ubi9-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
147+
sed -i '' 's|^FROM public.ecr.aws/ubi9/ubi-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
148+
sed -i '' 's|^FROM registry.access.redhat.com/ubi9/ubi9-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
149+
else
150+
sed -i 's|^FROM redhat/ubi9-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
151+
sed -i 's|^FROM public.ecr.aws/ubi9/ubi-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
152+
sed -i 's|^FROM registry.access.redhat.com/ubi9/ubi9-minimal|FROM registry.access.redhat.com/ubi9/ubi-minimal|' deployments/container/Dockerfile
153+
fi
155154
grep FROM deployments/container/Dockerfile
156155
fi
157156

@@ -176,9 +175,15 @@ function build_and_push_images() {
176175
cd k8s-device-plugin-rocm
177176

178177
echo " Patching ROCm Dockerfile for public registry compatibility..."
179-
${SED} -i 's|FROM alpine:3.21.3|FROM public.ecr.aws/docker/library/alpine:3.21.3|' Dockerfile
180-
${SED} -i 's|FROM docker.io/golang:1.23.6-alpine3.21|FROM public.ecr.aws/docker/library/golang:1.23.6-alpine3.21|' Dockerfile
181-
${SED} -i 's|FROM golang:1.23.6-alpine3.21|FROM public.ecr.aws/docker/library/golang:1.23.6-alpine3.21|' Dockerfile
178+
if [ "$IS_MACOS" = true ]; then
179+
sed -i '' 's|FROM alpine:3.21.3|FROM public.ecr.aws/docker/library/alpine:3.21.3|' Dockerfile
180+
sed -i '' 's|FROM docker.io/golang:1.23.6-alpine3.21|FROM public.ecr.aws/docker/library/golang:1.23.6-alpine3.21|' Dockerfile
181+
sed -i '' 's|FROM golang:1.23.6-alpine3.21|FROM public.ecr.aws/docker/library/golang:1.23.6-alpine3.21|' Dockerfile
182+
else
183+
sed -i 's|FROM alpine:3.21.3|FROM public.ecr.aws/docker/library/alpine:3.21.3|' Dockerfile
184+
sed -i 's|FROM docker.io/golang:1.23.6-alpine3.21|FROM public.ecr.aws/docker/library/golang:1.23.6-alpine3.21|' Dockerfile
185+
sed -i 's|FROM golang:1.23.6-alpine3.21|FROM public.ecr.aws/docker/library/golang:1.23.6-alpine3.21|' Dockerfile
186+
fi
182187

183188
cr build -t localhost:${REGISTRY_PORT}/amdgpu-dp:dev -f Dockerfile .
184189

0 commit comments

Comments
 (0)