ZeroDownTime/CloudBender
3
0
Fork 0
Code Issues 1 Pull Requests 4 Packages Projects Releases Wiki Activity

ci: Improve make docker

Browse Source
This commit is contained in:
Stefan Reimer 2022-02-08 13:49:08 +01:00
parent f2d26dcebf
commit fd1719a402
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,6 +1,6 @@
ARG RUNTIME_VERSION="3.9" ARG RUNTIME_VERSION="3.7"
ARG DISTRO_VERSION="3.14" ARG DISTRO_VERSION="3.15"
ARG PULUMI_VERSION=latest ARG PULUMI_VERSION="3.24.1"
FROM python:${RUNTIME_VERSION}-alpine${DISTRO_VERSION} AS builder FROM python:${RUNTIME_VERSION}-alpine${DISTRO_VERSION} AS builder
ARG PULUMI_VERSION ARG PULUMI_VERSION

30
Makefile
View File

@ -1,9 +1,16 @@
VERSION ?= $(shell grep '__version__' cloudbender/__init__.py | cut -d' ' -f3 | cut -d'-' -f1 | sed -e 's/"//g')
PACKAGE_FILE := dist/cloudbender-$(VERSION).py3-none-any.whl
REGISTRY := public.ecr.aws/zero-downtime REGISTRY := public.ecr.aws/zero-downtime
REPOSITORY := cloudbender REPOSITORY := cloudbender
TAG := $(REPOSITORY):v$(VERSION) REGION := us-east-1
# Parse version from latest git semver tag
GTAG=$(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
TAG ?= $(shell echo $(GTAG) | awk -F '-' '{ print $$1 "-" $$2 }' | sed -e 's/-$$//')
ifeq ($(TRIVY_REMOTE),)
TRIVY_OPTS := image
else
TRIVY_OPTS := client --remote ${TRIVY_REMOTE}
endif
.PHONY: test build test_upload upload all dev_setup docker .PHONY: test build test_upload upload all dev_setup docker
@ -18,7 +25,6 @@ test:
clean: clean:
rm -rf .cache build .coverage .eggs cloudbender.egg-info .pytest_cache dist rm -rf .cache build .coverage .eggs cloudbender.egg-info .pytest_cache dist
podman rmi -f $(TAG)
build: $(PACKAGE_FILE) build: $(PACKAGE_FILE)
@ -32,13 +38,15 @@ upload: $(PACKAGE_FILE)
twine upload --repository-url https://upload.pypi.org/legacy/ dist/cloudbender-*.whl twine upload --repository-url https://upload.pypi.org/legacy/ dist/cloudbender-*.whl
docker: docker:
podman build --rm --squash-all --build-arg version=$(VERSION) -t $(TAG) . podman build --rm --squash-all -t $(REPOSITORY):$(TAG) -t $(REPOSITORY):latest .
push: push:
aws ecr-public get-login-password --region us-east-1 | podman login --username AWS --password-stdin $(REGISTRY) aws ecr-public get-login-password --region $(REGION) | podman login --username AWS --password-stdin $(REGISTRY)
podman tag $(TAG) $(REGISTRY)/$(TAG) podman tag $(REPOSITORY):latest $(REGISTRY)/$(REPOSITORY):$(TAG) $(REGISTRY)/$(REPOSITORY):latest
podman push $(REGISTRY)/$(TAG) podman push $(REGISTRY)/$(REPOSITORY):$(TAG)
podman push $(REGISTRY)/$(REPOSITORY):latest
# Delete all untagged images
# aws ecr-public batch-delete-image --repository-name $(REPOSITORY) --region $(REGION) --image-ids $$(for image in $$(aws ecr-public describe-images --repository-name $(REPOSITORY) --region $(REGION) --output json | jq -r '.imageDetails[] | select(.imageTags | not ).imageDigest'); do echo -n "imageDigest=$$image "; done)
scan: scan:
podman system service& trivy $(TRIVY_OPTS) $(REPOSITORY):$(TAG)
sleep 3; trivy $(TAG)