-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into ci-docker-build-speed
- Loading branch information
Showing
55 changed files
with
356 additions
and
180 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,25 @@ | ||
IMAGE_VERSION?=$(shell grep -Po 'org.opencontainers.image.version="\K.*?(?=")' Dockerfile) | ||
IMAGE_NAME?=$(shell grep -Po 'org.opencontainers.image.url="\K.*?(?=")' Dockerfile) | ||
DEV_VERSION?=$(shell echo ${IMAGE_VERSION} | cut -d '-' -f 1)_dev | ||
IMAGE_VERSION?=$(shell grep -Po 'org.opencontainers.image.version="\K.*?(?=")' Dockerfile)_dev | ||
IMAGE_URL=$(shell grep -Po 'org.opencontainers.image.url="\K.*?(?=")' Dockerfile) | ||
IMAGE?=${IMAGE_URL}:${IMAGE_VERSION} | ||
|
||
# pass extra build args, i.e. `make build-dev BUILD_ARGS="--no-cache"` | ||
BUILD_ARGS?= | ||
|
||
# pass extra trivy args, i.e. `make trivy-scan TRIVY_ARGS="-f json"` | ||
TRIVY_ARGS?= | ||
|
||
# pass extra build args, i.e. `make grype-scan GRYPE_ARGS="-o json"` | ||
GRYPE_ARGS?= | ||
# pass extra args to the targets, for example: | ||
# | ||
# - `make build-dev ARGS="--no-cache"` | ||
# - `make trivy-scan TRIVY_ARGS="-f json"` | ||
# - `make grype-scan GRYPE_ARGS="-o json"` | ||
ARGS?= | ||
|
||
.PHONY: test clean all build-dev trivy-scan grype-scan | ||
.DEFAULT_GOAL := build-dev | ||
|
||
build-dev: | ||
@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}" | ||
@docker build --rm --force-rm ${BUILD_ARGS} -t ${IMAGE_NAME}:${DEV_VERSION} . | ||
@echo "[I] Building OCI image ${IMAGE}" | ||
@docker build --rm --force-rm ${ARGS} -t ${IMAGE} . | ||
|
||
trivy-scan: | ||
@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy" | ||
@trivy image --security-checks vuln ${TRIVY_ARGS} ${IMAGE_NAME}:${DEV_VERSION} | ||
@echo "[I] Scanning OCI image ${IMAGE} using trivy" | ||
@trivy image --scanners vuln ${ARGS} ${IMAGE} | ||
|
||
grype-scan: | ||
@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype" | ||
@grype -v ${GRYPE_ARGS} ${IMAGE_NAME}:${DEV_VERSION} | ||
@echo "[I] Scanning OCI image ${IMAGE} using grype" | ||
@grype -v ${ARGS} ${IMAGE} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
webdavclient3>=3.14.5 | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
click==8.1.7 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# pinned to py3-grpcio version to avoid failure on native extension build | ||
grpcio==1.54.2 | ||
ruamel.yaml==0.18.5 | ||
git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib | ||
git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.