From 0402cc16bfbaa392b4fbb4c17e1e88942fd28bb5 Mon Sep 17 00:00:00 2001
From: 99 <nserebryakova@hashicorp.com>
Date: Thu, 28 Oct 2021 22:22:38 -0700
Subject: [PATCH] PR fixes

---
 .github/workflows/build.yml | 7 +++----
 Dockerfile                  | 4 ----
 Makefile                    | 3 ---
 3 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 Makefile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 04a99c42ae..ca252ede7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,8 +4,8 @@ on:
   push:
     # Sequence of patterns matched against refs/heads
     branches:
-      # Push events on crt-consul-migration branch
-      - release/1.11.x
+      # Provide the release branch
+
 env:
   PKG_NAME: consul
 
@@ -22,8 +22,7 @@ jobs:
       - name: get product version
         id: get-product-version
         run: |
-          build-support/scripts/version.sh -r
-          IFS="-"; OUTPUT=$(make -f Makefile version);
+          IFS="-"; OUTPUT=$(build-support/scripts/version.sh -r);
           read -a V <<< "$OUTPUT"; unset IFS;
 
           VERSION=${V[0]}
diff --git a/Dockerfile b/Dockerfile
index 6df3022117..71bf188117 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,10 +35,6 @@ RUN mkdir -p /consul/data && \
     mkdir -p /consul/config && \
     chown -R consul:consul /consul
 
-# set up nsswitch.conf for Go's "netgo" implementation which is used by Consul,
-# otherwise DNS supercedes the container's hosts file, which we don't want.
-#RUN test -e /etc/nsswitch.conf || echo 'hosts: files dns' > /etc/nsswitch.conf
-
 # Expose the consul data directory as a volume since there's mutable state in there.
 VOLUME /consul/data
 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 33409e617c..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-version:
-	@build-support/scripts/version.sh -r
-.PHONY: version