Skip to content

Commit 8157d69

Browse files
authored
Switch dev and linter images to use ghcr (#1680)
Summary: Moves images to push to ghcr instead of gcr. Type of change: /kind cleanup Test Plan: Ran the script to update the images. Signed-off-by: Vihang Mehta <vihang@pixielabs.ai>
1 parent df0c676 commit 8157d69

File tree

4 files changed

+6
-53
lines changed

4 files changed

+6
-53
lines changed

docker.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DOCKER_IMAGE_TAG=202308141857
2-
LINTER_IMAGE_DIGEST=ac78d64a06b7174e013f81b0fa5682eb4d580ea61dae5a67ac8b3d34863f115e
3-
DEV_IMAGE_DIGEST=0408c793b8954ca96e6712b574993845bcabfc2d6c28fd07ea409929da95cb0e
4-
DEV_IMAGE_WITH_EXTRAS_DIGEST=13c1b60494e08f7f8380d601646e7884c58e905901a29cc0a201d7b664a69079
1+
DOCKER_IMAGE_TAG=202308171823
2+
LINTER_IMAGE_DIGEST=7951055b1a6cfabc9746123c5053499300156458c8be8e743610350c4cb40ee7
3+
DEV_IMAGE_DIGEST=9d0f8e14da751b022311d2107b46be7c4d0a97405f3523b0ce1bc15aede37774
4+
DEV_IMAGE_WITH_EXTRAS_DIGEST=d80a9d02e2b6f01114f128a7116d99e13bbceb688a8e2e6e36f18f5ed84440a7

tools/chef/Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ LATEST_BASE_IMAGE := $(shell cat $(BASE_IMAGE_VERSION_FILE))
2929
DEV_IMAGE_VERSION := $(shell date "+%Y%m%d%H%M")
3030

3131
## The repository where the images are stored.
32-
REPOSITORY := gcr.io/pixie-oss/pixie-dev-public
32+
REPOSITORY := ghcr.io/pixie-io
3333

3434
LINTER_IMAGE_DIGEST := $$($(DOCKER) inspect --format='{{index .RepoDigests 0}}' \
3535
$(REPOSITORY)/linter_image:$(DEV_IMAGE_VERSION) | \
@@ -49,7 +49,6 @@ build_and_push_base_image:
4949
-var "generated_image_tag=$(BASE_IMAGE_VERSION)" \
5050
packer_docker_base.json
5151
echo $(BASE_IMAGE_VERSION) > $(BASE_IMAGE_VERSION_FILE)
52-
$(MAKE) sync_images
5352

5453
.PHONY: build_and_push_dev_images
5554
build_and_push_dev_images:
@@ -75,8 +74,3 @@ build_and_push_dev_images:
7574
echo "LINTER_IMAGE_DIGEST=$(LINTER_IMAGE_DIGEST)" >> $(DOCKER_PROPERTIES_FILE)
7675
echo "DEV_IMAGE_DIGEST=$(DEV_IMAGE_DIGEST)" >> $(DOCKER_PROPERTIES_FILE)
7776
echo "DEV_IMAGE_WITH_EXTRAS_DIGEST=$(DEV_IMAGE_WITH_EXTRAS_DIGEST)" >> $(DOCKER_PROPERTIES_FILE)
78-
$(MAKE) sync_images
79-
80-
.PHONY: sync_images
81-
sync_images:
82-
$(REGSYNC) once --config image_sync.yaml

tools/chef/base_image_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
202305312341
1+
202308171745

tools/chef/image_sync.yaml

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)