Merge 313e7085b3 into bf040e1188
This commit is contained in:
commit
fd6b3b05d2
|
|
@ -186,3 +186,18 @@ endif
|
|||
@echo "Dependencies:"
|
||||
dep status
|
||||
@echo
|
||||
|
||||
# Multi-arch (buildx) support mirroring root Makefile
|
||||
PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
|
||||
|
||||
.PHONY: docker-buildx
|
||||
docker-buildx: check-env ## Build and push multi-arch image (set IMG=quay.io/...:tag)
|
||||
@echo "+ $@"
|
||||
sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
|
||||
- docker buildx create --name backup-pvc-builder
|
||||
docker buildx use backup-pvc-builder
|
||||
- docker buildx build --push --platform=$(PLATFORMS) \
|
||||
--build-arg UID=$(UID) --build-arg GID=$(GID) \
|
||||
--tag ${IMG} -f Dockerfile.cross .
|
||||
- docker buildx rm backup-pvc-builder
|
||||
rm Dockerfile.cross
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
v0.4.3
|
||||
v0.4.4
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
|
|||
| jenkins.backup.env[2].name | string | `"BACKUP_COUNT"` | |
|
||||
| jenkins.backup.env[2].value | string | `"3"` | |
|
||||
| jenkins.backup.getLatestAction[0] | string | `"/home/user/bin/get-latest.sh"` | |
|
||||
| jenkins.backup.image | string | `"quay.io/jenkins-kubernetes-operator/backup-pvc:v0.4.3"` | |
|
||||
| jenkins.backup.image | string | `"quay.io/jenkins-kubernetes-operator/backup-pvc:v0.4.4"` | |
|
||||
| jenkins.backup.interval | int | `30` | |
|
||||
| jenkins.backup.makeBackupBeforePodDeletion | bool | `true` | |
|
||||
| jenkins.backup.pvc.className | string | `""` | |
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ jenkins:
|
|||
|
||||
# image used by backup feature
|
||||
# By default using prebuilt backup PVC image
|
||||
image: quay.io/jenkins-kubernetes-operator/backup-pvc:v0.4.3
|
||||
image: quay.io/jenkins-kubernetes-operator/backup-pvc:v0.4.4
|
||||
|
||||
# containerName is backup container name
|
||||
containerName: backup
|
||||
|
|
|
|||
Loading…
Reference in New Issue