scottk/Mailu-OIDC
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu-OIDC.git synced 2025-10-31 18:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2024.06' into oidc

Browse Source
This commit is contained in:
Encotric
2025-02-20 12:19:40 +01:00
parent cd93f19b08 d9129fd362
commit 36ada96bae
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/build_test_deploy.yml vendored
View File

@@ -4,10 +4,6 @@
# Username of docker login for logging in docker for pulling images (higher pull rate limit) # Username of docker login for logging in docker for pulling images (higher pull rate limit)
# ${{ secrets.Docker_Password }} # ${{ secrets.Docker_Password }}
# Password of docker login for logging in docker for pulling images (higher pull rate limit) # Password of docker login for logging in docker for pulling images (higher pull rate limit)
# ${{ secrets.Docker_Login2 }}
# Second Username of docker login for logging in docker for pulling images (higher pull rate limit)
# ${{ secrets.Docker_Password2 }}
# Second Password of docker login for logging in docker for pulling images (higher pull rate limit)
################################################ ################################################
name: build-test-deploy name: build-test-deploy
@@ -87,7 +83,7 @@ jobs:
# This is used by the next build job. # This is used by the next build job.
targets: targets:
name: create targets name: create targets
runs-on: ubuntu-latest runs-on: ubuntu-24.04
outputs: outputs:
matrix: ${{ steps.targets.outputs.matrix }} matrix: ${{ steps.targets.outputs.matrix }}
steps: steps:
@@ -109,7 +105,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: ["base", "assets"] target: ["base", "assets"]
runs-on: ubuntu-latest runs-on: ubuntu-24.04
permissions: permissions:
contents: read contents: read
packages: write packages: write
@@ -184,7 +180,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: ["base", "assets"] target: ["base", "assets"]
runs-on: self-hosted runs-on: ubuntu-24.04-arm
permissions: permissions:
contents: read contents: read
packages: write packages: write
@@ -219,8 +215,8 @@ jobs:
PINNED_LABEL_VERSION: ${{ env.PINNED_MAILU_VERSION }} PINNED_LABEL_VERSION: ${{ env.PINNED_MAILU_VERSION }}
ARCH: linux/arm64/v8,linux/arm/v7 ARCH: linux/arm64/v8,linux/arm/v7
BUILDER: ${{ steps.uuid.outputs.uuid }} BUILDER: ${{ steps.uuid.outputs.uuid }}
DOCKER_LOGIN2: ${{ secrets.Docker_Login2 }} DOCKER_LOGIN: ${{ secrets.Docker_Login }}
DOCKER_PASSW2: ${{ secrets.Docker_Password2 }} DOCKER_PASSW: ${{ secrets.Docker_Password }}
BUILDX_NO_DEFAULT_ATTESTATIONS: 1 BUILDX_NO_DEFAULT_ATTESTATIONS: 1
uses: nick-fields/retry@v3 uses: nick-fields/retry@v3
with: with:
@@ -232,7 +228,7 @@ jobs:
set -euxo pipefail \ set -euxo pipefail \
; /usr/bin/docker info \ ; /usr/bin/docker info \
; echo "${{ github.token }}" | docker login --username "${{ github.repository_owner }}" --password-stdin ghcr.io \ ; echo "${{ github.token }}" | docker login --username "${{ github.repository_owner }}" --password-stdin ghcr.io \
; echo "$DOCKER_PASSW2" | docker login --username "$DOCKER_LOGIN2" --password-stdin \ ; echo "$DOCKER_PASSW" | docker login --username "$DOCKER_LOGIN" --password-stdin \
; /usr/bin/docker buildx rm builder-${{ env.BUILDER }} \ ; /usr/bin/docker buildx rm builder-${{ env.BUILDER }} \
|| echo "builder does not exist" \ || echo "builder does not exist" \
; /usr/bin/docker buildx create --name builder-${{ env.BUILDER }} --driver docker-container --use \ ; /usr/bin/docker buildx create --name builder-${{ env.BUILDER }} --driver docker-container --use \
@@ -261,7 +257,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: ${{ fromJson(needs.targets.outputs.matrix) }} target: ${{ fromJson(needs.targets.outputs.matrix) }}
runs-on: ubuntu-latest runs-on: ubuntu-24.04
permissions: permissions:
contents: read contents: read
packages: write packages: write
@@ -339,7 +335,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: ${{ fromJson(needs.targets.outputs.matrix) }} target: ${{ fromJson(needs.targets.outputs.matrix) }}
runs-on: self-hosted runs-on: ubuntu-24.04-arm
permissions: permissions:
contents: read contents: read
packages: write packages: write
@@ -374,8 +370,8 @@ jobs:
PINNED_LABEL_VERSION: ${{ env.PINNED_MAILU_VERSION }} PINNED_LABEL_VERSION: ${{ env.PINNED_MAILU_VERSION }}
ARCH: linux/arm64/v8,linux/arm/v7 ARCH: linux/arm64/v8,linux/arm/v7
BUILDER: ${{ steps.uuid.outputs.uuid }} BUILDER: ${{ steps.uuid.outputs.uuid }}
DOCKER_LOGIN2: ${{ secrets.Docker_Login2 }} DOCKER_LOGIN: ${{ secrets.Docker_Login }}
DOCKER_PASSW2: ${{ secrets.Docker_Password2 }} DOCKER_PASSW: ${{ secrets.Docker_Password }}
BUILDX_NO_DEFAULT_ATTESTATIONS: 1 BUILDX_NO_DEFAULT_ATTESTATIONS: 1
uses: nick-fields/retry@v3 uses: nick-fields/retry@v3
with: with:
@@ -387,7 +383,7 @@ jobs:
set -euxo pipefail \ set -euxo pipefail \
; /usr/bin/docker info \ ; /usr/bin/docker info \
; echo "${{ github.token }}" | docker login --username "${{ github.repository_owner }}" --password-stdin ghcr.io \ ; echo "${{ github.token }}" | docker login --username "${{ github.repository_owner }}" --password-stdin ghcr.io \
; echo "$DOCKER_PASSW2" | docker login --username "$DOCKER_LOGIN2" --password-stdin \ ; echo "$DOCKER_PASSW" | docker login --username "$DOCKER_LOGIN" --password-stdin \
; /usr/bin/docker buildx rm builder-${{ env.BUILDER }} \ ; /usr/bin/docker buildx rm builder-${{ env.BUILDER }} \
|| echo "builder does not exist" \ || echo "builder does not exist" \
; /usr/bin/docker buildx create --name builder-${{ env.BUILDER }} --driver docker-container --use \ ; /usr/bin/docker buildx create --name builder-${{ env.BUILDER }} --driver docker-container --use \
@@ -409,7 +405,7 @@ jobs:
tests: tests:
name: tests name: tests
if: contains(inputs.architecture, 'linux/amd64') if: contains(inputs.architecture, 'linux/amd64')
runs-on: ubuntu-latest runs-on: ubuntu-24.04
permissions: permissions:
contents: read contents: read
packages: read packages: read
@@ -466,10 +462,10 @@ jobs:
name: Deploy images name: Deploy images
# Deploying is not required for staging # Deploying is not required for staging
if: inputs.deploy == 'true' if: inputs.deploy == 'true'
runs-on: ubuntu-latest runs-on: ubuntu-24.04
needs: needs:
- build - build
# - build-arm - build-arm
- tests - tests
strategy: strategy:
fail-fast: false fail-fast: false
@@ -535,7 +531,7 @@ jobs:
#This job creates a tagged release. A tag is created for the pinned version x.y.z. The GH release refers to this tag. #This job creates a tagged release. A tag is created for the pinned version x.y.z. The GH release refers to this tag.
tag-release: tag-release:
if: inputs.release == 'true' if: inputs.release == 'true'
runs-on: ubuntu-latest runs-on: ubuntu-24.04
needs: needs:
- deploy - deploy
steps: steps:

4
.github/workflows/multiarch.yml vendored
View File

@@ -86,9 +86,7 @@ jobs:
- derive-variables - derive-variables
uses: ./.github/workflows/build_test_deploy.yml uses: ./.github/workflows/build_test_deploy.yml
with: with:
# linux/arm64/v8,linux/arm/v7 will be added when GitHub hosted arm64 runners are available by the end of 2024 architecture: 'linux/amd64,linux/arm64/v8,linux/arm/v7'
# https://github.blog/news-insights/product-news/arm64-on-github-actions-powering-faster-more-efficient-build-systems/
architecture: 'linux/amd64'
mailu_version: ${{needs.derive-variables.outputs.MAILU_VERSION}} mailu_version: ${{needs.derive-variables.outputs.MAILU_VERSION}}
pinned_mailu_version: ${{needs.derive-variables.outputs.PINNED_MAILU_VERSION}} pinned_mailu_version: ${{needs.derive-variables.outputs.PINNED_MAILU_VERSION}}
docker_org: ${{needs.derive-variables.outputs.DOCKER_ORG}} docker_org: ${{needs.derive-variables.outputs.DOCKER_ORG}}