fix local naming and base image
This commit is contained in:
parent
6d6746a915
commit
218682886d
2
Makefile
2
Makefile
|
|
@ -13,7 +13,7 @@ LDFLAGS ?= -X=main.version=$(VERSION)
|
|||
DOCKERDIR = docker
|
||||
|
||||
BASE_IMAGE ?= alpine:latest
|
||||
IMAGE ?= ghcr.io/zalando/$(BINARY)
|
||||
IMAGE ?= $(BINARY)
|
||||
TAG ?= $(VERSION)
|
||||
GITHEAD = $(shell git rev-parse --short HEAD)
|
||||
GITURL = $(shell git config --get remote.origin.url)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.PHONY: clean test appjs docker push mock
|
||||
|
||||
IMAGE ?= ghcr.io/zalando/postgres-operator-ui
|
||||
BASE_IMAGE ?= alpine
|
||||
IMAGE ?= postgres-operator-ui
|
||||
BASE_IMAGE ?= python:3.11-slim
|
||||
VERSION ?= $(shell git describe --tags --always --dirty)
|
||||
TAG ?= $(VERSION)
|
||||
GITHEAD = $(shell git rev-parse --short HEAD)
|
||||
|
|
@ -31,7 +31,7 @@ docker: appjs
|
|||
echo "Version ${VERSION}"
|
||||
echo "CDP tag ${CDP_TAG}"
|
||||
echo "git describe $(shell git describe --tags --always --dirty)"
|
||||
docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)" -f Dockerfile --build-arg BASE_IMAGE="${BASE_IMAGE}" --build-arg .
|
||||
docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)" -f Dockerfile --build-arg BASE_IMAGE="${BASE_IMAGE}" .
|
||||
|
||||
docker-push: appjs
|
||||
echo "Tag ${TAG}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue