Squashed '.ci/' changes from b6fea5a..cb5faca
cb5faca feat: add create-repo task to ease bootstrapping new project 49ea8c8 feat: Add support for custom EXTRA_TAGS dc2c208 fix: use absolute image URLs for some tasks bc72735 docs: add quickstart 98c8ec1 Feat: Execute tests via docker run rather than at the end of the test build process d6b2fb4 feat: improve messaging if Trivy fail is skipped git-subtree-dir: .ci git-subtree-split: cb5facae6c19643fbb08b90416c6b5917b666a46
This commit is contained in:
parent
967f6a6e36
commit
c69ea98418
16
README.md
16
README.md
@ -2,6 +2,22 @@
|
|||||||
|
|
||||||
Various toolchain bits and pieces shared between projects
|
Various toolchain bits and pieces shared between projects
|
||||||
|
|
||||||
|
# Quickstart
|
||||||
|
Create top-level Makefile
|
||||||
|
```
|
||||||
|
REGISTRY := <your-registry>
|
||||||
|
IMAGE := <image_name>
|
||||||
|
REGION := <AWS region of your registry>
|
||||||
|
|
||||||
|
include .ci/podman.mk
|
||||||
|
```
|
||||||
|
|
||||||
|
Add subtree to your project:
|
||||||
|
```
|
||||||
|
git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Jenkins
|
## Jenkins
|
||||||
Shared groovy libraries
|
Shared groovy libraries
|
||||||
|
|
||||||
|
27
podman.mk
27
podman.mk
@ -2,6 +2,8 @@
|
|||||||
GTAG=$(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
|
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/-$$//')
|
TAG ?= $(shell echo $(GTAG) | awk -F '-' '{ print $$1 "-" $$2 }' | sed -e 's/-$$//')
|
||||||
|
|
||||||
|
# EXTRA_TAGS supposed to be set at the caller, eg. $(shell echo $(TAG) | awk -F '.' '{ print $$1 "." $$2 }')
|
||||||
|
|
||||||
ifeq ($(TRIVY_REMOTE),)
|
ifeq ($(TRIVY_REMOTE),)
|
||||||
TRIVY_OPTS := image
|
TRIVY_OPTS := image
|
||||||
else
|
else
|
||||||
@ -12,25 +14,23 @@ endif
|
|||||||
|
|
||||||
all: test
|
all: test
|
||||||
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
@docker image exists $(IMAGE):$(TAG) || \
|
@docker image exists $(REGISTRY)/$(IMAGE):$(TAG) || \
|
||||||
docker build --rm -t $(IMAGE):$(TAG) --build-arg TAG=$(TAG) .
|
docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG) --build-arg TAG=$(TAG) .
|
||||||
|
|
||||||
test: build rm-test-image
|
test: build rm-test-image
|
||||||
@test -f Dockerfile.test && \
|
@test -f Dockerfile.test && \
|
||||||
docker build --rm -t $(IMAGE):$(TAG)-test --from=$(IMAGE):$(TAG) -f Dockerfile.test . || \
|
{ docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG)-test --from=$(REGISTRY)/$(IMAGE):$(TAG) -f Dockerfile.test . && \
|
||||||
|
docker run --rm --env-host -t $(REGISTRY)/$(IMAGE):$(TAG)-test; } || \
|
||||||
echo "No Dockerfile.test found, skipping test"
|
echo "No Dockerfile.test found, skipping test"
|
||||||
|
|
||||||
scan: build
|
scan: build
|
||||||
@echo "Scanning $(IMAGE):$(TAG) using Trivy"
|
@echo "Scanning $(REGISTRY)/$(IMAGE):$(TAG) using Trivy"
|
||||||
@trivy $(TRIVY_OPTS) $(IMAGE):$(TAG)
|
@trivy $(TRIVY_OPTS) $(REGISTRY)/$(IMAGE):$(TAG)
|
||||||
|
|
||||||
push: build
|
push: build
|
||||||
@aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY)
|
@aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY)
|
||||||
@docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):latest
|
@for t in $(TAG) latest $(EXTRA_TAGS); do echo "tag and push: $$t"; docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$$t && docker push $(REGISTRY)/$(IMAGE):$$t; done
|
||||||
docker push $(REGISTRY)/$(IMAGE):$(TAG)
|
|
||||||
docker push $(REGISTRY)/$(IMAGE):latest
|
|
||||||
|
|
||||||
clean: rm-test-image rm-image
|
clean: rm-test-image rm-image
|
||||||
|
|
||||||
@ -51,5 +51,14 @@ rm-test-image:
|
|||||||
@test -z "$$(docker image ls -q $(IMAGE):$(TAG)-test)" || docker image rm -f $(IMAGE):$(TAG)-test > /dev/null
|
@test -z "$$(docker image ls -q $(IMAGE):$(TAG)-test)" || docker image rm -f $(IMAGE):$(TAG)-test > /dev/null
|
||||||
@test -z "$$(docker image ls -q $(IMAGE):$(TAG)-test)" || echo "Error: Removing test image failed"
|
@test -z "$$(docker image ls -q $(IMAGE):$(TAG)-test)" || echo "Error: Removing test image failed"
|
||||||
|
|
||||||
|
# Convience task during dev of downstream projects
|
||||||
|
.PHONY: ci-pull-upstream
|
||||||
|
ci-pull-upstream:
|
||||||
|
git stash && git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash && git stash pop
|
||||||
|
|
||||||
|
.PHONY: create-repo
|
||||||
|
create-repo:
|
||||||
|
aws ecr-public create-repository --repository-name $(IMAGE) --region $(REGION)
|
||||||
|
|
||||||
.DEFAULT:
|
.DEFAULT:
|
||||||
@echo "$@ not implemented. NOOP"
|
@echo "$@ not implemented. NOOP"
|
||||||
|
@ -48,8 +48,14 @@ def call(Map config=[:]) {
|
|||||||
reportTitles: 'TrivyScan'
|
reportTitles: 'TrivyScan'
|
||||||
]
|
]
|
||||||
|
|
||||||
// Scan again and fail on CRITICAL vulns
|
// Scan again and fail on CRITICAL vulns, if not overridden
|
||||||
sh "[ \"${config.trivyFail}\" == \"NONE\" ] || TRIVY_EXIT_CODE=1 TRIVY_SEVERITY=${config.trivyFail} make scan"
|
script {
|
||||||
|
if (config.trivyFail == 'NONE') {
|
||||||
|
echo 'trivyFail == NONE, review Trivy report manually. Proceeding ...'
|
||||||
|
} else {
|
||||||
|
sh "TRIVY_EXIT_CODE=1 TRIVY_SEVERITY=${config.trivyFail} make scan"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user