fix docker image not updated

This commit is contained in:
sebthom 2023-05-19 13:15:09 +02:00
parent aa822e12ee
commit 4c9806d71c
2 changed files with 10 additions and 15 deletions

View File

@ -70,29 +70,24 @@ jobs:
- name: Install dos2unix
run: sudo apt-get install --no-install-recommends -y dos2unix
- name: Login to docker.io
if: ${{ github.ref_name == 'main' && github.event_name != 'pull_request' && !env.ACT }} # https://github.com/nektos/act#skipping-steps
run: |
docker login docker.io -u "${{ secrets.DOCKER_HUB_USERNAME }}" -p "${{ secrets.DOCKER_HUB_TOKEN }}"
- name: Build ${{ env.DOCKER_IMAGE_REPO }}:${{ env.DOCKER_IMAGE_TAG }}
env:
DOCKER_IMAGE_TAG: ${{ matrix.DOCKER_IMAGE_TAG }}
DOCKER_FILE: ${{ matrix.DOCKER_FILE }}
DOCKER_PUSH: ${{ github.ref_name == 'main' && github.event_name != 'pull_request' && !env.ACT }}
TRIVY_GITHUB_TOKEN: ${{ github.token }}
run: bash build-image.sh
- name: Publish Docker image to docker.io registry
if: ${{ github.ref_name == 'main' && github.event_name != 'pull_request' && !env.ACT }} # https://github.com/nektos/act#skipping-steps
uses: truemark/skopeo-copy-action@v1 # https://github.com/truemark/skopeo-copy-action
# alternative for skopeo is https://github.com/regclient/regclient via iarekylew00t/regctl-installer
with:
src-image: "docker://${{ env.DOCKER_IMAGE_REPO }}:${{ matrix.DOCKER_IMAGE_TAG }}"
dest-image: "docker://docker.io/${{ env.DOCKER_IMAGE_REPO }}:${{ matrix.DOCKER_IMAGE_TAG }}"
dest-username: "${{ secrets.DOCKER_HUB_USERNAME }}"
dest-password: "${{ secrets.DOCKER_HUB_TOKEN }}"
multi-arch: "all"
- name: Publish Docker image to GH registry
if: ${{ github.ref_name == 'main' && github.event_name != 'pull_request' && !env.ACT }} # https://github.com/nektos/act#skipping-steps
uses: truemark/skopeo-copy-action@v1 # https://github.com/truemark/skopeo-copy-action
with:
src-image: "docker://${{ env.DOCKER_IMAGE_REPO }}:${{ matrix.DOCKER_IMAGE_TAG }}"
src-image: "docker://docker.io/${{ env.DOCKER_IMAGE_REPO }}:${{ matrix.DOCKER_IMAGE_TAG }}"
dest-image: "docker://ghcr.io/${{ env.DOCKER_IMAGE_REPO }}:${{ matrix.DOCKER_IMAGE_TAG }}"
dest-username: "${{ github.actor }}"
dest-password: "${{ github.token }}"

View File

@ -21,7 +21,7 @@ image_name=$image_repo:${DOCKER_IMAGE_TAG:-latest}
#################################################
# build the image
#################################################
echo "Building docker image [$image_name]..."
log INFO "Building docker image [$image_name]..."
if [[ $OSTYPE == "cygwin" || $OSTYPE == "msys" ]]; then
project_root=$(cygpath -w "$project_root")
fi
@ -44,7 +44,7 @@ docker buildx build "$project_root" \
--build-arg GIT_REPO_URL="$(git config --get remote.origin.url)" \
--platform linux/amd64,linux/arm64,linux/arm/v7 \
-t $image_name \
$(if [[ "${DOCKER_PUSH:-0}" == "1" ]]; then echo -n "--push"; fi) \
$(if [[ "${DOCKER_PUSH:-0}" == "true" ]]; then echo -n "--push"; fi) \
"$@"
docker buildx stop
docker image pull $image_name
@ -54,7 +54,7 @@ docker image pull $image_name
# test image
#################################################
echo
echo "Testing docker image [$image_name]..."
log INFO "Testing docker image [$image_name]..."
docker run --rm $image_name act_runner --version
echo