From a07613a42bc4263506ac6854c61f22bff9ce6e65 Mon Sep 17 00:00:00 2001
From: Alireza Mortezaei <amortezaei@twilio.com>
Date: Wed, 22 Mar 2023 15:16:51 -0400
Subject: [PATCH 1/3] added make to the image

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c1f66d92..f4bba7a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,9 @@ FROM scratch
 COPY --from=builder \
     /go/src/github.com/segmentio/topicctl/build/topicctl \
     /bin/topicctl
+
+COPY --from=builder \
+    /usr/bin/make \
+    /bin/make
+
 ENTRYPOINT ["/bin/topicctl"]

From 26233e0bb44d795181b5039ca20e01871fe68de4 Mon Sep 17 00:00:00 2001
From: Alireza Mortezaei <amortezaei@twilio.com>
Date: Wed, 22 Mar 2023 15:19:57 -0400
Subject: [PATCH 2/3] publishing test-make image

---
 .github/workflows/ci.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 44329a7b..148a5607 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -229,7 +229,7 @@ jobs:
   publish-ghcr:
     needs: [setup, snyk]
     runs-on: ubuntu-latest
-    if: ${{ ( github.ref_type == 'branch' ) && (( github.ref_name == 'master' ) || ( github.ref_name == 'v0' )) }}
+    if: ${{ ( github.ref_type == 'branch' ) && (( github.ref_name == 'master' ) || ( github.ref_name == 'v0' ) || ( github.ref_name == 'DP-556-add-make-to-topcctl-image' )) }}
     steps:
     - uses: actions/checkout@v3
     - name: setup env variables
@@ -266,6 +266,16 @@ jobs:
           --build-arg VERSION=${SHORT_SHA} \
           --push \
           .
+    - if: ${{ github.ref_name == 'DP-556-add-make-to-topcctl-image' }}
+      name: Build and push image for DP-556-add-make-to-topcctl-image
+      run:  |
+        docker context create buildx-build
+        docker buildx create --use buildx-build
+        docker buildx build \
+          -t ghcr.io/segmentio/topicctl:test-make \
+          --build-arg VERSION=${SHORT_SHA} \
+          --push \
+          .
     - run: echo "GHCR PUBLISH SUCCESSFUL"
 
   publish-dockerhub:

From f1f48874758792590c65dfa6f23fbf6564c63725 Mon Sep 17 00:00:00 2001
From: Alireza Mortezaei <amortezaei@twilio.com>
Date: Wed, 22 Mar 2023 21:05:37 -0400
Subject: [PATCH 3/3] test make 4

---
 .github/.DS_Store        | Bin 0 -> 6148 bytes
 .github/workflows/ci.yml | 237 +--------------------------------------
 Dockerfile               |   6 +-
 3 files changed, 2 insertions(+), 241 deletions(-)
 create mode 100644 .github/.DS_Store

diff --git a/.github/.DS_Store b/.github/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4dbde35281363279e5063fbb3dcc870665921ba9
GIT binary patch
literal 6148
zcmeHK%}T>S5T0$TO(;SS3OxqA7HsPeh?h|73mDOZN=-=B(3mYvYYwH5v%Zi|;`2DO
zyAew(coMNQF#FBUPnP{Q><<8l?lf!z)B(UkB`n$4tPqNmE=kFF2!;B_J;Wd(gEYvN
zvf1$$8KAYZam6HzVF+K=FC7K33^4i@jN&Mrv|8_?RIY4nR;{X4vu?ddnRyd`GEKYw
z_?mhbQpQ1H`@v;2$olo|Q<+TsC>e}ZK@<)!<>o3%LYZ~tGzn8x>*;`HTXw(Rn9bUq
zR@3Pmw&qP|c1-rc{?UAHTRXdZC+GcP{FKNSO{c&=Psx_S0$$NrF|%iHoWwGDz-Uof
zR4_6F%m6d6E)1Cc&#JA<gn6FK05kAo255h9Pzhawxkj~hU_;kOidP6p(5ANpp<~cB
zm}|rciqNHqx>T4ahS25ccTApZFxRNdL8y`OJ7#2IUMND1j($g_gK#x+%M36Biwu-?
zw@&B(+4t}N#Uk!81I)m`Vn9@SUayN&GH2`3<mjw*Q14JlC@<IeS%QW-iZPdt;s&Y`
Z^gCoAx(0KN=t1F&fTDpLX5d#D_yC-MP09cO

literal 0
HcmV?d00001

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 148a5607..0a2a8cde 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,213 +21,8 @@ jobs:
         echo github.ref_type=${{ github.ref_type }}
         echo release-ref=${{ steps.regex-match.outputs.match }}
 
-  test010:
-    runs-on: ubuntu-latest
-    container:
-      image: cimg/go:1.19
-      env:
-        GO111MODULE: "on"
-        KAFKA_TOPICS_TEST_ZK_ADDR: zookeeper:2181
-        KAFKA_TOPICS_TEST_KAFKA_ADDR: kafka1:9092
-    steps:
-    - name: Check out repository code 
-      uses: actions/checkout@v3
-    - name: Go setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.19
-    - name: Display Go version
-      run: go version
-    - name: Run tests
-      run: make test
-      env:
-        KAFKA_TOPICS_TEST_ZK_ADDR: zookeeper:2181
-        KAFKA_TOPICS_TEST_KAFKA_ADDR: kafka1:9092
-
-    services:
-      zookeeper:
-        image: wurstmeister/zookeeper
-        ports:
-          - "2181:2181"
-
-      kafka1:
-        image: wurstmeister/kafka:2.11-0.10.2.2
-        ports:
-          - "9092:9092"
-        env:
-          KAFKA_BROKER_ID: 1
-          KAFKA_BROKER_RACK: zone1
-          KAFKA_ADVERTISED_HOST_NAME: kafka1
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka2:
-        image: wurstmeister/kafka:2.11-0.10.2.2
-        ports:
-          - "9093:9092"
-        env:
-          KAFKA_BROKER_ID: 2
-          KAFKA_BROKER_RACK: zone1
-          KAFKA_ADVERTISED_HOST_NAME: kafka2
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka3:
-        image: wurstmeister/kafka:2.11-0.10.2.2
-        ports:
-          - "9094:9092"
-        env:
-          KAFKA_BROKER_ID: 3
-          KAFKA_BROKER_RACK: zone2
-          KAFKA_ADVERTISED_HOST_NAME: kafka3
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka4:
-        image: wurstmeister/kafka:2.11-0.10.2.2
-        ports:
-          - "9095:9092"
-        env: 
-          KAFKA_BROKER_ID: 4
-          KAFKA_BROKER_RACK: zone2
-          KAFKA_ADVERTISED_HOST_NAME: kafka4
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka5:
-        image: wurstmeister/kafka:2.11-0.10.2.2
-        ports:
-          - "9096:9092"
-        env: 
-          KAFKA_BROKER_ID: 5
-          KAFKA_BROKER_RACK: zone3
-          KAFKA_ADVERTISED_HOST_NAME: kafka5
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka6:
-        image: wurstmeister/kafka:2.11-0.10.2.2
-        ports:
-          - "9097:9092"
-        env: 
-          KAFKA_BROKER_ID: 6
-          KAFKA_BROKER_RACK: zone3
-          KAFKA_ADVERTISED_HOST_NAME: kafka6
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-
-  test241:
-    runs-on: ubuntu-latest
-    container:
-      image: cimg/go:1.19
-      env:
-        GO111MODULE: "on"
-        KAFKA_TOPICS_TEST_ZK_ADDR: zookeeper:2181
-        KAFKA_TOPICS_TEST_KAFKA_ADDR: kafka1:9092
-    steps:
-    - name: Check out repository code 
-      uses: actions/checkout@v3
-    - name: Go setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.19
-    - name: Display Go version
-      run: go version
-    - name: Run tests
-      run: make test-v2
-      env:
-        KAFKA_TOPICS_TEST_ZK_ADDR: zookeeper:2181
-        KAFKA_TOPICS_TEST_KAFKA_ADDR: kafka1:9092
-
-    services:
-      zookeeper:
-        image: wurstmeister/zookeeper
-        ports:
-          - "2181:2181"
-
-      kafka1:
-        image: wurstmeister/kafka:2.12-2.4.1
-        ports:
-          - "9092:9092"
-        env:
-          KAFKA_BROKER_ID: 1
-          KAFKA_BROKER_RACK: zone1
-          KAFKA_ADVERTISED_HOST_NAME: kafka1
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka2:
-        image: wurstmeister/kafka:2.12-2.4.1
-        ports:
-          - "9093:9092"
-        env:
-          KAFKA_BROKER_ID: 2
-          KAFKA_BROKER_RACK: zone1
-          KAFKA_ADVERTISED_HOST_NAME: kafka2
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka3:
-        image: wurstmeister/kafka:2.12-2.4.1
-        ports:
-          - "9094:9092"
-        env:
-          KAFKA_BROKER_ID: 3
-          KAFKA_BROKER_RACK: zone2
-          KAFKA_ADVERTISED_HOST_NAME: kafka3
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka4:
-        image: wurstmeister/kafka:2.12-2.4.1
-        ports:
-          - "9095:9092"
-        env: 
-          KAFKA_BROKER_ID: 4
-          KAFKA_BROKER_RACK: zone2
-          KAFKA_ADVERTISED_HOST_NAME: kafka4
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka5:
-        image: wurstmeister/kafka:2.12-2.4.1
-        ports:
-          - "9096:9092"
-        env: 
-          KAFKA_BROKER_ID: 5
-          KAFKA_BROKER_RACK: zone3
-          KAFKA_ADVERTISED_HOST_NAME: kafka5
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-      kafka6:
-        image: wurstmeister/kafka:2.12-2.4.1
-        ports:
-          - "9097:9092"
-        env: 
-          KAFKA_BROKER_ID: 6
-          KAFKA_BROKER_RACK: zone3
-          KAFKA_ADVERTISED_HOST_NAME: kafka6
-          KAFKA_ADVERTISED_PORT: 9092
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-  
-  
-  snyk:
-    runs-on: ubuntu-latest
-    needs: [test010, test241]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Run Snyk to check for vulnerabilities
-      uses: snyk/actions/golang@master
-      env:
-        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-      with:
-        args: --severity-threshold=high --fail-on=upgradable
-  
-  
   publish-ghcr:
-    needs: [setup, snyk]
+    needs: [setup]
     runs-on: ubuntu-latest
     if: ${{ ( github.ref_type == 'branch' ) && (( github.ref_name == 'master' ) || ( github.ref_name == 'v0' ) || ( github.ref_name == 'DP-556-add-make-to-topcctl-image' )) }}
     steps:
@@ -277,33 +72,3 @@ jobs:
           --push \
           .
     - run: echo "GHCR PUBLISH SUCCESSFUL"
-
-  publish-dockerhub:
-    needs: [setup, snyk]
-    environment: CICD
-    env: 
-      RELEASE_TAG: ${{ needs.setup.outputs.version-tag }}
-    runs-on: ubuntu-latest
-    if: ${{ ( github.ref_type == 'tag' ) && ( needs.setup.outputs.version-tag != '') }}
-    steps:
-    - uses: actions/checkout@v3
-    - run: echo "publishing the release version segment/topicctl:${RELEASE_TAG}"
-    - name: Dockerhub login
-      uses: docker/login-action@v2
-      with:
-        username: ${{ vars.DOCKERHUB_USER }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-        logout: true
-    - run: echo "DOCKERHUB LOGIN SUCCESSFUL"
-    - name: Build and push image
-      run:  |
-            docker context create buildx-build
-            docker buildx create --use buildx-build
-            docker buildx build \
-              --platform=linux/amd64,linux/arm64 \
-              -t segment/topicctl:${RELEASE_TAG} \
-              -t segment/topicctl:latest \
-              --build-arg VERSION=${RELEASE_TAG} \
-              --push \
-              .
-    - run: echo "DOCKERHUB PUBLISH SUCCESSFUL"
diff --git a/Dockerfile b/Dockerfile
index f4bba7a8..fefc8a38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,14 +11,10 @@ ARG TARGETOS TARGETARCH
 RUN cd /go/src/${SRC} && \
     GOOS=$TARGETOS GOARCH=$TARGETARCH make topicctl VERSION=${VERSION}
 
-FROM scratch
+FROM alpine:3
 
 COPY --from=builder \
     /go/src/github.com/segmentio/topicctl/build/topicctl \
     /bin/topicctl
 
-COPY --from=builder \
-    /usr/bin/make \
-    /bin/make
-
 ENTRYPOINT ["/bin/topicctl"]