Skip to content

Commit

Permalink
update the github build script and push path
Browse files Browse the repository at this point in the history
  • Loading branch information
oOhyeahh committed Oct 25, 2024
1 parent f166544 commit 26f8430
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Docker Publish Release

on:
release:
types: [published, edited]
push:
branches:
- "*"

# Can be triggered manually
workflow_dispatch:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ name: Docker
on:
push:
branches:
- "master"
- "[0-9].[0-9]"
pull_request:
branches:
- "master"
- "*"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
Expand Down
10 changes: 3 additions & 7 deletions scripts/build_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def is_latest_release(release: str) -> bool:


def make_docker_tag(l: list[str]) -> str:
return f"{REPO}:" + "-".join([o for o in l if o])
return f"lemonyeah:" + "-".join([o for o in l if o])


def get_docker_tags(
Expand Down Expand Up @@ -178,7 +178,7 @@ def get_docker_command(
)
docker_tags = ("\\\n" + 8 * " ").join([f"-t {s} " for s in tags])

docker_args = "--load" if not is_authenticated else "--push"
docker_args = "--load"
target_argument = f"--target {build_target}" if build_target else ""

cache_ref = f"{CACHE_REPO}:{py_ver}"
Expand All @@ -189,9 +189,6 @@ def get_docker_command(
platform_arg = "--platform " + ",".join(build_platforms)

cache_from_arg = f"--cache-from=type=registry,ref={cache_ref}"
cache_to_arg = (
f"--cache-to=type=registry,mode=max,ref={cache_ref}" if is_authenticated else ""
)
build_arg = f"--build-arg PY_VER={py_ver}" if py_ver else ""
actor = os.getenv("GITHUB_ACTOR")

Expand All @@ -201,7 +198,6 @@ def get_docker_command(
{docker_args} \\
{docker_tags} \\
{cache_from_arg} \\
{cache_to_arg} \\
{build_arg} \\
{platform_arg} \\
{target_argument} \\
Expand Down Expand Up @@ -278,13 +274,13 @@ def main(
f"""\
docker logout
docker login --username "{os.getenv("DOCKERHUB_USER")}" --password "{os.getenv("DOCKERHUB_TOKEN")}"
DOCKER_ARGS="--push"
"""
)
script = script + docker_build_command
if verbose:
run_cmd("cat Dockerfile")
stdout = run_cmd(script)
run_cmd("docker image push --all-tags lemonyeah:superset")
else:
print("Dry Run - Docker Build Command:")
print(docker_build_command)
Expand Down

0 comments on commit 26f8430

Please sign in to comment.