Skip to content

Commit

Permalink
Remove directive to make the build work with docker
Browse files Browse the repository at this point in the history
There is a podman bug that needs to be resolved which required adding
this out of stage directive. Unfortunately that broke the image build
for docker, which we use heavily.

This is a terrible hack until the bug in podman is resolved.

containers/podman#23046
  • Loading branch information
samdoran committed Jun 28, 2024
1 parent a42cf32 commit 3b0824e
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,14 @@ _koku-wait:
done

docker-build:
# HACK: Remove the ARG TARGETARCH directive to make the build work with docker
# until https://github.com/containers/podman/issues/23046 is resolved.
@tail -n +3 Dockerfile > Dockerfile.temp
@mv Dockerfile.temp Dockerfile
$(DOCKER_COMPOSE) build koku-base
@echo "ARG TARGETARCH\n" | cat - Dockerfile > Dockerfile.temp
@mv Dockerfile.temp Dockerfile


docker-up: docker-build
$(DOCKER_COMPOSE) up -d --scale koku-worker=$(scale)
Expand Down

0 comments on commit 3b0824e

Please sign in to comment.