Compare commits
5 commits
Author | SHA1 | Date | |
---|---|---|---|
christian | 59d03f97a3 | ||
christian | 2fd26d6f6f | ||
christian | cc2f0cdc81 | ||
christian | 88569e05f5 | ||
christian | 1eca984167 |
|
@ -20,7 +20,6 @@ workspace:
|
||||||
matrix:
|
matrix:
|
||||||
KEYCLOAK_VERSION:
|
KEYCLOAK_VERSION:
|
||||||
- 25.0
|
- 25.0
|
||||||
- 26.0
|
|
||||||
IMAGE_NAME:
|
IMAGE_NAME:
|
||||||
- git.hamburg.ccc.de/ccchh/oci-images/keycloak
|
- git.hamburg.ccc.de/ccchh/oci-images/keycloak
|
||||||
|
|
||||||
|
@ -29,7 +28,6 @@ steps:
|
||||||
image: alpine
|
image: alpine
|
||||||
commands:
|
commands:
|
||||||
- mkdir /woodpecker/images
|
- mkdir /woodpecker/images
|
||||||
|
|
||||||
- name: build-image
|
- name: build-image
|
||||||
image: gcr.io/kaniko-project/executor
|
image: gcr.io/kaniko-project/executor
|
||||||
entrypoint:
|
entrypoint:
|
||||||
|
@ -40,7 +38,6 @@ steps:
|
||||||
- --destination=${IMAGE_NAME}:${KEYCLOAK_VERSION}
|
- --destination=${IMAGE_NAME}:${KEYCLOAK_VERSION}
|
||||||
- --no-push
|
- --no-push
|
||||||
- --tar-path=/woodpecker/images/keycloak.tar
|
- --tar-path=/woodpecker/images/keycloak.tar
|
||||||
|
|
||||||
- name: publish-image
|
- name: publish-image
|
||||||
image: alpine
|
image: alpine
|
||||||
secrets:
|
secrets:
|
||||||
|
@ -48,27 +45,16 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- apk -u add crane
|
- apk -u add crane
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
||||||
- crane push /woodpecker/images/keycloak.tar $IMAGE_NAME:$KEYCLOAK_VERSION-$CI_COMMIT_BRANCH
|
- crane push /woodpecker/images/keycloak.tar $IMAGE_NAME:$KEYCLOAK_VERSION
|
||||||
|
- name: tag-branch-and-latest
|
||||||
- name: tag-version
|
|
||||||
image: alpine
|
image: alpine
|
||||||
when:
|
when:
|
||||||
- branch: main
|
- branch: main
|
||||||
|
- evaluate: 'KEYCLOAK_VERSION == "25.0"'
|
||||||
secrets:
|
secrets:
|
||||||
- GIT_API_TOKEN
|
- GIT_API_TOKEN
|
||||||
commands:
|
commands:
|
||||||
- apk -u add crane
|
- apk -u add crane
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
||||||
- crane tag $IMAGE_NAME:$KEYCLOAK_VERSION-$CI_COMMIT_BRANCH $KEYCLOAK_VERSION
|
- crane tag $IMAGE_NAME:$KEYCLOAK_VERSION $CI_COMMIT_BRANCH
|
||||||
|
- crane tag $IMAGE_NAME:$KEYCLOAK_VERSION latest
|
||||||
- name: tag-latest
|
|
||||||
image: alpine
|
|
||||||
when:
|
|
||||||
- branch: main
|
|
||||||
evaluate: 'KEYCLOAK_VERSION == "26.0"'
|
|
||||||
secrets:
|
|
||||||
- GIT_API_TOKEN
|
|
||||||
commands:
|
|
||||||
- apk -u add crane
|
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
|
||||||
- crane tag $IMAGE_NAME:$KEYCLOAK_VERSION-$CI_COMMIT_BRANCH latest
|
|
||||||
|
|
|
@ -19,8 +19,8 @@ workspace:
|
||||||
# Also because global environment variables aren't a thing.
|
# Also because global environment variables aren't a thing.
|
||||||
matrix:
|
matrix:
|
||||||
NEXTCLOUD_VERSION:
|
NEXTCLOUD_VERSION:
|
||||||
|
- 28
|
||||||
- 29
|
- 29
|
||||||
- 30
|
|
||||||
IMAGE_NAME:
|
IMAGE_NAME:
|
||||||
- git.hamburg.ccc.de/ccchh/oci-images/nextcloud
|
- git.hamburg.ccc.de/ccchh/oci-images/nextcloud
|
||||||
|
|
||||||
|
@ -48,20 +48,9 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- apk -u add crane
|
- apk -u add crane
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
||||||
- crane push /woodpecker/images/nextcloud.tar $IMAGE_NAME:$NEXTCLOUD_VERSION-$CI_COMMIT_BRANCH
|
- crane push /woodpecker/images/nextcloud.tar $IMAGE_NAME:$NEXTCLOUD_VERSION
|
||||||
|
|
||||||
- name: tag-version
|
- name: tag-branch-and-latest
|
||||||
image: docker.io/library/alpine
|
|
||||||
when:
|
|
||||||
- branch: main
|
|
||||||
secrets:
|
|
||||||
- GIT_API_TOKEN
|
|
||||||
commands:
|
|
||||||
- apk -u add crane
|
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
|
||||||
- crane tag $IMAGE_NAME:$NEXTCLOUD_VERSION-$CI_COMMIT_BRANCH $NEXTCLOUD_VERSION
|
|
||||||
|
|
||||||
- name: tag-latest
|
|
||||||
image: docker.io/library/alpine
|
image: docker.io/library/alpine
|
||||||
when:
|
when:
|
||||||
- branch: main
|
- branch: main
|
||||||
|
@ -71,4 +60,5 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- apk -u add crane
|
- apk -u add crane
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
||||||
- crane tag $IMAGE_NAME:$NEXTCLOUD_VERSION-$CI_COMMIT_BRANCH latest
|
- crane tag $IMAGE_NAME:$NEXTCLOUD_VERSION $CI_COMMIT_BRANCH
|
||||||
|
- crane tag $IMAGE_NAME:$NEXTCLOUD_VERSION latest
|
||||||
|
|
|
@ -1,95 +0,0 @@
|
||||||
when:
|
|
||||||
- event: push
|
|
||||||
path:
|
|
||||||
- 'penpot/**'
|
|
||||||
- '.woodpecker/penpot.yaml'
|
|
||||||
- event: cron
|
|
||||||
cron: daily
|
|
||||||
|
|
||||||
# Manually set a workspace path, so we can use it literally, without using
|
|
||||||
# ${CI_WORKSPACE}, when running kaniko, since using ${CI_WORKSPACE} doesn't work.
|
|
||||||
# https://github.com/woodpecker-ci/woodpecker/issues/3982
|
|
||||||
workspace:
|
|
||||||
path: src
|
|
||||||
|
|
||||||
# Use matrix to set PENPOT_VERSION instead of setting the PENPOT_VERSION as an
|
|
||||||
# environment variable in the build-images step, since string substitution
|
|
||||||
# doesn't work for custom environment variables.
|
|
||||||
# https://github.com/woodpecker-ci/woodpecker/issues/3983
|
|
||||||
# Also because global environment variables aren't a thing.
|
|
||||||
matrix:
|
|
||||||
PENPOT_VERSION:
|
|
||||||
- 2.1.2
|
|
||||||
IMAGE_BASE_NAME:
|
|
||||||
- git.hamburg.ccc.de/ccchh/oci-images/penpot
|
|
||||||
IMAGE_TYPE:
|
|
||||||
- frontend
|
|
||||||
- backend
|
|
||||||
- exporter
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: setup-image-path
|
|
||||||
image: alpine
|
|
||||||
commands:
|
|
||||||
- mkdir /woodpecker/images
|
|
||||||
|
|
||||||
- name: setup-penpot-repo
|
|
||||||
image: alpine
|
|
||||||
commands:
|
|
||||||
- apk -u add git curl
|
|
||||||
- git clone --branch $PENPOT_VERSION https://github.com/penpot/penpot.git /woodpecker/penpot
|
|
||||||
- cd /woodpecker/penpot
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
# Get build system patch allowing for building images with kaniko.
|
|
||||||
# https://github.com/penpot/penpot/pull/4945
|
|
||||||
# https://github.com/penpot/penpot/pull/4945/commits/752574bac789cc90cc218004bb9545cc6239895d
|
|
||||||
- curl https://github.com/penpot/penpot/commit/752574bac789cc90cc218004bb9545cc6239895d.patch > 0001-move-entire-image-build-process-into-Dockerfiles.patch
|
|
||||||
# Get patch disallowing registration with invitation token, when disable-login-with-password flag is set.
|
|
||||||
# https://github.com/penpot/penpot/issues/4975
|
|
||||||
# https://github.com/june128/penpot/commit/f799da132bf5a51015859031f45154172fbf7cd0
|
|
||||||
- curl https://github.com/june128/penpot/commit/f799da132bf5a51015859031f45154172fbf7cd0.patch > 0002-hotfix-dont-allow-registration-with-invite-if-password-login-is-disabled.patch
|
|
||||||
- git config user.name "Woodpecker"
|
|
||||||
- git config user.email "woodpecker@woodpecker.invalid"
|
|
||||||
- git am *.patch
|
|
||||||
|
|
||||||
- name: build-image
|
|
||||||
image: gcr.io/kaniko-project/executor
|
|
||||||
entrypoint:
|
|
||||||
- /kaniko/executor
|
|
||||||
- --context=dir:///woodpecker/penpot
|
|
||||||
- --dockerfile=./docker/images/Dockerfile.${IMAGE_TYPE}
|
|
||||||
- --destination=${IMAGE_BASE_NAME}/${IMAGE_TYPE}:${PENPOT_VERSION}
|
|
||||||
- --no-push
|
|
||||||
- --tar-path=/woodpecker/images/penpot-${IMAGE_TYPE}.tar
|
|
||||||
|
|
||||||
- name: publish-image
|
|
||||||
image: docker.io/library/alpine
|
|
||||||
secrets:
|
|
||||||
- GIT_API_TOKEN
|
|
||||||
commands:
|
|
||||||
- apk -u add crane
|
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
|
||||||
- crane push /woodpecker/images/penpot-$IMAGE_TYPE.tar $IMAGE_BASE_NAME/$IMAGE_TYPE:$PENPOT_VERSION-$CI_COMMIT_BRANCH
|
|
||||||
|
|
||||||
- name: tag-version
|
|
||||||
image: docker.io/library/alpine
|
|
||||||
when:
|
|
||||||
- branch: main
|
|
||||||
secrets:
|
|
||||||
- GIT_API_TOKEN
|
|
||||||
commands:
|
|
||||||
- apk -u add crane
|
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
|
||||||
- crane tag $IMAGE_BASE_NAME/$IMAGE_TYPE:$PENPOT_VERSION-$CI_COMMIT_BRANCH $PENPOT_VERSION
|
|
||||||
|
|
||||||
- name: tag-latest
|
|
||||||
image: docker.io/library/alpine
|
|
||||||
when:
|
|
||||||
- branch: main
|
|
||||||
evaluate: 'PENPOT_VERSION == "2.1.2"'
|
|
||||||
secrets:
|
|
||||||
- GIT_API_TOKEN
|
|
||||||
commands:
|
|
||||||
- apk -u add crane
|
|
||||||
- crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
|
|
||||||
- crane tag $IMAGE_BASE_NAME/$IMAGE_TYPE:$PENPOT_VERSION-$CI_COMMIT_BRANCH latest
|
|
|
@ -11,7 +11,3 @@ Tools in use:
|
||||||
## Images
|
## Images
|
||||||
|
|
||||||
- `git.hamburg.ccc.de/CCCHH/oci-images/keycloak`
|
- `git.hamburg.ccc.de/CCCHH/oci-images/keycloak`
|
||||||
- `git.hamburg.ccc.de/CCCHH/oci-images/nextcloud`
|
|
||||||
- `git.hamburg.ccc.de/CCCHH/oci-images/penpot/frontend`
|
|
||||||
- `git.hamburg.ccc.de/CCCHH/oci-images/penpot/backend`
|
|
||||||
- `git.hamburg.ccc.de/CCCHH/oci-images/penpot/exporter`
|
|
||||||
|
|
|
@ -8,7 +8,8 @@ div.kc-logo-text {
|
||||||
background: url("../../img/CCCHH.svg") no-repeat center center;
|
background: url("../../img/CCCHH.svg") no-repeat center center;
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
filter: invert(1);
|
filter: invert(1);
|
||||||
height: 100px;
|
height: 126px;
|
||||||
|
width: 600px;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.kc-logo-text span {
|
div.kc-logo-text span {
|
||||||
|
|
Loading…
Reference in a new issue