Skip to content

Commit

Permalink
Update CI to use newly built images for testing
Browse files Browse the repository at this point in the history
Signed-off-by: Dom Delnano <ddelnano@gmail.com>
  • Loading branch information
ddelnano committed Apr 30, 2024
1 parent 24f4898 commit db69f14
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- run: echo "Authorized"
get-dev-image:
needs: [authorize, env-protect-setup]
uses: ./.github/workflows/get_image.yaml
uses: ./.github/workflows/get_image.yaml@428a15e22fea1dfae05ceb61516a8642eded135d
with:
image-base-name: "dev_image_with_extras"
ref: ${{ needs.env-protect-setup.outputs.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/get_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
ref: ${{ inputs.ref }}
- id: get-version
run: >-
IMAGE_NAME="ghcr.io/pixie-io/${{ inputs.image-base-name }}";
IMAGE_NAME="docker.io/ddelnano/${{ inputs.image-base-name }}";
IMAGE_TAG="$(grep DOCKER_IMAGE_TAG docker.properties | cut -d'=' -f2)";
echo "image=${IMAGE_NAME}:${IMAGE_TAG}" >> $GITHUB_OUTPUT
2 changes: 1 addition & 1 deletion tools/chef/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ LATEST_BASE_IMAGE := $(shell cat $(BASE_IMAGE_VERSION_FILE))
DEV_IMAGE_VERSION := $(shell date "+%Y%m%d%H%M")

## The repository where the images are stored.
REPOSITORY := ghcr.io/pixie-io
REPOSITORY := docker.io/ddelnano

LINTER_IMAGE_DIGEST := $$($(DOCKER) inspect --format='{{index .RepoDigests 0}}' \
$(REPOSITORY)/linter_image:$(DEV_IMAGE_VERSION) | \
Expand Down
2 changes: 1 addition & 1 deletion tools/chef/base_image_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
202308171745
202404262345

0 comments on commit db69f14

Please sign in to comment.