BOSH release: 2.2.4: Deprecate nono.io nameservers

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.2.3 \
+ldflags="-X xip/xip.VersionSemantic=2.2.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

bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml

@@ -11,6 +11,10 @@ builds:
     version: 11ca4e8219df8887655a3aa2c81c3008a2179b9259ca9e735e51aeb1cc874efb
     blobstore_id: 19c01669-1c49-425d-4563-ed07fc743ef7
     sha1: sha256:6127b6a56bfcba2eaf856972f1463cd262287b99e3c9a369ba084afbedbb1ae9
+  2d0c8440df4fe3802b65e2315024de087f528e6fd57fb92d289918f888753a52:
+    version: 2d0c8440df4fe3802b65e2315024de087f528e6fd57fb92d289918f888753a52
+    blobstore_id: 3d87815d-494e-4d25-4073-21c2bc9a20c0
+    sha1: sha256:fe5ee9fc90d1ddc4f56974aa7f74264566b4b03884da4ff07d634ffaa7dffb93
   2da04cb692557030ff9dd8ac08886d38aed0ea612963588e124928c187dc825a:
     version: 2da04cb692557030ff9dd8ac08886d38aed0ea612963588e124928c187dc825a
     blobstore_id: 221ddfff-f5ba-4454-6e35-6e7472e40667

bosh-release/packages/sslip.io-dns-server/packaging

@@ -5,9 +5,9 @@ source /var/vcap/packages/golang-1-linux/bosh/compile.env
 mkdir src ${BOSH_INSTALL_TARGET}/bin
 mv sslip.io-dns-server/{go.*,main.go,xip} src/
 cd src/
-ldflags="-X xip/xip.VersionSemantic=2.2.3 \
+ldflags="-X xip/xip.VersionSemantic=2.2.4 \
          -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \
-         -X xip/xip.VersionGitHash=b0f6805"
+         -X xip/xip.VersionGitHash=4b0bd69"
 go build \
     -ldflags="$ldflags" \
     -o ${BOSH_INSTALL_TARGET}/bin/sslip.io-dns-server

bosh-release/releases/sslip.io/index.yml

@@ -33,6 +33,8 @@ builds:
     version: 1.1.2
   d1f0f246-7316-49b9-7620-e9900d9e791e:
     version: 1.1.0
+  d76a20a2-10bd-4a94-73b9-0414534e0721:
+    version: 2.2.4
   dbbd518f-f17e-4f92-4878-327817590ec8:
     version: 2.2.3
 format-version: "2"

bosh-release/releases/sslip.io/sslip.io-2.2.4.yml

@@ -0,0 +1,23 @@
+name: sslip.io
+version: 2.2.4
+commit_hash: 3df0e60
+uncommitted_changes: false
+jobs:
+- name: sslip.io-dns-server
+  version: 308acb7c186a042bc2ca4c28b83c9fe7589a64c48ab6a11869c442bcaea8fdf9
+  fingerprint: 308acb7c186a042bc2ca4c28b83c9fe7589a64c48ab6a11869c442bcaea8fdf9
+  sha1: sha256:6ca6f2c11816a82ecb3cf9300ea59369977cbaa7c39eddca35628a7c6b9b5b45
+  packages:
+  - sslip.io-dns-server
+packages:
+- name: golang-1-linux
+  version: 92655dbac2d36906f0d761ab03f2eb6bfa9a22730d8f1591a1acb7a6de875ed4
+  fingerprint: 92655dbac2d36906f0d761ab03f2eb6bfa9a22730d8f1591a1acb7a6de875ed4
+  sha1: sha256:e09c7eb7e88462113fdf2095d1ab0d4b9aed0dfd26cdda19744a47f006f6fe7c
+  dependencies: []
+- name: sslip.io-dns-server
+  version: 2d0c8440df4fe3802b65e2315024de087f528e6fd57fb92d289918f888753a52
+  fingerprint: 2d0c8440df4fe3802b65e2315024de087f528e6fd57fb92d289918f888753a52
+  sha1: sha256:fe5ee9fc90d1ddc4f56974aa7f74264566b4b03884da4ff07d634ffaa7dffb93
+  dependencies:
+  - golang-1-linux

docs/DEVELOPER.md

@@ -4,8 +4,8 @@ These instructions are meant primarily for me when deploying a new BOSH release;
 they might not make sense unless you're on my workstation.
 
 ```bash
-export OLD_VERSION=2.2.2
-export VERSION=2.2.3
+export OLD_VERSION=2.2.3
+export VERSION=2.2.4
 cd ~/workspace/sslip.io
 git pull -r --autostash
 # update the version number for the TXT record for version.sslip.io
@@ -32,7 +32,7 @@ IP=10.0.250.3
 dig +short 127.0.0.1.example.com @$IP
 echo 127.0.0.1
 dig +short ns example.com @$IP
-printf "ns-aws.nono.io.\nns-azure.nono.io.\nns-gce.nono.io.ns-aws.sslip.io.\nns-azure.sslip.io.\nns-gce.sslip.io.\n"
+printf "ns-aws.sslip.io.\nns-azure.sslip.io.\nns-gce.sslip.io.\n"
 dig +short mx example.com @$IP
 echo "0 example.com."
 dig +short mx sslip.io @$IP
@@ -51,8 +51,10 @@ dig @$IP txt ip.sslip.io +short | tr -d '"'
 curl curlmyip.org; echo
 dig @$IP txt version.sslip.io +short | grep $VERSION
 echo "\"$VERSION\""
+pushd ..
 git add -p
-git ci -vm"BOSH release: $VERSION: Include sslip.io nameservers"
+git ci -vm"BOSH release: $VERSION: Deprecate nono.io nameservers"
+popd
 bosh upload-blobs
 bosh create-release \
   --final \

k8s/Dockerfile-sslip.io-dns-server

@@ -26,7 +26,7 @@ LABEL maintainer="brian.cunnie@gmail.com"
 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.2.3/sslip.io-dns-server-linux-$TARGETARCH \
+RUN wget https://github.com/cunnie/sslip.io/releases/download/2.2.4/sslip.io-dns-server-linux-$TARGETARCH \
     -O /usr/sbin/sslip.io-dns-server; \
   chmod 755 /usr/sbin/sslip.io-dns-server
 

k8s/document_root/index.html

@@ -156,7 +156,7 @@ src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]-->
       example, we install & run our server within a docker container:</p>
       <pre>
 docker run -it --rm fedora
-curl -L https://github.com/cunnie/sslip.io/releases/download/2.2.3/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/2.2.4/sslip.io-dns-server-linux-amd64 -o dns-server
 chmod +x dns-server
 ./dns-server 2&gt; dns-server.log &
 dnf install -y bind-utils

spec/check-dns_spec.rb

@@ -18,7 +18,7 @@ def get_whois_nameservers(domain)
 end
 
 domain = ENV['DOMAIN'] || 'example.com'
-sslip_version = '2.2.3'
+sslip_version = '2.2.4'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do