Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgauldie
dgauldie committed Dec 5, 2023
1 parent 7f184ac commit ec4e70d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
with:
files: |
./docker/docker-bake.hcl
targets: funman-api
targets: funman-api-multiplatform
push: true
sbom: false
provenance: false
Expand Down
44 changes: 22 additions & 22 deletions docker/docker-bake.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,51 +68,51 @@ target "funman-ibex" {
IBEX_BRANCH = "${IBEX_BRANCH}"
}
dockerfile = "Dockerfile"
tags = tag("funman-ibex", "", "")
tags = tag("funman-ibex", "", "${IBEX_BRANCH}")
}

target "funman-dreal4" {
context = "./docker/dreal4"
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-ibex:${VERSION}" = "target:funman-ibex"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-ibex:${VERSION}-${IBEX_BRANCH}" = "target:funman-ibex"
}
args = {
SIFT_REGISTRY_ROOT = compose_registry("${DOCKER_REGISTRY}","${DOCKER_ORG}")
IBEX_TAG = "${VERSION}"
IBEX_TAG = "${VERSION}-${IBEX_BRANCH}"
TARGETOS = "${TARGET_OS}"
TARGETARCH = "${TARGET_ARCH}"
BAZEL_VERSION = "${BAZEL_VERSION}"
DREAL_REPO_URL = "${DREAL_REPO_URL}"
DREAL_COMMIT_TAG = "${DREAL_COMMIT_TAG}"
}
dockerfile = "Dockerfile.dreal4"
tags = tag("funman-dreal4", "", "")
tags = tag("funman-dreal4", "", "${DREAL_COMMIT_TAG}")
}

target "funman-base" {
context = "./docker/base"
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-dreal4:${VERSION}" = "target:funman-dreal4"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-dreal4:${VERSION}-${DREAL_COMMIT_TAG}" = "target:funman-dreal4"
}
args = {
SIFT_REGISTRY_ROOT = "${DOCKER_REGISTRY}/${DOCKER_ORG}/"
DREAL_TAG = "${VERSION}"
DREAL_TAG = "${VERSION}-${DREAL_COMMIT_TAG}"
TARGETOS = "${TARGET_OS}"
TARGETARCH = "${TARGET_ARCH}"
AUTOMATES_COMMIT_TAG = "${AUTOMATES_COMMIT_TAG}"
}
dockerfile = "Dockerfile"
tags = tag("funman-base", "", "")
tags = tag("funman-base", "", "${AUTOMATES_COMMIT_TAG}")
}

target "funman-pypi" {
context = "./docker/pypi"
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-base:${VERSION}" = "target:funman-base"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-base:${VERSION}-${AUTOMATES_COMMIT_TAG}" = "target:funman-base"
}
args = {
SIFT_REGISTRY_ROOT = "${DOCKER_REGISTRY}/${DOCKER_ORG}/"
FROM_TAG = "${VERSION}"
FROM_TAG = "${VERSION}-${AUTOMATES_COMMIT_TAG}"
TARGETOS = "${TARGET_OS}"
TARGETARCH = "${TARGET_ARCH}"
}
Expand All @@ -123,27 +123,27 @@ target "funman-pypi" {
target "funman-git" {
context = "."
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-base:${VERSION}" = "target:funman-base"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-base:${VERSION}-${AUTOMATES_COMMIT_TAG}" = "target:funman-base"
}
args = {
SIFT_REGISTRY_ROOT = "${DOCKER_REGISTRY}/${DOCKER_ORG}/"
FROM_TAG = "${VERSION}"
FROM_TAG = "${VERSION}-${AUTOMATES_COMMIT_TAG}"
TARGETOS = "${TARGET_OS}"
TARGETARCH = "${TARGET_ARCH}"
}
dockerfile = "./docker/git/Dockerfile"
tags = tag("funman-git", "", "")
tags = tag("funman-git", "", "git")
}

target "funman-api" {
context = "./docker/api"
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-git:${VERSION}" = "target:funman-git"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-git:${VERSION}-git" = "target:funman-git"
}
args = {
SIFT_REGISTRY_ROOT = "${DOCKER_REGISTRY}/${DOCKER_ORG}/"
FROM_IMAGE = "funman-git"
FROM_TAG = "${VERSION}"
FROM_TAG = "${VERSION}-git"
TARGETOS = "${TARGET_OS}"
TARGETARCH = "${TARGET_ARCH}"
}
Expand All @@ -154,11 +154,11 @@ target "funman-api" {
target "funman-dev" {
context = "."
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-dreal4:${VERSION}" = "target:funman-dreal4"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-dreal4:${VERSION}-${DREAL_COMMIT_TAG}" = "target:funman-dreal4"
}
args = {
SIFT_REGISTRY_ROOT = "${DOCKER_REGISTRY}/${DOCKER_ORG}/"
DREAL_TAG = "${VERSION}"
DREAL_TAG = "${VERSION}-${DREAL_COMMIT_TAG}"
TARGETOS = "${TARGET_OS}"
TARGETARCH = "${TARGET_ARCH}"
UNAME = "${FUNMAN_DEV_UNAME}"
Expand All @@ -176,12 +176,12 @@ target "funman-dev-as-root" {
}
args = {
SIFT_REGISTRY_ROOT = "${DOCKER_REGISTRY}/${DOCKER_ORG}/"
DREAL_TAG = "${VERSION}"
DREAL_TAG = "${VERSION}-${DREAL_COMMIT_TAG}"
TARGETOS = "${TARGET_OS}"
TARGETARCH = "${TARGET_ARCH}"
}
dockerfile = "./docker/dev/root/Dockerfile.root"
tags = tag("funman-dev", "", "")
tags = tag("funman-dev", "", "root")
}

# ----------------------------------------------------------------------------------------------------------------------
Expand All @@ -195,24 +195,24 @@ target "funman-ibex-multiplatform" {
target "funman-dreal4-multiplatform" {
inherits = ["_platforms", "funman-dreal4"]
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-ibex:${VERSION}" = "target:funman-ibex-multiplatform"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-ibex:${VERSION}-${IBEX_BRANCH}" = "target:funman-ibex-multiplatform"
}
}
target "funman-base-multiplatform" {
inherits = ["_platforms", "funman-base"]
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-dreal4:${VERSION}" = "target:funman-dreal4-multiplatform"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-dreal4:${VERSION}-${DREAL_COMMIT_TAG}" = "target:funman-dreal4-multiplatform"
}
}
target "funman-git-multiplatform" {
inherits = ["_platforms", "funman-git"]
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-base:${VERSION}" = "target:funman-base-multiplatform"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-base:${VERSION}-${AUTOMATES_COMMIT_TAG}" = "target:funman-base-multiplatform"
}
}
target "funman-api-multiplatform" {
inherits = ["_platforms", "funman-api"]
contexts = {
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-git:${VERSION}" = "target:funman-git-multiplatform"
"${DOCKER_REGISTRY}/${DOCKER_ORG}/funman-git:${VERSION}-git" = "target:funman-git-multiplatform"
}
}

0 comments on commit ec4e70d

Please sign in to comment.