Skip to content

Commit 3aab2ec

Browse files
committed
test: different grep method
1 parent 403a117 commit 3aab2ec

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

pi/edit_dockerfile.sh

+13-13
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ do
1919
esac
2020
done
2121

22-
line=$(grep "${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:v.*-${PARENT_IMAGE_TYPE}" $DOCKERFILE)
22+
grep "${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:v.*-${PARENT_IMAGE_TYPE}" $DOCKERFILE | while read -r line ; do
23+
PI_EXISTING_TAG=$(echo $line | sed 's|FROM ||g' | cut -d ':' -f 2)
24+
PI_EXISTING_IMAGE="${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:${PI_EXISTING_TAG}"
25+
PI_NEW_IMAGE="${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:${RELEASE_TAG}-${PARENT_IMAGE_TYPE}"
2326

24-
PI_EXISTING_TAG=$(echo $line | sed 's|FROM ||g' | cut -d ':' -f 2)
25-
PI_EXISTING_IMAGE="${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:${PI_EXISTING_TAG}"
26-
PI_NEW_IMAGE="${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:${RELEASE_TAG}-${PARENT_IMAGE_TYPE}"
27+
echo "PI_EXISTING_TAG = $PI_EXISTING_TAG"
28+
echo "PI_EXISTING_IMAGE = $PI_EXISTING_IMAGE"
29+
echo "PI_NEW_IMAGE = $PI_NEW_IMAGE"
2730

28-
echo "PI_EXISTING_TAG = $PI_EXISTING_TAG"
29-
echo "PI_EXISTING_IMAGE = $PI_EXISTING_IMAGE"
30-
echo "PI_NEW_IMAGE = $PI_NEW_IMAGE"
31+
echo "Dockerfile before update:"
32+
cat ${DOCKERFILE}
33+
sed "s|${PI_EXISTING_IMAGE}|${PI_NEW_IMAGE}|g" ${DOCKERFILE} > ${DOCKERFILE}.tmp && mv ${DOCKERFILE}.tmp ${DOCKERFILE}
3134

32-
echo "Dockerfile before update:"
33-
cat ${DOCKERFILE}
34-
sed 's|'${PI_EXISTING_IMAGE}'|'${PI_NEW_IMAGE}'|g' ${DOCKERFILE} > ${DOCKERFILE}.tmp && mv ${DOCKERFILE}.tmp ${DOCKERFILE}
35-
36-
echo "sed output:"
37-
sed 's|'${PI_EXISTING_IMAGE}'|'${PI_NEW_IMAGE}'|g' ${DOCKERFILE}
35+
echo "sed output:"
36+
sed "s|${PI_EXISTING_IMAGE}|${PI_NEW_IMAGE}|g" ${DOCKERFILE}
37+
done
3838
echo "Dockerfile after update:"
3939
cat ${DOCKERFILE}
4040
echo "::notice::Dockerfile updated with new image: ${PI_NEW_IMAGE}"

0 commit comments

Comments
 (0)