From 50d843a16a3dcbe34c70e463ef8a5f58311ca867 Mon Sep 17 00:00:00 2001
From: Brian Cunnie
Date: Sat, 30 Apr 2022 16:42:35 -0700
Subject: [PATCH] Version 2.5.4: .acme_challenge.k-v.io isn't settable
---
bin/make_all | 8 +++++---
docs/DEVELOPER.md | 8 ++++----
k8s/Dockerfile-sslip.io-dns-server | 2 +-
k8s/document_root_sslip.io/index.html | 2 +-
spec/check-dns_spec.rb | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/bin/make_all b/bin/make_all
index 8976a32..dd9ba89 100755
--- a/bin/make_all
+++ b/bin/make_all
@@ -4,7 +4,7 @@
#
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd $DIR/../src/sslip.io-dns-server
-ldflags="-X xip/xip.VersionSemantic=2.5.3 \
+ldflags="-X xip/xip.VersionSemantic=2.5.4 \
-X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \
-X xip/xip.VersionGitHash=$(git rev-parse --short HEAD)"
export GOOS GOARCH
@@ -15,10 +15,12 @@ for GOARCH in amd64 arm64; do
go build \
-ldflags="$ldflags" \
-o $DIR/sslip.io-dns-server-$GOOS-$GOARCH \
- main.go
+ main.go &
done
done
# Windows has a custom extension, can't do arm64 yet
GOOS=windows GOARCH=amd64
-go build -o $DIR/sslip.io-dns-server-$GOOS-$GOARCH.exe main.go
+go build -o $DIR/sslip.io-dns-server-$GOOS-$GOARCH.exe main.go &
+
+wait
diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
index ea75063..e6ebc10 100644
--- a/docs/DEVELOPER.md
+++ b/docs/DEVELOPER.md
@@ -4,8 +4,8 @@ These instructions are meant primarily for me when deploying a new release;
they might not make sense unless you're on my workstation.
```bash
-export OLD_VERSION=2.5.2
-export VERSION=2.5.3
+export OLD_VERSION=2.5.3
+export VERSION=2.5.4
cd ~/workspace/sslip.io
git pull -r --autostash
# update the version number for the TXT record for version.status.sslip.io
@@ -24,7 +24,7 @@ bin/make_all
bin/sslip.io-dns-server-darwin-arm64
# In another window
export DNS_SERVER_IP=127.0.0.1
-export VERSION=2.5.3
+export VERSION=2.5.4
# quick sanity test
dig +short 127.0.0.1.example.com @$DNS_SERVER_IP
echo 127.0.0.1
@@ -68,7 +68,7 @@ exit
# let's add our changes
git add -p
# and commit (but DON'T push)
-git ci -vm"Version $VERSION: DELETE on k-v.io returns no TXT records"
+git ci -vm"Version $VERSION: .acme_challenge.k-v.io isn't settable"
git tag $VERSION
git push
git push --tags
diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server
index 2341f75..dabc798 100644
--- a/k8s/Dockerfile-sslip.io-dns-server
+++ b/k8s/Dockerfile-sslip.io-dns-server
@@ -26,7 +26,7 @@ LABEL org.opencontainers.image.authors="Brian Cunnie "
RUN apk update && apk add bind-tools
ARG TARGETARCH # amd64, arm64 (so I can run on AWS graviton2)
-RUN wget https://github.com/cunnie/sslip.io/releases/download/2.5.3/sslip.io-dns-server-linux-$TARGETARCH \
+RUN wget https://github.com/cunnie/sslip.io/releases/download/2.5.4/sslip.io-dns-server-linux-$TARGETARCH \
-O /usr/sbin/sslip.io-dns-server; \
chmod 755 /usr/sbin/sslip.io-dns-server
diff --git a/k8s/document_root_sslip.io/index.html b/k8s/document_root_sslip.io/index.html
index 5691923..1c5bb7c 100644
--- a/k8s/document_root_sslip.io/index.html
+++ b/k8s/document_root_sslip.io/index.html
@@ -156,7 +156,7 @@ src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js">
install & run our server within a docker container:
docker run -it --rm fedora
-curl -L https://github.com/cunnie/sslip.io/releases/download/2.5.3/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/2.5.4/sslip.io-dns-server-linux-amd64 -o dns-server
chmod +x dns-server
./dns-server 2> dns-server.log &
dnf install -y bind-utils
diff --git a/spec/check-dns_spec.rb b/spec/check-dns_spec.rb
index 82d5be5..80b924a 100644
--- a/spec/check-dns_spec.rb
+++ b/spec/check-dns_spec.rb
@@ -18,7 +18,7 @@ def get_whois_nameservers(domain)
end
domain = ENV['DOMAIN'] || 'example.com'
-sslip_version = '2.5.3'
+sslip_version = '2.5.4'
whois_nameservers = get_whois_nameservers(domain)
describe domain do