diff --git a/.woodpecker/keycloak.yaml b/.woodpecker/keycloak.yaml index 5c3433a..f98ad87 100644 --- a/.woodpecker/keycloak.yaml +++ b/.woodpecker/keycloak.yaml @@ -19,8 +19,7 @@ workspace: # Also because global environment variables aren't a thing. matrix: KEYCLOAK_VERSION: - - 26.1 - - 26.2 + - 25.0 IMAGE_NAME: - git.hamburg.ccc.de/ccchh/oci-images/keycloak @@ -29,7 +28,6 @@ steps: image: alpine commands: - mkdir /woodpecker/images - - name: build-image image: gcr.io/kaniko-project/executor entrypoint: @@ -40,38 +38,23 @@ steps: - --destination=${IMAGE_NAME}:${KEYCLOAK_VERSION} - --no-push - --tar-path=/woodpecker/images/keycloak.tar - - name: publish-image image: alpine - environment: - GIT_API_TOKEN: - from_secret: GIT_API_TOKEN + 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/keycloak.tar $IMAGE_NAME:$KEYCLOAK_VERSION-$CI_COMMIT_BRANCH - - - name: tag-version + - crane push /woodpecker/images/keycloak.tar $IMAGE_NAME:$KEYCLOAK_VERSION + - name: tag-branch-and-latest image: alpine when: - branch: main - environment: - GIT_API_TOKEN: - from_secret: GIT_API_TOKEN + - evaluate: 'KEYCLOAK_VERSION == "25.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 $KEYCLOAK_VERSION - - - name: tag-latest - image: alpine - when: - - branch: main - evaluate: 'KEYCLOAK_VERSION == "26.0"' - environment: - GIT_API_TOKEN: - from_secret: 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 + - crane tag $IMAGE_NAME:$KEYCLOAK_VERSION $CI_COMMIT_BRANCH + - crane tag $IMAGE_NAME:$KEYCLOAK_VERSION latest diff --git a/.woodpecker/nextcloud.yaml b/.woodpecker/nextcloud.yaml index d570293..36b4a19 100644 --- a/.woodpecker/nextcloud.yaml +++ b/.woodpecker/nextcloud.yaml @@ -19,8 +19,8 @@ workspace: # Also because global environment variables aren't a thing. matrix: NEXTCLOUD_VERSION: - - 30 - - 31 + - 28 + - 29 IMAGE_NAME: - git.hamburg.ccc.de/ccchh/oci-images/nextcloud @@ -43,35 +43,22 @@ steps: - name: publish-image image: docker.io/library/alpine - environment: - GIT_API_TOKEN: - from_secret: GIT_API_TOKEN + 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/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 - environment: - GIT_API_TOKEN: - from_secret: GIT_API_TOKEN + evaluate: 'NEXTCLOUD_VERSION == "28"' + 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 - when: - - branch: main - evaluate: 'NEXTCLOUD_VERSION == "29"' - environment: - GIT_API_TOKEN: - from_secret: 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 latest + - crane tag $IMAGE_NAME:$NEXTCLOUD_VERSION $CI_COMMIT_BRANCH + - crane tag $IMAGE_NAME:$NEXTCLOUD_VERSION latest diff --git a/.woodpecker/penpot.yaml b/.woodpecker/penpot.yaml deleted file mode 100644 index 8cedcbe..0000000 --- a/.woodpecker/penpot.yaml +++ /dev/null @@ -1,98 +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 - environment: - GIT_API_TOKEN: - from_secret: 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 - environment: - GIT_API_TOKEN: - from_secret: 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"' - environment: - GIT_API_TOKEN: - from_secret: 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 diff --git a/README.md b/README.md index 557f82b..0daf4ba 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,3 @@ Tools in use: ## Images - `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` diff --git a/keycloak/themes/ccchh/login/resources/css/ccchh/login.css b/keycloak/themes/ccchh/login/resources/css/ccchh/login.css index 9a31b32..ac10ab2 100644 --- a/keycloak/themes/ccchh/login/resources/css/ccchh/login.css +++ b/keycloak/themes/ccchh/login/resources/css/ccchh/login.css @@ -8,7 +8,8 @@ div.kc-logo-text { background: url("../../img/CCCHH.svg") no-repeat center center; background-size: contain; filter: invert(1); - height: 100px; + height: 126px; + width: 600px; } div.kc-logo-text span {