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

Jump to bottom

[COST-5214] Remove directive to make the build work with docker #5196

Merged
merged 4 commits into from
Jul 1, 2024
Merged

[COST-5214] Remove directive to make the build work with docker #5196

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b0824e
Remove directive to make the build work with docker
samdoran Jun 28, 2024
f1adbea
Apply suggestion.
myersCody Jul 1, 2024
966985c
Add sed
myersCody Jul 1, 2024
1953fae
Use tab for both
myersCody Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile
View file
Open in desktop
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
myersCody marked this conversation as resolved.
Show resolved Hide resolved


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