Skip to content

Commit 7d71467

Browse files
committed
fix: sed quoting in edit_dockerfile
1 parent cd74adf commit 7d71467

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/pi_release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
RELEASE_IMAGE="${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ github.event.release.tag_name }}-${{ matrix.parent_image_type }}"
5353
BASE_REF="dev"
5454
HEAD_REF="parent-images"
55-
PR_TITLE="ci(pi): update to $RELEASE_IMAGE"
55+
PR_TITLE="ci(pi): $RELEASE_IMAGE"
5656
5757
git branch -D "$HEAD_REF" || true
5858
git checkout -b "$HEAD_REF"
@@ -75,7 +75,7 @@ jobs:
7575
bash cicd-deployment-scripts/pi/pr_create.sh \
7676
-b "$BASE_REF" \
7777
-h "$HEAD_REF" \
78-
-t "ci(pi): update to $RELEASE_IMAGE" \
78+
-t "$PR_TITLE" \
7979
-o ${{ github.repository_owner }} \
8080
-r ${{ github.event.repository.name }} \
8181
-n ${{ github.event.release.tag_name }} \

pi/edit_dockerfile.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
set -e
44

55
PARENT_IMAGE_NAME="refinery-parent-images"
6-
PARENT_IMAGE_TYPE=""
7-
RELEASE_TAG=""
6+
PARENT_IMAGE_TYPE="common"
7+
RELEASE_TAG="v1.19.1"
88
DOCKER_REGISTRY="kernai"
9-
DOCKERFILE_PATH="Dockerfile"
9+
DOCKERFILE="Dockerfile"
1010

1111
while getopts i:t:l:r:d: flag
1212
do
@@ -15,13 +15,13 @@ do
1515
t) PARENT_IMAGE_TYPE=$(echo ${OPTARG} | sed 's|_|-|g');;
1616
l) RELEASE_TAG=${OPTARG};;
1717
r) DOCKER_REGISTRY=${OPTARG};;
18-
d) DOCKERFILE_PATH=${OPTARG};;
18+
d) DOCKERFILE=${OPTARG};;
1919
esac
2020
done
2121

22-
PI_EXISTING_TAG=$(grep "${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:v.*-${PARENT_IMAGE_TYPE}" $DOCKERFILE_PATH | sed 's|FROM ||g' | cut -d ':' -f 2)
22+
PI_EXISTING_TAG=$(grep "${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:v.*-${PARENT_IMAGE_TYPE}" $DOCKERFILE | sed 's|FROM ||g' | cut -d ':' -f 2)
2323
PI_EXISTING_IMAGE="${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:${PI_EXISTING_TAG}"
2424
PI_NEW_IMAGE="${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:${RELEASE_TAG}-${PARENT_IMAGE_TYPE}"
2525

26-
echo "$(sed "s|${PI_EXISTING_IMAGE}|${PI_NEW_IMAGE}|g" ${DOCKERFILE_PATH})" > $DOCKERFILE_PATH
26+
echo "$(sed 's|'${PI_EXISTING_IMAGE}'|'${PI_NEW_IMAGE}'|g' ${DOCKERFILE})" > $DOCKERFILE
2727
echo "::notice::Dockerfile updated with new image: ${PI_NEW_IMAGE}"

0 commit comments

Comments
 (0)