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

Fix issue with make command #723

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Fix issue with make command #723

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: 2 additions & 0 deletions clients/ui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
FROM ${NODE_BASE_IMAGE} AS ui-builder

ARG UI_SOURCE_CODE
ARG DEPLOYMENT_MODE
ARG MOCK_AUTH

WORKDIR /usr/src/app

Expand Down
6 changes: 3 additions & 3 deletions clients/ui/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ docker-build:

.PHONY: docker-build-standalone
docker-build-standalone:
MOCK_AUTH=true DEPLOYMENT_MODE=standalone $(CONTAINER_TOOL) build -t ${IMG_UI_STANDALONE} .
$(CONTAINER_TOOL) build --build-arg MOCK_AUTH=true --build-arg DEPLOYMENT_MODE=standalone -t ${IMG_UI_STANDALONE} .

.PHONY: docker-buildx
docker-buildx:
docker buildx build --platform ${PLATFORM} -t ${IMG_UI} --push .

.PHONY: docker-buildx-standalone
docker-buildx-standalone:
MOCK_AUTH=true DEPLOYMENT_MODE=standalone docker buildx build --platform ${PLATFORM} -t ${IMG_UI_STANDALONE} --push .
docker buildx build --build-arg MOCK_AUTH=true --build-arg DEPLOYMENT_MODE=standalone --platform ${PLATFORM} -t ${IMG_UI_STANDALONE} --push .

############ Push ############

Expand All @@ -83,7 +83,7 @@ frontend-build:

.PHONY: frontend-build-standalone
frontend-build-standalone:
MOCK_AUTH=true DEPLOYMENT_MODE=standalone cd frontend && npm run build:prod
cd frontend && MOCK_AUTH=true DEPLOYMENT_MODE=standalone npm run build:prod

.PHONY: bff-build
bff-build:
Expand Down
2 changes: 1 addition & 1 deletion clients/ui/scripts/deploy_kind_cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ command -v kubectl >/dev/null 2>&1 || { echo >&2 "kubectl is required but it's n
command -v kind >/dev/null 2>&1 || { echo >&2 "kind is required but it's not installed. Aborting."; exit 1; }

# Check if the script has rights to push an image into the registry
if ! docker push "${IMG_UI_STANDALONE}" --dry-run >/dev/null 2>&1; then
if ! docker push "${IMG_UI_STANDALONE}" >/dev/null 2>&1; then
echo -e "\033[31mError: No rights to push the image to the registry ${IMG_UI_STANDALONE}, you can change the image in the env variable IMG_UI_STANDALONE\033[0m"
exit 1
fi
Expand Down
Loading