Skip to content

Commit

Permalink
Stop using my forks of various images. (#475)
Browse files Browse the repository at this point in the history
The main reason for these was estargz optimization, but also multi-arch.

multi-arch has landed upstream, so this mostly drops the estargz bits, which we dropped CI of in the previous change.
  • Loading branch information
mattmoor authored Sep 7, 2021
1 parent c306f7f commit eebe281
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 163 deletions.
153 changes: 0 additions & 153 deletions .github/workflows/periodic-base.yaml

This file was deleted.

7 changes: 3 additions & 4 deletions .ko.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# Use :nonroot base image for all containers
defaultBaseImage: ghcr.io/mattmoor/distroless/static:nonroot
defaultBaseImage: gcr.io/distroless/static:nonroot
baseImageOverrides:
# These are multi-arch builds of: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/build-base:latest
github.com/tektoncd/pipeline/cmd/git-init: ghcr.io/mattmoor/tekton-base:latest
github.com/tektoncd/pipeline/cmd/git-init: gcr.io/tekton-nightly/github.com/tektoncd/pipeline/git-init-build-base:latest

# May need root to run files.
github.com/mattmoor/mink/cmd/kontext-expander: ghcr.io/mattmoor/distroless/static:latest
github.com/mattmoor/mink/cmd/kontext-expander: gcr.io/distroless/static:latest

# Needs go to build stuff!
github.com/google/ko/cmd/ko: golang:latest
2 changes: 1 addition & 1 deletion config/core/deployments/controlplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
"-nop-image", "ko://github.com/tektoncd/pipeline/cmd/nop",
"-imagedigest-exporter-image", "ko://github.com/tektoncd/pipeline/cmd/imagedigestexporter",
"-pr-image", "ko://github.com/tektoncd/pipeline/cmd/pullrequest-init",
"-shell-image", "ghcr.io/mattmoor/distroless/base:debug",
"-shell-image", "gcr.io/distroless/base:debug",

# Not multi-arch.
"-gsutil-image", "google/cloud-sdk",
Expand Down
2 changes: 1 addition & 1 deletion config/core/deployments/dataplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ spec:
- --log-level info
command:
- /usr/local/bin/envoy
image: ghcr.io/mattmoor/envoy:v1.16-latest
image: docker.io/envoyproxy/envoy:v1.16-latest
ports:
- name: http2-external
containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:

steps:
- name: prepare
image: ghcr.io/mattmoor/distroless/base:debug
image: gcr.io/distroless/base:debug
workingDir: /workspace
command: ["sh"]
args:
Expand Down
2 changes: 1 addition & 1 deletion examples/kaniko.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
workingDir: /workspace

- name: build-and-push
image: ghcr.io/mattmoor/kaniko:latest
image: gcr.io/kaniko-project/executor:v1.6.0
workingDir: /workspace
env:
- name: DOCKER_CONFIG
Expand Down
2 changes: 1 addition & 1 deletion pkg/builds/buildpacks/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
steps:
- name: prepare
image: ghcr.io/mattmoor/distroless/base:debug
image: gcr.io/distroless/base:debug
workingDir: /workspace
command: ["sh"]
args:
Expand Down
2 changes: 1 addition & 1 deletion pkg/builds/dockerfile/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
workingDir: /workspace
- name: build-and-push
image: ghcr.io/mattmoor/kaniko:latest
image: gcr.io/kaniko-project/executor:v1.6.0
workingDir: /workspace
env:
- name: DOCKER_CONFIG
Expand Down

0 comments on commit eebe281

Please sign in to comment.