Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(docker): remove cache in bakefile #4254

Merged
merged 1 commit into from
May 15, 2023
Merged

ci(docker): remove cache in bakefile #4254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ jobs:
command: |
# bonsai edge
if [ "$CIRCLE_BRANCH" == "0.13" ]; then
MAJOR_VERSION=0 MINOR_VERSION=13 PRERELEASE=edge CODENAME=bonsai BRANCH_NAME=$CIRCLE_BRANCH \
MAJOR_VERSION=0 MINOR_VERSION=13 PRERELEASE=edge CODENAME=bonsai \
docker buildx bake --push --progress=plain -f support/docker-bake.hcl all
fi

Expand Down
2 changes: 0 additions & 2 deletions support/docker-bake-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

set -x -e -o pipefail

export BRANCH_NAME=$1

# Bash test framework. Sorry :D
fail() {
echo "FAIL: $@"
Expand Down
29 changes: 0 additions & 29 deletions support/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ variable "MINOR_VERSION" {
}
variable "MAJOR_VERSION" {
}
variable "BRANCH_NAME" {
default = ""
}

// optional
variable "PATCH_VERSION" {
Expand Down Expand Up @@ -70,18 +67,6 @@ function "repository" {
result = [for t in tags : "${repository}:${t}"]
}

function "cacheFrom" {
params = [repository, flavor]
result = ["type=registry,ref=${repository}:_buildcache-${CODENAME}-${flavor}"]
}

function "cacheTo" {
params = [repository, flavor]
result = "${BRANCH_NAME == "0.13" || BRANCH_NAME == "main" ? [
"type=registry,ref=${repository}:_buildcache-${CODENAME}-${flavor},mode=max"
] : []}"
}

##
## Groups
##
Expand Down Expand Up @@ -111,8 +96,6 @@ target "buster" {
platforms = ["linux/amd64"]
context = "dist/linux-amd64"
tags = repository("gardendev/garden", tags("buster"))
cache-from = cacheFrom("gardendev/garden", "buster")
cache-to = cacheTo("gardendev/garden", "buster")
}

target "alpine-base" {
Expand All @@ -121,46 +104,34 @@ target "alpine-base" {
platforms = ["linux/amd64"]
context = "dist/alpine-amd64"
tags = repository("gardendev/garden", withLatest(tags("alpine")))
cache-from = cacheFrom("gardendev/garden", "alpine")
cache-to = cacheTo("gardendev/garden", "alpine")
}

target "alpine-aws" {
inherits = ["alpine-base"]
target = "garden-aws"
tags = repository("gardendev/garden-aws", withLatest(tags("alpine")))
cache-from = cacheFrom("gardendev/garden-aws", "alpine")
cache-to = cacheTo("gardendev/garden-aws", "alpine")
}

target "alpine-azure" {
inherits = ["alpine-base"]
target = "garden-azure"
tags = repository("gardendev/garden-azure", withLatest(tags("alpine")))
cache-from = cacheFrom("gardendev/garden-azure", "alpine")
cache-to = cacheTo("gardendev/garden-azure", "alpine")
}

target "alpine-gcloud" {
inherits = ["alpine-base"]
target = "garden-gcloud"
tags = repository("gardendev/garden-gcloud", withLatest(tags("alpine")))
cache-from = cacheFrom("gardendev/garden-gcloud", "alpine")
cache-to = cacheTo("gardendev/garden-gcloud", "alpine")
}

target "alpine-aws-gcloud" {
inherits = ["alpine-base"]
target = "garden-aws-gcloud"
tags = repository("gardendev/garden-aws-gcloud", withLatest(tags("alpine")))
cache-from = cacheFrom("gardendev/garden-aws-gcloud", "alpine")
cache-to = cacheTo("gardendev/garden-aws-gcloud", "alpine")
}

target "alpine-aws-gcloud-azure" {
inherits = ["alpine-base"]
target = "garden-aws-gcloud-azure"
tags = repository("gardendev/garden-aws-gcloud-azure", withLatest(tags("alpine")))
cache-from = cacheFrom("gardendev/garden-aws-gcloud-azure", "alpine")
cache-to = cacheTo("gardendev/garden-aws-gcloud-azure", "alpine")
}