diff --git a/.woodpecker/keycloak.yaml b/.woodpecker/keycloak.yaml
index 2f76bd8..eb11f8c 100644
--- a/.woodpecker/keycloak.yaml
+++ b/.woodpecker/keycloak.yaml
@@ -1,8 +1,5 @@
when:
- event: push
- path:
- - 'keycloak/**'
- - '.woodpecker/keycloak.yaml'
- event: cron
cron: daily
@@ -19,8 +16,7 @@ workspace:
# Also because global environment variables aren't a thing.
matrix:
KEYCLOAK_VERSION:
- # renovate: datasource=docker depName=quay.io/keycloak/keycloak
- - 26.6.0
+ - 25.0
IMAGE_NAME:
- git.hamburg.ccc.de/ccchh/oci-images/keycloak
@@ -29,57 +25,45 @@ steps:
image: alpine
commands:
- mkdir /woodpecker/images
-
- - name: build-attribute-endpoints-provider
- image: alpine
+ - name: test
+ image: debian
commands:
- - apk -u add maven git
- - git clone https://git.hamburg.ccc.de/CCCHH/keycloak-attribute-endpoints-provider.git
- - cd keycloak-attribute-endpoints-provider
- - mvn -f attribute-endpoints-provider verify
- - cp attribute-endpoints-provider/target/attribute-endpoints-provider-1.0-SNAPSHOT.jar /woodpecker/src/keycloak/attribute-endpoints-provider.jar
-
+ - echo "miau" > test
+ - name: test-2
+ image: debian
+ environment:
+ MY_COOL_TEST_VAR: test
+ entrypoint:
+ - /usr/bin/cat
+ - $${MY_COOL_TEST_VAR}"
- name: build-image
image: gcr.io/kaniko-project/executor
+ environment:
+ MY_COOL_TEST_VAR: 25.0
entrypoint:
- /kaniko/executor
- --context=dir:///woodpecker/src/keycloak
- --dockerfile=./Containerfile
- - --build-arg=TAG=${KEYCLOAK_VERSION}
- - --destination=${IMAGE_NAME}:${KEYCLOAK_VERSION}
+ - --build-arg=TAG=$${MY_COOL_TEST_VAR}
+ - --destination=${IMAGE_NAME}:$${MY_COOL_TEST_VAR}
- --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:$CI_COMMIT_BRANCH
+ - name: tag-version-and-latest
image: alpine
when:
- branch: main
- 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 tag $IMAGE_NAME:$KEYCLOAK_VERSION-$CI_COMMIT_BRANCH $KEYCLOAK_VERSION
-
- - name: tag-latest
- image: 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_NAME:$KEYCLOAK_VERSION-$CI_COMMIT_BRANCH latest
+ - crane tag $IMAGE_NAME:$CI_COMMIT_BRANCH $KEYCLOAK_VERSION
+ - crane tag $IMAGE_NAME:$CI_COMMIT_BRANCH latest
diff --git a/.woodpecker/nextcloud.yaml b/.woodpecker/nextcloud.yaml
deleted file mode 100644
index 4639448..0000000
--- a/.woodpecker/nextcloud.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-when:
- - event: push
- path:
- - 'nextcloud/**'
- - '.woodpecker/nextcloud.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 NEXTCLOUD_VERSION instead of setting the NEXTCLOUD_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:
- NEXTCLOUD_VERSION:
- - 30
- - 31
- - 32
- IMAGE_NAME:
- - git.hamburg.ccc.de/ccchh/oci-images/nextcloud
-
-steps:
- - name: setup-image-path
- image: docker.io/library/alpine
- commands:
- - mkdir /woodpecker/images
-
- - name: build-image
- image: gcr.io/kaniko-project/executor
- entrypoint:
- - /kaniko/executor
- - --context=dir:///woodpecker/src/nextcloud
- - --dockerfile=./Containerfile
- - --build-arg=TAG=${NEXTCLOUD_VERSION}
- - --destination=${IMAGE_NAME}:${NEXTCLOUD_VERSION}
- - --no-push
- - --tar-path=/woodpecker/images/nextcloud.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/nextcloud.tar $IMAGE_NAME:$NEXTCLOUD_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_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
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/Containerfile b/keycloak/Containerfile
index f3f6c1e..7f5fa4c 100644
--- a/keycloak/Containerfile
+++ b/keycloak/Containerfile
@@ -2,10 +2,8 @@ ARG TAG=latest
FROM quay.io/keycloak/keycloak:${TAG} as builder
ENV KC_DB=postgres
-ENV KC_FEATURES=declarative-ui
WORKDIR /opt/keycloak
-ADD --chown=keycloak:keycloak --chmod=644 attribute-endpoints-provider.jar /opt/keycloak/providers/attribute-endpoints-provider.jar
RUN /opt/keycloak/bin/kc.sh build
FROM quay.io/keycloak/keycloak:${TAG}
diff --git a/keycloak/themes/ccchh/login/resources/css/ccchh/login.css b/keycloak/themes/ccchh/login/resources/css/ccchh/login.css
index 9a31b32..1ad56c4 100644
--- a/keycloak/themes/ccchh/login/resources/css/ccchh/login.css
+++ b/keycloak/themes/ccchh/login/resources/css/ccchh/login.css
@@ -2,15 +2,4 @@
background: url("../../img/blur-more-blur-edit.jpg") no-repeat center center fixed;
background-size: cover;
height: 100%;
-}
-
-div.kc-logo-text {
- background: url("../../img/CCCHH.svg") no-repeat center center;
- background-size: contain;
- filter: invert(1);
- height: 100px;
-}
-
-div.kc-logo-text span {
- display: none;
}
\ No newline at end of file
diff --git a/keycloak/themes/ccchh/login/resources/img/CCCHH.svg b/keycloak/themes/ccchh/login/resources/img/CCCHH.svg
deleted file mode 100644
index 750d341..0000000
--- a/keycloak/themes/ccchh/login/resources/img/CCCHH.svg
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
diff --git a/nextcloud/.keep b/nextcloud/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/nextcloud/Containerfile b/nextcloud/Containerfile
deleted file mode 100644
index d139a4d..0000000
--- a/nextcloud/Containerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-ARG TAG=latest
-FROM docker.io/library/nextcloud:${TAG}
-
-RUN apt-get update \
- && apt-get install -y supervisor \
- && rm -rf /var/lib/apt/lists/* \
- && mkdir -p /var/log/supervisord /var/run/supervisord
-
-# We need to copy a file to the supervisord folder in /var/run so it exists when the container starts.
-COPY .keep /var/run/supervisord/
-
-COPY supervisord.conf /
-
-ENV NEXTCLOUD_UPDATE=1
-
-CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
\ No newline at end of file
diff --git a/nextcloud/supervisord.conf b/nextcloud/supervisord.conf
deleted file mode 100644
index 836a08a..0000000
--- a/nextcloud/supervisord.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[supervisord]
-nodaemon=true
-logfile=/var/log/supervisord/supervisord.log
-pidfile=/var/run/supervisord/supervisord.pid
-childlogdir=/var/log/supervisord/
-logfile_maxbytes=50MB ; maximum size of logfile before rotation
-logfile_backups=10 ; number of backed up logfiles
-loglevel=error
-
-[program:apache2]
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=apache2-foreground
-
-[program:cron]
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-command=/cron.sh
diff --git a/renovate.json b/renovate.json
deleted file mode 100644
index 7f0cc8d..0000000
--- a/renovate.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "$schema": "https://docs.renovatebot.com/renovate-schema.json",
- "extends": [
- "config:recommended"
- ],
- "customManagers": [
- // Custom manager using regex for letting Renovate find dependencies in woodpecker Matrix variables.
- {
- "customType": "regex",
- "managerFilePatterns": [
- "/^\\.woodpecker/.*\\.ya?ml$/"
- ],
- "matchStrings": [
- "# renovate: datasource=(?[a-zA-Z0-9-._]+?) depName=(?[^\\s]+?)(?: packageName=(?[^\\s]+?))?(?: versioning=(?[^\\s]+?))?\\s*-\\s*[\"']?(?.+?)[\"']?\\s"
- ]
- }
- ]
-}