From 4d339cd8614384111f88c41c51eed0a6b47e6fe5 Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Fri, 22 Apr 2022 14:33:47 -0700 Subject: [PATCH] Version 2.5.3: k-v.io is operational --- bin/make_all | 2 +- docs/DEVELOPER.md | 13 +++++-------- k8s/Dockerfile-sslip.io-dns-server | 2 +- k8s/document_root_sslip.io/index.html | 2 +- spec/check-dns_spec.rb | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/bin/make_all b/bin/make_all index b2cfda9..8976a32 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.2 \ +ldflags="-X xip/xip.VersionSemantic=2.5.3 \ -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \ -X xip/xip.VersionGitHash=$(git rev-parse --short HEAD)" export GOOS GOARCH diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index 1602a38..075289d 100644 --- a/docs/DEVELOPER.md +++ b/docs/DEVELOPER.md @@ -1,11 +1,11 @@ -## Updating BOSH Releases +## Release Procedure -These instructions are meant primarily for me when deploying a new BOSH release; +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.1 -export VERSION=2.5.2 +export OLD_VERSION=2.5.2 +export VERSION=2.5.3 cd ~/workspace/sslip.io git pull -r --autostash # update the version number for the TXT record for version.status.sslip.io @@ -16,15 +16,12 @@ sed -i '' "s/$OLD_VERSION/$VERSION/g" \ sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" \ k8s/document_root_sslip.io/index.html \ k8s/Dockerfile-sslip.io-dns-server -# update the git hash for the TXT record for version.status.sslip.io for BOSH release -sed -i '' "s/VersionGitHash=[0-9a-fA-F]*/VersionGitHash=$(git rev-parse --short HEAD)/g" \ - bosh-release/packages/sslip.io-dns-server/packaging bin/make_all # Start the server, assuming macOS M1. Adjust path for GOOS, GOARCH. Linux requires `sudo` bin/sslip.io-dns-server-darwin-arm64 # In another window export DNS_SERVER_IP=127.0.0.1 -export VERSION=2.5.2 +export VERSION=2.5.3 # quick sanity test dig +short 127.0.0.1.example.com @$DNS_SERVER_IP echo 127.0.0.1 diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server index 85dfcc8..2341f75 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.2/sslip.io-dns-server-linux-$TARGETARCH \ +RUN wget https://github.com/cunnie/sslip.io/releases/download/2.5.3/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 3c1d619..1268a01 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.2/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/2.5.3/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 fb7907d..82d5be5 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.2'
+sslip_version = '2.5.3'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do