Skip to content

Commit

Permalink
Merge pull request #306 from depot/ecr-public
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobwgillespie authored Jan 10, 2025
2 parents a6c4b0c + 11dbd32 commit 1c76187
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bin/depot:

.PHONY: image
image:
docker --context=default buildx build --builder default -t ghcr.io/depot/cli:0.0.0-dev --load .
docker --context=default buildx build --builder default -t public.ecr.aws/depot/cli:0.0.0-dev --load .

.PHONY: npm
npm:
Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func runConfigureBuildx(ctx context.Context, dockerCli command.Cli, project, tok

version := build.Version

image := "ghcr.io/depot/cli:" + version
image := "public.ecr.aws/depot/cli:" + version

nodeName := "depot_" + projectName
ng := &store.NodeGroup{
Expand Down Expand Up @@ -372,14 +372,14 @@ func UpdateDrivers(ctx context.Context, dockerCli command.Cli) error {
var save bool
for i, node := range nodeGroup.Nodes {
image := node.DriverOpts["image"]
if strings.HasPrefix(image, "ghcr.io/depot/cli") {
nodeGroup.Nodes[i].DriverOpts["image"] = "ghcr.io/depot/cli:" + version
if strings.HasPrefix(image, "ghcr.io/depot/cli") || strings.HasPrefix(image, "public.ecr.aws/depot/cli") {
nodeGroup.Nodes[i].DriverOpts["image"] = "public.ecr.aws/depot/cli:" + version
save = true

projectName := node.DriverOpts["env.DEPOT_PROJECT_ID"]
token := node.DriverOpts["env.DEPOT_TOKEN"]
platform := node.DriverOpts["env.DEPOT_PLATFORM"]
_ = Bootstrap(ctx, dockerCli, "ghcr.io/depot/cli:"+version, projectName, token, platform)
_ = Bootstrap(ctx, dockerCli, "public.ecr.aws/depot/cli:"+version, projectName, token, platform)
}

}
Expand Down
2 changes: 1 addition & 1 deletion pkg/load/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/docker/go-connections/nat"
)

var proxyImage = "ghcr.io/depot/cli:" + build.Version //
var proxyImage = "public.ecr.aws/depot/cli:" + build.Version //

type ProxyContainer struct {
ID string
Expand Down

0 comments on commit 1c76187

Please sign in to comment.