git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "c7b1dc37"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "a366494c"
git-subrepo: version: "0.4.6"
origin: "???"
commit: "???"
Change-Id: Id574ecd4e02e3c4fbf8a1efd49be11c0b6d19a3f
diff --git a/mailcow/src/mailcow-dockerized/.github/ISSUE_TEMPLATE/config.yml b/mailcow/src/mailcow-dockerized/.github/ISSUE_TEMPLATE/config.yml
index 51d0370..dcda8f0 100644
--- a/mailcow/src/mailcow-dockerized/.github/ISSUE_TEMPLATE/config.yml
+++ b/mailcow/src/mailcow-dockerized/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
blank_issues_enabled: false
contact_links:
- name: ❓ Community-driven support
- url: https://mailcow.github.io/mailcow-dockerized-docs/#get-support
+ url: https://docs.mailcow.email/#get-support
about: Please use the community forum for questions or assistance
- name: 🚨 Report a security vulnerability
url: https://www.servercow.de/anfrage?lang=en
diff --git a/mailcow/src/mailcow-dockerized/.github/renovate.json b/mailcow/src/mailcow-dockerized/.github/renovate.json
index 37962b2..e2de9e5 100644
--- a/mailcow/src/mailcow-dockerized/.github/renovate.json
+++ b/mailcow/src/mailcow-dockerized/.github/renovate.json
@@ -1,13 +1,31 @@
{
"enabled": true,
"timezone": "Europe/Berlin",
- "dependencyDashboard": false,
+ "dependencyDashboard": true,
"dependencyDashboardTitle": "Renovate Dashboard",
"commitBody": "Signed-off-by: milkmaker <milkmaker@mailcow.de>",
"rebaseWhen": "auto",
+ "labels": ["renovate"],
"assignees": [
"@magiccc"
],
"baseBranches": ["staging"],
- "enabledManagers": ["github-actions"]
+ "enabledManagers": ["github-actions", "regex", "docker-compose"],
+ "ignorePaths": [
+ "data\/web\/inc\/lib\/vendor\/matthiasmullie\/minify\/**"
+ ],
+ "regexManagers": [
+ {
+ "fileMatch": ["^helper-scripts\/nextcloud.sh$"],
+ "matchStrings": [
+ "#\\srenovate:\\sdatasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( extractVersion=(?<extractVersion>.*?))?\\s.*?_VERSION=(?<currentValue>.*)"
+ ]
+ },
+ {
+ "fileMatch": ["(^|/)Dockerfile[^/]*$"],
+ "matchStrings": [
+ "#\\srenovate:\\sdatasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( extractVersion=(?<extractVersion>.*?))?\\s(ENV|ARG) .*?_VERSION=(?<currentValue>.*)\\s"
+ ]
+ }
+ ]
}
diff --git a/mailcow/src/mailcow-dockerized/.github/workflows/check_prs_if_on_staging.yml b/mailcow/src/mailcow-dockerized/.github/workflows/check_prs_if_on_staging.yml
index cb49ffb..c28454f 100644
--- a/mailcow/src/mailcow-dockerized/.github/workflows/check_prs_if_on_staging.yml
+++ b/mailcow/src/mailcow-dockerized/.github/workflows/check_prs_if_on_staging.yml
@@ -10,7 +10,7 @@
if: github.event.pull_request.base.ref != 'staging' #check if the target branch is not staging
steps:
- name: Send message
- uses: thollander/actions-comment-pull-request@main
+ uses: thollander/actions-comment-pull-request@v2.4.2
with:
GITHUB_TOKEN: ${{ secrets.CHECKIFPRISSTAGING_ACTION_PAT }}
message: |
diff --git a/mailcow/src/mailcow-dockerized/.github/workflows/close_old_issues_and_prs.yml b/mailcow/src/mailcow-dockerized/.github/workflows/close_old_issues_and_prs.yml
index 83a75d2..21ab3a8 100644
--- a/mailcow/src/mailcow-dockerized/.github/workflows/close_old_issues_and_prs.yml
+++ b/mailcow/src/mailcow-dockerized/.github/workflows/close_old_issues_and_prs.yml
@@ -14,7 +14,7 @@
pull-requests: write
steps:
- name: Mark/Close Stale Issues and Pull Requests 🗑️
- uses: actions/stale@v6.0.1
+ uses: actions/stale@v8.0.0
with:
repo-token: ${{ secrets.STALE_ACTION_PAT }}
days-before-stale: 60
diff --git a/mailcow/src/mailcow-dockerized/.github/workflows/image_builds.yml b/mailcow/src/mailcow-dockerized/.github/workflows/image_builds.yml
index 65678df..496d4f7 100644
--- a/mailcow/src/mailcow-dockerized/.github/workflows/image_builds.yml
+++ b/mailcow/src/mailcow-dockerized/.github/workflows/image_builds.yml
@@ -28,7 +28,7 @@
- "watchdog-mailcow"
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup Docker
run: |
curl -sSL https://get.docker.com/ | CHANNEL=stable sudo sh
diff --git a/mailcow/src/mailcow-dockerized/.github/workflows/pr_to_nightly.yml b/mailcow/src/mailcow-dockerized/.github/workflows/pr_to_nightly.yml
index 54dbda3..e629e5e 100644
--- a/mailcow/src/mailcow-dockerized/.github/workflows/pr_to_nightly.yml
+++ b/mailcow/src/mailcow-dockerized/.github/workflows/pr_to_nightly.yml
@@ -8,11 +8,11 @@
runs-on: ubuntu-latest
steps:
- name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Run the Action
- uses: devops-infra/action-pull-request@v0.5.3
+ uses: devops-infra/action-pull-request@v0.5.5
with:
github_token: ${{ secrets.PRTONIGHTLY_ACTION_PAT }}
title: Automatic PR to nightly from ${{ github.event.repository.updated_at}}
diff --git a/mailcow/src/mailcow-dockerized/.github/workflows/rebuild_backup_image.yml b/mailcow/src/mailcow-dockerized/.github/workflows/rebuild_backup_image.yml
index 120d68d..649d76a 100644
--- a/mailcow/src/mailcow-dockerized/.github/workflows/rebuild_backup_image.yml
+++ b/mailcow/src/mailcow-dockerized/.github/workflows/rebuild_backup_image.yml
@@ -11,24 +11,25 @@
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Set up QEMU
- uses: docker/setup-qemu-action@v2
+ uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
+ uses: docker/setup-buildx-action@v3
- name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
with:
username: ${{ secrets.BACKUPIMAGEBUILD_ACTION_DOCKERHUB_USERNAME }}
password: ${{ secrets.BACKUPIMAGEBUILD_ACTION_DOCKERHUB_TOKEN }}
- name: Build and push
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v5
with:
context: .
+ platforms: linux/amd64,linux/arm64
file: data/Dockerfiles/backup/Dockerfile
push: true
tags: mailcow/backup:latest
diff --git a/mailcow/src/mailcow-dockerized/.github/workflows/update_postscreen_access_list.yml b/mailcow/src/mailcow-dockerized/.github/workflows/update_postscreen_access_list.yml
new file mode 100644
index 0000000..42502f3
--- /dev/null
+++ b/mailcow/src/mailcow-dockerized/.github/workflows/update_postscreen_access_list.yml
@@ -0,0 +1,39 @@
+name: Update postscreen_access.cidr
+
+on:
+ schedule:
+ # Monthly
+ - cron: "0 0 1 * *"
+ workflow_dispatch: # Allow to run workflow manually
+
+permissions:
+ contents: read # to fetch code (actions/checkout)
+
+
+jobs:
+ Update-postscreen_access_cidr:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Generate postscreen_access.cidr
+ run: |
+ bash helper-scripts/update_postscreen_whitelist.sh
+
+ - name: Create Pull Request
+ uses: peter-evans/create-pull-request@v5
+ with:
+ token: ${{ secrets.mailcow_action_Update_postscreen_access_cidr_pat }}
+ commit-message: update postscreen_access.cidr
+ committer: milkmaker <milkmaker@mailcow.de>
+ author: milkmaker <milkmaker@mailcow.de>
+ signoff: false
+ branch: update/postscreen_access.cidr
+ base: staging
+ delete-branch: true
+ add-paths: |
+ data/conf/postfix/postscreen_access.cidr
+ title: '[Postfix] update postscreen_access.cidr'
+ body: |
+ This PR updates the postscreen_access.cidr using GitHub Actions and [helper-scripts/update_postscreen_whitelist.sh](https://github.com/mailcow/mailcow-dockerized/blob/master/helper-scripts/update_postscreen_whitelist.sh)
\ No newline at end of file