Skip to content

Commit ed19542

Browse files
committed
perf: push parent image builds to dockerhub
1 parent 3646b21 commit ed19542

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/pi_build.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
environment: dev
4040
env:
4141
PYTHON_VERSION: ${{ vars.PYTHON_VERSION }}
42-
DEV_CONTAINER_REGISTRY: ${{ vars.DEV_CONTAINER_REGISTRY }}
43-
DEV_LOGIN_USERNAME: ${{ secrets.DEV_LOGIN_USERNAME }}
44-
DEV_LOGIN_PASSWORD: ${{ secrets.DEV_LOGIN_PASSWORD }}
42+
DOCKERHUB_CONTAINER_REGISTRY: ${{ vars.DOCKERHUB_CONTAINER_REGISTRY }}
43+
DOCKERHUB_LOGIN_USERNAME: ${{ secrets.DOCKERHUB_LOGIN_USERNAME }}
44+
DOCKERHUB_LOGIN_PASSWORD: ${{ secrets.DOCKERHUB_LOGIN_PASSWORD }}
4545
PARENT_IMAGE_NAME: ${{ vars.PARENT_IMAGE_NAME }}
4646
DOCKERFILE: ${{ vars.DOCKERFILE }}
4747
HEAD_REF: parent-image-updates
@@ -86,19 +86,19 @@ jobs:
8686
- name: Log into DEV registry
8787
uses: docker/login-action@v3
8888
with:
89-
registry: "${{ env.DEV_CONTAINER_REGISTRY }}"
90-
username: "${{ env.DEV_LOGIN_USERNAME }}"
91-
password: "${{ env.DEV_LOGIN_PASSWORD }}"
89+
registry: "${{ env.DOCKERHUB_CONTAINER_REGISTRY }}"
90+
username: "${{ env.DOCKERHUB_LOGIN_USERNAME }}"
91+
password: "${{ env.DOCKERHUB_LOGIN_PASSWORD }}"
9292

9393
- name: Build & Push ${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}
9494
uses: docker/build-push-action@v5
9595
with:
9696
context: .
97-
cache-from: type=registry,ref=${{ env.DEV_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-cache
98-
cache-to: type=registry,ref=${{ env.DEV_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-cache,mode=max,image-manifest=true
97+
cache-from: type=registry,ref=${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-cache
98+
cache-to: type=registry,ref=${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-cache,mode=max,image-manifest=true
9999
platforms: linux/amd64
100100
file: ${{ env.DOCKERFILE }}
101-
tags: ${{ env.DEV_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}
101+
tags: ${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}
102102
push: true
103103
build-args: |
104104
platform=linux/amd64
@@ -108,11 +108,11 @@ jobs:
108108
uses: docker/build-push-action@v5
109109
with:
110110
context: .
111-
cache-from: type=registry,ref=${{ env.DEV_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-arm64-cache
112-
cache-to: type=registry,ref=${{ env.DEV_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-arm64-cache,mode=max,image-manifest=true
111+
cache-from: type=registry,ref=${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-arm64-cache
112+
cache-to: type=registry,ref=${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-arm64-cache,mode=max,image-manifest=true
113113
platforms: linux/arm64
114114
file: ${{ env.DOCKERFILE }}
115-
tags: ${{ env.DEV_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-arm64
115+
tags: ${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ env.HEAD_REF }}-${{ matrix.parent_image_type }}-arm64
116116
push: true
117117
build-args: |
118118
platform=linux/arm64

pi/edit_dockerfile.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ done
2222
grep "${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}" $DOCKERFILE | while read -r line ; do
2323
PI_EXISTING_TAG=$(echo $line | sed 's|FROM ||g' | cut -d ':' -f 2)
2424
ALREADY_UPDATED=$(echo $PI_EXISTING_TAG | grep $RELEASE_TAG || true)
25-
25+
2626
if [ -z $ALREADY_UPDATED ] && [ -z $HEAD_REF ]; then
2727
PARENT_IMAGE_TYPE=$(echo $PI_EXISTING_TAG | cut -d '-' -f 2-)
2828
elif [ -n $ALREADY_UPDATED ] && [ -z $HEAD_REF ]; then
@@ -38,5 +38,5 @@ grep "${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}" $DOCKERFILE | while read -r line
3838
PI_NEW_IMAGE="${DOCKER_REGISTRY}/${PARENT_IMAGE_NAME}:${RELEASE_TAG}-${PARENT_IMAGE_TYPE}"
3939

4040
sed "s|${PI_EXISTING_IMAGE}|${PI_NEW_IMAGE}|g" ${DOCKERFILE} > ${DOCKERFILE}.tmp && mv ${DOCKERFILE}.tmp ${DOCKERFILE}
41-
echo "::notice::Dockerfile updated with new image: ${PI_NEW_IMAGE}"
41+
echo "::notice::${DOCKERFILE} updated with new image: ${PI_NEW_IMAGE}"
4242
done

0 commit comments

Comments
 (0)