Upgrade CLI Semaphore Agent to Ubuntu 24 (#3088)

Author: danielayaz

.semaphore/semaphore.yml

@@ -3,7 +3,7 @@ name: Confluent CLI
 
 agent:
   machine:
-    type: s1-prod-ubuntu20-04-amd64-1
+    type: s1-prod-ubuntu24-04-amd64-1
 
 auto_cancel:
   running:
@@ -37,10 +37,7 @@ blocks:
         - name: "Build linux/amd64 (Alpine)"
           commands:
             - checkout
-            - sem-version go $(cat .go-version)
-            - export PATH=$(go env GOPATH)/bin:$PATH
-            - sudo apt install musl-tools --yes
-            - CC=musl-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 GOEXPERIMENT=boringcrypto go build -tags musl -ldflags="-s -w -X main.commit="00000000" -X main.date="1970-01-01T00:00:00Z" -X main.isTest=true" ./cmd/confluent
+            - docker build . --file docker/Dockerfile_alpine_amd64 --tag test-build
       epilogue:
         always:
           commands:
@@ -51,7 +48,7 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-ubuntu20-04-arm64-1
+          type: s1-prod-ubuntu24-04-arm64-1
       jobs:
 # Temporarily disable these builds until rate limiting is resolved
 #        - name: "Build linux/arm64 (GLIBC)"
@@ -61,10 +58,7 @@ blocks:
         - name: "Build linux/arm64 (Alpine)"
           commands:
             - checkout
-            - sem-version go $(cat .go-version)
-            - export PATH=$(go env GOPATH)/bin:$PATH
-            - sudo apt install musl-tools --yes
-            - CC=musl-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 GOEXPERIMENT=boringcrypto go build -tags musl -ldflags="-s -w -X main.commit="00000000" -X main.date="1970-01-01T00:00:00Z" -X main.isTest=true" ./cmd/confluent
+            - docker build . --file docker/Dockerfile_alpine_arm64 --tag test-build
 
   - name: darwin
     dependencies: []

docker/Dockerfile_alpine_amd64

@@ -0,0 +1,22 @@
+FROM --platform=linux/amd64 ubuntu:20.04
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt -y update
+
+RUN apt -y install make git wget musl-tools curl
+
+RUN curl -O -L "https://github.com/sigstore/cosign/releases/download/v2.2.4/cosign_2.2.4_amd64.deb"
+
+RUN dpkg -i cosign_2.2.4_amd64.deb
+
+COPY . /cli/
+
+RUN export GO_VERSION=$(cat /cli/.go-version) && \
+    wget "https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz" && \
+    tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
+
+ENV PATH=${PATH}:/usr/local/go/bin:/root/go/bin
+
+RUN cd /cli/ && \
+    CC=musl-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 GOEXPERIMENT=boringcrypto go build -tags musl -ldflags="-s -w -X main.commit="00000000" -X main.date="1970-01-01T00:00:00Z" -X main.isTest=true" ./cmd/confluent

docker/Dockerfile_alpine_arm64

@@ -0,0 +1,22 @@
+FROM --platform=linux/arm64/v8 ubuntu:20.04
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt -y update
+
+RUN apt -y install make git wget musl-tools curl
+
+RUN curl -O -L "https://github.com/sigstore/cosign/releases/download/v2.2.4/cosign_2.2.4_arm64.deb"
+
+RUN dpkg -i cosign_2.2.4_arm64.deb
+
+COPY . /cli/
+
+RUN export GO_VERSION=$(cat /cli/.go-version) && \
+    wget "https://go.dev/dl/go${GO_VERSION}.linux-arm64.tar.gz" && \
+    tar -C /usr/local -xzf "go${GO_VERSION}.linux-arm64.tar.gz"
+
+ENV PATH=${PATH}:/usr/local/go/bin:/root/go/bin
+
+RUN cd /cli/ && \
+    CC=musl-gcc CGO_LDFLAGS="-static" CGO_ENABLED=1 GOEXPERIMENT=boringcrypto go build -tags musl -ldflags="-s -w -X main.commit="00000000" -X main.date="1970-01-01T00:00:00Z" -X main.isTest=true" ./cmd/confluent

docker/Dockerfile_build_linux_amd64

@@ -1,20 +1,19 @@
+# AlmaLinux 8.10 chosen for current GLIBC requirement of 2.28
 FROM --platform=linux/amd64 almalinux:8.10
 
 SHELL ["/bin/bash", "-c"]
 
 RUN yum -y update
 
-RUN yum -y install make sudo
-
-RUN sudo yum -y install git wget gcc-toolset-9
+RUN yum -y install make git wget gcc-toolset-9
 
 RUN scl enable gcc-toolset-9 bash
 
 COPY . /cli/
 
 RUN export GO_VERSION=$(cat /cli/.go-version) && \
     wget "https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz" && \
-    sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
+    tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
 
 ENV PATH=${PATH}:/usr/local/go/bin:/root/go/bin
 

docker/Dockerfile_build_linux_arm64

@@ -1,20 +1,19 @@
+# AlmaLinux 8.10 chosen for current GLIBC requirement of 2.28
 FROM --platform=linux/arm64/v8 almalinux:8.10
 
 SHELL ["/bin/bash", "-c"]
 
 RUN yum -y update
 
-RUN yum -y install make sudo
-
-RUN sudo yum -y install git wget gcc-toolset-9
+RUN yum -y install make git wget gcc-toolset-9
 
 RUN scl enable gcc-toolset-9 bash
 
 COPY . /cli/
 
 RUN export GO_VERSION=$(cat /cli/.go-version) && \
     wget "https://go.dev/dl/go${GO_VERSION}.linux-arm64.tar.gz" && \
-    sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-arm64.tar.gz"
+    tar -C /usr/local -xzf "go${GO_VERSION}.linux-arm64.tar.gz"
 
 ENV PATH=${PATH}:/usr/local/go/bin:/root/go/bin