Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Adrien Dorsaz
acme-dns-tiny
Commits
367d8a5b
Commit
367d8a5b
authored
Oct 31, 2020
by
Adrien Dorsaz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-debug-output-message' into 'master'
Fix debug output message See merge request
!25
parents
dc657495
c4cd1fe7
Pipeline
#284
failed with stages
in 15 minutes and 30 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
.gitlab-ci.yml
.gitlab-ci.yml
+15
-6
acme_dns_tiny.py
acme_dns_tiny.py
+1
-1
docker/stretch/Dockerfile
docker/stretch/Dockerfile
+1
-1
No files found.
.gitlab-ci.yml
View file @
367d8a5b
...
...
@@ -7,6 +7,9 @@ stages:
.build
:
stage
:
build
image
:
docker:stable
variables
:
DOCKER_DRIVER
:
overlay2
DOCKER_BUILDKIT
:
1
only
:
-
merge_requests
-
master
...
...
@@ -41,20 +44,26 @@ stages:
jessie-slim
:
extends
:
.build
script
:
-
docker build -t "acme-dns-tiny:jessie-slim"
-f "docker/jessie/Dockerfile" .
-
docker build
--progress plain
-t "acme-dns-tiny:jessie-slim"
-f "docker/jessie/Dockerfile" .
stretch-slim
:
extends
:
.build
script
:
-
docker build -t "acme-dns-tiny:stretch-slim"
-f "docker/stretch/Dockerfile" .
-
docker build
--progress plain
-t "acme-dns-tiny:stretch-slim"
-f "docker/stretch/Dockerfile" .
buster-slim
:
extends
:
.build
script
:
-
docker build -t "acme-dns-tiny:buster-slim"
-f "docker/buster/Dockerfile" .
-
docker build
--progress plain
-t "acme-dns-tiny:buster-slim"
-f "docker/buster/Dockerfile" .
compile
:
extends
:
.check
...
...
acme_dns_tiny.py
View file @
367d8a5b
...
...
@@ -224,7 +224,7 @@ def get_crt(config, log=LOGGER):
dnsrr_domain
)
except
dns
.
exception
.
DNSException
as
dnsexception
:
log
.
debug
((
" - Not any CNAME resource has been found for this domain (%s), will "
"install TXT directly on %s"
),
dnsrr_domain
,
type
(
dnsexception
).
__name__
)
"install TXT directly on %s"
),
type
(
dnsexception
).
__name__
,
dnsrr_domain
)
dnsrr_set
=
dns
.
rrset
.
from_text
(
dnsrr_domain
,
config
[
"DNS"
].
getint
(
"TTL"
),
"IN"
,
"TXT"
,
'"{0}"'
.
format
(
keydigest64
))
try
:
...
...
docker/stretch/Dockerfile
View file @
367d8a5b
FROM
debian:
jessie
-slim
FROM
debian:
stretch
-slim
WORKDIR
acme_dns_tiny
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment