mirror of
https://github.com/outbackdingo/cozystack.git
synced 2026-01-27 18:18:41 +00:00
Fix dashboard Makefile
This commit is contained in:
@@ -8,7 +8,7 @@ TAG := v0.2.0
|
||||
include ../../hack/package-system.mk
|
||||
|
||||
update: update-chart update-dockerfiles
|
||||
image: image-$(NAME) image-kubeapps-apis
|
||||
image: image-dashboard image-kubeapps-apis
|
||||
|
||||
update-chart:
|
||||
rm -rf charts
|
||||
@@ -22,21 +22,21 @@ update-dockerfiles:
|
||||
tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/vmware-tanzu/kubeapps | awk -F'[/^]' 'END{print $$3}') && \
|
||||
wget https://github.com/vmware-tanzu/kubeapps/raw/$${tag}/cmd/kubeapps-apis/Dockerfile -O images/kubeapps-apis/Dockerfile && \
|
||||
patch images/kubeapps-apis/Dockerfile < images/kubeapps-apis/dockerfile.diff && \
|
||||
node_image=$$(wget -O- https://github.com/vmware-tanzu/kubeapps/raw/main/$(NAME)/Dockerfile | awk '/FROM bitnami\/node/ {print $$2}') && \
|
||||
sed -i "s|FROM .* AS build|FROM $${node_image} AS build|" images/$(NAME)/Dockerfile && \
|
||||
node_image=$$(wget -O- https://github.com/vmware-tanzu/kubeapps/raw/main/dashboard/Dockerfile | awk '/FROM bitnami\/node/ {print $$2}') && \
|
||||
sed -i "s|FROM .* AS build|FROM $${node_image} AS build|" images/dashboard/Dockerfile && \
|
||||
version=$$(echo "$$tag" | sed 's/^v//') && \
|
||||
sed -i "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/$(NAME)/Dockerfile
|
||||
sed -i "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/dashboard/Dockerfile
|
||||
|
||||
image-dashboard:
|
||||
docker buildx build images/$(NAME) \
|
||||
docker buildx build images/dashboard \
|
||||
--provenance false \
|
||||
--tag $(REPOSITORY)/$(NAME):$(TAG) \
|
||||
--cache-from type=registry,ref=$(REPOSITORY)/$(NAME):$(TAG) \
|
||||
--tag $(REPOSITORY)/dashboard:$(TAG) \
|
||||
--cache-from type=registry,ref=$(REPOSITORY)/dashboard:$(TAG) \
|
||||
--cache-to type=inline \
|
||||
--metadata-file images/$(NAME).json \
|
||||
--metadata-file images/dashboard.json \
|
||||
--push=$(PUSH) \
|
||||
--load=$(LOAD)
|
||||
echo "$(REPOSITORY)/$(NAME):$(TAG)" > images/$(NAME).tag
|
||||
echo "$(REPOSITORY)/dashboard:$(TAG)" > images/dashboard.tag
|
||||
|
||||
image-kubeapps-apis:
|
||||
docker buildx build images/kubeapps-apis \
|
||||
|
||||
Reference in New Issue
Block a user