Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brings DNSControl up to date along with some new features #118

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Brings DNSControl up to date along with some new features #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
aa6bdae
Update Dockerfile
plttn Nov 8, 2024
7e6e15e
Update Dockerfile
plttn Nov 8, 2024
6011466
Update Dockerfile
plttn Nov 8, 2024
36223e9
Update Dockerfile
plttn Nov 8, 2024
83fa183
Update Dockerfile
plttn Nov 8, 2024
318c0ee
Update Dockerfile
plttn Nov 8, 2024
6964c74
Update entrypoint.sh
plttn Nov 8, 2024
4ec6906
Update entrypoint.sh
plttn Nov 8, 2024
7c52cb0
Bump versions
plttn Nov 9, 2024
170f4e7
Fix sourcing, add concurrency
plttn Nov 9, 2024
22c3d8d
Fix capitalization
plttn Nov 9, 2024
6297c8c
Filter concurrent mode
plttn Nov 9, 2024
0e08c34
remove for now
plttn Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.2@sha256:69665d02cb32192e52e07644d76bc6f25abeb5410edc1c7a81a10ba3f0efb90a
FROM alpine:3.20.3

LABEL repository="https://github.com/koenrh/dnscontrol-action"
LABEL maintainer="Koen Rouwhorst <[email protected]>"
Expand All @@ -8,15 +8,15 @@ LABEL "com.github.actions.description"="Deploy your DNS configuration to multipl
LABEL "com.github.actions.icon"="cloud"
LABEL "com.github.actions.color"="yellow"

ENV DNSCONTROL_VERSION="3.31.4"
ENV DNSCONTROL_CHECKSUM="054d236531df2674c9286279596f88f02c1cf7b1448dc5f643f1a1dbe705fe8d"
ENV DNSCONTROL_VERSION="4.14.3"
ENV DNSCONTROL_CHECKSUM="8c7e8a181beb17b130a6365bc81ffd024176951b5082d51539412198907e1e48"

RUN apk -U --no-cache upgrade && \
apk add --no-cache bash ca-certificates curl libc6-compat
apk add --no-cache bash ca-certificates curl libc6-compat tar

RUN curl -sL "https://github.com/StackExchange/dnscontrol/releases/download/v$DNSCONTROL_VERSION/dnscontrol-Linux" \
-o dnscontrol && \
echo "$DNSCONTROL_CHECKSUM dnscontrol" | sha256sum -c - && \
RUN curl -sL "https://github.com/StackExchange/dnscontrol/releases/download/v${DNSCONTROL_VERSION}/dnscontrol_${DNSCONTROL_VERSION}_linux_amd64.tar.gz" -o dnscontrol.tar.gz && \
echo "$DNSCONTROL_CHECKSUM dnscontrol.tar.gz" | sha256sum -c - && \
tar -xzf "dnscontrol.tar.gz" && \
chmod +x dnscontrol && \
mv dnscontrol /usr/local/bin/dnscontrol

Expand Down
4 changes: 3 additions & 1 deletion bin/filter-preview-output.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ grep -v -e '^\.\.\.0 corrections$' |\
grep -v -e '\.\.\. (skipping)' |\
grep -v -e '^----- DNS Provider: ' |\
grep -v -e '^----- Registrar: ' |\
grep -v -e '^----- Getting nameservers from:'
grep -v -e '^----- Getting nameservers from:' | \
Comment on lines 6 to +9
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The grep -v statements can be removed. Those are only output if the --full flag is used, which it isn't.

sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]//g" # remove ANSI color codes
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of the sed, you can use ``--no-color` (it goes before the "preview" or "push" verb).

I would also add:

  • --reportmax=0 -- be less verbose

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason I implemented it like this was so that colors still worked in the action log, but weren't commented in the PR.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah! makes sense.

(it's a shame that whoever added the -p flag to col didn't also strip escape sequences)

## https://stackoverflow.com/questions/17998978/removing-colors-from-output
1 change: 1 addition & 0 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ARGS=(
# 'check' sub-command doesn't require credentials
if [ "$1" != "check" ]; then
ARGS+=(--creds "$CREDS_ABS_PATH")
ARGS+=(--cmode concurrent)
fi

IFS=
Expand Down