Skip to content

scripts: remove superfluous EOF in dmarc_dkim_spf.sh#3266

Merged
georglauterbach merged 2 commits intodocker-mailserver:masterfrom
ap-wtioit:master-fix_dmarc_dkim_spf.sh
Apr 20, 2023
Merged

scripts: remove superfluous EOF in dmarc_dkim_spf.sh#3266
georglauterbach merged 2 commits intodocker-mailserver:masterfrom
ap-wtioit:master-fix_dmarc_dkim_spf.sh

Conversation

@ap-wtioit
Copy link
Copy Markdown
Contributor

@ap-wtioit ap-wtioit commented Apr 17, 2023 •
edited
Loading

Description

Our CI test logs have lots of:

/usr/local/bin/setup.d/dmarc_dkim_spf.sh: line 106: EOF: command not found

Also discussed in https://github.com/docker-mailserver/docker-mailserver/pull/3263/files#r1167336949 and fixed in #3261

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code follows the style guidelines of this project

    Note checks only complete with [FIX] shellcheck: do not check .git folder #3267 in place

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (README.md or the documentation under docs/)
  • If necessary I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

    Note checks only complete with [FIX] shellcheck: do not check .git folder #3267 in place

Info @wt-io-it

@ap-wtioit ap-wtioit mentioned this pull request Apr 17, 2023
Merged
7 tasks
@georglauterbach
Copy link
Copy Markdown
Member

georglauterbach commented Apr 17, 2023

I'm waiting for review of #3261, which contains f62855f - the commit that fixes this error.

I introduced it, very sorry for that, by not reading carefully. I do hope that #3261 can be merged soon, so this should be resolved.

@georglauterbach georglauterbach added the pr/waiting for other PR to get merged This PR is waiting for another / other PR(s) to get merged label Apr 17, 2023
@georglauterbach georglauterbach added this to the v12.1.0 milestone Apr 17, 2023
@georglauterbach georglauterbach mentioned this pull request Apr 18, 2023
Merged
9 tasks
@georglauterbach georglauterbach changed the title [FIX] dmarc_dkim_spf.sh: remove superfluous EOF scripts: remove superfluous EOF in dmarc_dkim_spf.sh Apr 20, 2023
@georglauterbach georglauterbach added area/scripts kind/bug/fix A fix (PR) for a confirmed bug and removed pr/waiting for other PR to get merged This PR is waiting for another / other PR(s) to get merged labels Apr 20, 2023
@georglauterbach
Copy link
Copy Markdown
Member

georglauterbach commented Apr 20, 2023

#3261 still has no review, but this issue should be resolved, so this will be merged.

@georglauterbach georglauterbach merged commit 2b330fd into docker-mailserver:master Apr 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@polarathene polarathene polarathene approved these changes

@georglauterbach georglauterbach georglauterbach approved these changes

Assignees

@ap-wtioit ap-wtioit

Labels

area/scripts kind/bug/fix A fix (PR) for a confirmed bug

Projects

None yet

Milestone

v12.1.0

Development

Successfully merging this pull request may close these issues.

3 participants

@ap-wtioit @georglauterbach @polarathene