docker_container first, then fall back to docker_image

+ test changes to support + test change to wait for smtp port to fix flakey tests since docker-mailserver#2104
NorseGaud · Aug 29, 2021 · ac77f27 · ac77f27
1 parent 392ee07
commit ac77f27
Show file tree

Hide file tree

Showing 27 changed files with 2,365 additions and 622 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -6,84 +6,12 @@
   "commit": false,
   "contributors": [
     {
-      "login": "eleith",
-      "name": "eleith",
-      "avatar_url": "https://avatars.githubusercontent.com/u/284832?v=4",
-      "profile": "http://eleith.com",
+      "login": "matrixes",
+      "name": "matrixes",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46491408?v=4",
+      "profile": "https://github.com/matrixes",
       "contributions": [
-        "infra",
-        "doc"
-      ]
-    },
-    {
-      "login": "NorseGaud",
-      "name": "Nathan Pierce",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5896030?v=4",
-      "profile": "https://github.com/NorseGaud",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "georglauterbach",
-      "name": "Georg Lauterbach",
-      "avatar_url": "https://avatars.githubusercontent.com/u/44545919?v=4",
-      "profile": "https://github.com/georglauterbach",
-      "contributions": [
-        "maintenance",
-        "code",
-        "question",
-        "review"
-      ]
-    },
-    {
-      "login": "hnws",
-      "name": "hnws",
-      "avatar_url": "https://avatars.githubusercontent.com/u/668137?v=4",
-      "profile": "https://github.com/hnws",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "wernerfred",
-      "name": "Frederic Werner",
-      "avatar_url": "https://avatars.githubusercontent.com/u/20406381?v=4",
-      "profile": "https://github.com/wernerfred",
-      "contributions": [
-        "doc",
-        "maintenance"
-      ]
-    },
-    {
-      "login": "casperklein",
-      "name": "Casper",
-      "avatar_url": "https://avatars.githubusercontent.com/u/590174?v=4",
-      "profile": "https://www.heiko-barth.de",
-      "contributions": [
-        "maintenance"
-      ]
-    },
-    {
-      "login": "polarathene",
-      "name": "Brennan Kinney",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5098581?v=4",
-      "profile": "https://github.com/polarathene",
-      "contributions": [
-        "maintenance",
-        "doc",
-        "security",
-        "question"
-      ]
-    },
-    {
-      "login": "andrewlow",
-      "name": "Andrew Low",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2952475?v=4",
-      "profile": "https://github.com/andrewlow",
-      "contributions": [
-        "doc",
-        "code"
+        "blog"
       ]
     }
   ],

diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml
@@ -0,0 +1,23 @@
+name: Update contributors
+on:
+  workflow_dispatch:
+  schedule:
+    - cron:  '0 0 * * *'
+
+jobs:
+  add-contributors:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Auto-add contributors
+      uses: BobAnkh/add-contributors@v0.2.1
+      with:
+        REPO_NAME: 'docker-mailserver/docker-mailserver'
+        CONTRIBUTOR: '## Contributors'
+        COLUMN_PER_ROW: '6'
+        ACCESS_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        IMG_WIDTH: '100'
+        FONT_SIZE: '14'
+        PATH: '/CONTRIBUTORS.md'
+        COMMIT_MESSAGE: 'docs(CONTRIBUTORS): update contributors'
+        AVATAR_SHAPE: 'round'
diff --git a/.github/workflows/default_on_push.yml b/.github/workflows/default_on_push.yml
@@ -33,7 +33,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Build image locally
-        uses: docker/build-push-action@v2.6.1
+        uses: docker/build-push-action@v2.7.0
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
@@ -62,7 +62,7 @@ jobs:
           submodules: recursive
       - name: Prepare tags
         id: prep
-        uses: docker/metadata-action@v3.4.1
+        uses: docker/metadata-action@v3.5.0
         with:
           images: |
             ${{ secrets.DOCKER_REPOSITORY }}
@@ -98,7 +98,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build images locally
-        uses: docker/build-push-action@v2.6.1
+        uses: docker/build-push-action@v2.7.0
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

diff --git a/.github/workflows/scheduled_builds.yml b/.github/workflows/scheduled_builds.yml
@@ -14,7 +14,7 @@ jobs:
           submodules: recursive
       - name: Prepare tags
         id: prep
-        uses: docker/metadata-action@v3.4.1
+        uses: docker/metadata-action@v3.5.0
         with:
           images: |
             ${{ secrets.DOCKER_REPOSITORY }}
@@ -38,7 +38,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build image locally
-        uses: docker/build-push-action@v2.6.1
+        uses: docker/build-push-action@v2.7.0
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

diff --git a/.github/workflows/scripts/docs/build-docs.sh b/.github/workflows/scripts/docs/build-docs.sh
@@ -6,7 +6,7 @@ docker run \
   --rm \
   --user "$(id -u):$(id -g)" \
   -v "${PWD}:/docs" \
-  squidfunk/mkdocs-material:7.2.4 build --strict
+  squidfunk/mkdocs-material:7.2.5 build --strict
 
 # Remove unnecessary build artifacts: https://github.com/squidfunk/mkdocs-material/issues/2519
 cd site || exit

diff --git a/.github/workflows/test_merge_requests.yml b/.github/workflows/test_merge_requests.yml
@@ -32,7 +32,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Build images locally
-        uses: docker/build-push-action@v2.6.1
+        uses: docker/build-push-action@v2.7.0
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
@@ -44,7 +44,7 @@ jobs:
           tags: mailserver-testing:ci
           cache-to: type=local,dest=/tmp/.buildx-cache
       - name: Build image for test suit
-        uses: docker/build-push-action@v2.6.1
+        uses: docker/build-push-action@v2.7.0
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
@@ -61,4 +61,4 @@ jobs:
           NAME=mailserver-testing:ci
           bash -c 'make generate-accounts tests'
         env:
-          CI: true
+          CI: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## `v10.1.2`
+
+This is bug fix release. It reverts [a regression](https://github.com/docker-mailserver/docker-mailserver/issues/2154) introduced with [#2104](https://github.com/docker-mailserver/docker-mailserver/pull/2104).
+
+## `v10.1.1`
+
+This release mainly improves on `v10.1.0` with small bugfixes/improvements and dependency updates
+
+- **[feat]** Add logwatch maillog.conf file to support /var/log/mail/ ([#2112](https://github.com/docker-mailserver/docker-mailserver/pull/2112))
+- **[docs]** `CONTRIBUTORS.md` now also shows every code contributor from the past ([#2143](https://github.com/docker-mailserver/docker-mailserver/pull/2143))
+- **[improve]** Avoid chmod +x when not needed ([#2127](https://github.com/docker-mailserver/docker-mailserver/pull/2127))
+- **[improve]** check-for-changes: performance improvements ([#2104](https://github.com/docker-mailserver/docker-mailserver/pull/2104))
+- **[dependency]** Update various dependencies through docs and base image
+- **[security]** This release contains also [security fixes for OpenSSL](https://www.openssl.org/news/secadv/20210824.txt)
+
+
 ## `v10.1.0`
 
 This release mainly improves on `v10.0.0` with many bugfixes.