Skip to content

Commit ae65d98

Browse files
committed
test: debug edit_dockerfile
1 parent 524c2ea commit ae65d98

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

.github/workflows/pi_build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ jobs:
208208
-r "${{ env.DOCKERHUB_CONTAINER_REGISTRY }}" \
209209
-d "dev.${{ env.DOCKERFILE }}"
210210
211-
git add requirements/${{ matrix.parent_image_type }}-requirements.txt
212-
git commit -m "ci: update ${{ matrix.parent_image_type }}-requirements.txt" || true
211+
git add requirements/${{ matrix.parent_image_type }}-requirements.txt ${{ env.DOCKERFILE }} dev.${{ env.DOCKERFILE }}
212+
git commit -m "ci: update ${{ matrix.parent_image_type }}-requirements.txt and Dockerfile" || true
213213
git push origin ${{ env.HEAD_REF }}
214214
echo "::notice::${{ matrix.app }} - updated ${{ matrix.parent_image_type }}-requirements.txt"
215215

pi/edit_dockerfile.sh

+1-10
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,11 @@ do
1919
esac
2020
done
2121

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

31-
echo "PI_EXISTING_TAG = $PI_EXISTING_TAG"
32-
echo "PI_EXISTING_IMAGE = $PI_EXISTING_IMAGE"
33-
echo "PI_NEW_IMAGE = $PI_NEW_IMAGE"
34-
3527
sed "s|${PI_EXISTING_IMAGE}|${PI_NEW_IMAGE}|g" ${DOCKERFILE} > ${DOCKERFILE}.tmp && mv ${DOCKERFILE}.tmp ${DOCKERFILE}
28+
echo "::notice::Dockerfile updated with new image: ${PI_NEW_IMAGE}"
3629
done
37-
38-
echo "::notice::Dockerfile updated with new image: ${PI_NEW_IMAGE}"

0 commit comments

Comments
 (0)