Merge pull request confidential-containers#405 from mythi/golang

drop Golang from builds
BbolroC · Jun 12, 2024 · 7b986f7 · 7b986f7
2 parents 3dfbfb3 + f14e08d
commit 7b986f7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 47 deletions.
diff --git a/.github/workflows/kbs-e2e.yaml b/.github/workflows/kbs-e2e.yaml
@@ -36,10 +36,6 @@ jobs:
         profile: minimal
         toolchain: ${{ env.RUSTC_VERSION }}
 
-    - uses: actions/setup-go@v5
-      with:
-        go-version: stable
-
     - name: Set up rust build cache
       uses: actions/cache@v4
       continue-on-error: false

diff --git a/attestation-service/Dockerfile.as-grpc b/attestation-service/Dockerfile.as-grpc
@@ -7,19 +7,13 @@ FROM rust:latest as builder
 WORKDIR /usr/src/attestation-service
 COPY . .
 
-# Install golang
-RUN wget https://go.dev/dl/go1.20.1.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz
-
-ENV PATH="/usr/local/go/bin:${PATH}"
-
 # Install TPM Build Dependencies
 RUN apt-get update && apt-get install -y protobuf-compiler clang libtss2-dev
 
 # Install TDX Build Dependencies
 RUN curl -L https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | tee intel-sgx-deb.key | apt-key add - && \
-    echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
-    apt-get update && apt-get install -y libtdx-attest-dev libsgx-dcap-quote-verify-dev
+    echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
+    apt-get update && apt-get install -y libsgx-dcap-quote-verify-dev
 
 # Build and Install gRPC attestation-service
 RUN cargo install --path attestation-service/attestation-service --bin grpc-as --features grpc-bin --locked
@@ -34,7 +28,7 @@ RUN apt-get update && apt-get install curl gnupg openssl -y && \
     rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
 
 RUN curl -L https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | tee intel-sgx-deb.key | apt-key add - && \
-    echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
+    echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
     apt-get update && \
     apt-get install -y libsgx-dcap-default-qpl libsgx-dcap-quote-verify && \
     rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*

diff --git a/attestation-service/Dockerfile.as-restful b/attestation-service/Dockerfile.as-restful
@@ -7,19 +7,13 @@ FROM rust:latest as builder
 WORKDIR /usr/src/attestation-service
 COPY . .
 
-# Install golang
-RUN wget https://go.dev/dl/go1.20.1.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz
-
-ENV PATH="/usr/local/go/bin:${PATH}"
-
 # Install TPM Build Dependencies
 RUN apt-get update && apt-get install -y protobuf-compiler clang libtss2-dev
 
 # Install TDX Build Dependencies
 RUN curl -L https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | tee intel-sgx-deb.key | apt-key add - && \
-    echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
-    apt-get update && apt-get install -y libtdx-attest-dev libsgx-dcap-quote-verify-dev
+    echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
+    apt-get update && apt-get install -y libsgx-dcap-quote-verify-dev
 
 # Build and Install RESTful attestation-service
 RUN cargo install --path attestation-service/attestation-service --bin restful-as --features restful-bin --locked
@@ -33,7 +27,7 @@ RUN apt-get update && apt-get install curl gnupg openssl -y && \
     rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
 
 RUN curl -L https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | tee intel-sgx-deb.key | apt-key add - && \
-    echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
+    echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
     apt-get update && \
     apt-get install -y libsgx-dcap-default-qpl libsgx-dcap-quote-verify && \
     rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*

diff --git a/attestation-service/tests/e2e/Makefile b/attestation-service/tests/e2e/Makefile
@@ -27,7 +27,6 @@ install-dependencies:
 		protobuf-compiler \
 		clang \
 		libtss2-dev \
-		libtdx-attest-dev \
 		libsgx-dcap-quote-verify-dev \
 		libsgx-dcap-default-qpl
 

diff --git a/kbs/docker/Dockerfile b/kbs/docker/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && \
 
 RUN curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | \
     gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg && \
-    echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main' | \
+    echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | \
     tee /etc/apt/sources.list.d/intel-sgx.list && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -29,10 +29,6 @@ RUN curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.k
     libsgx-dcap-quote-verify-dev \
     libtdx-attest-dev
 
-RUN wget https://go.dev/dl/go1.20.1.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz
-ENV PATH="/usr/local/go/bin:${PATH}"
-
 # Build and Install KBS
 WORKDIR /usr/src/kbs
 COPY . .

diff --git a/kbs/docker/Dockerfile.coco-as-grpc b/kbs/docker/Dockerfile.coco-as-grpc
@@ -3,11 +3,7 @@ FROM rust:latest as builder
 WORKDIR /usr/src/kbs
 COPY . .
 
-RUN apt-get update && apt install -y protobuf-compiler wget git
-
-RUN wget https://go.dev/dl/go1.20.1.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz
-ENV PATH="/usr/local/go/bin:${PATH}"
+RUN apt-get update && apt install -y protobuf-compiler git
 
 # Build and Install KBS
 RUN cargo install --path kbs/src/kbs --no-default-features --features coco-as-grpc,resource,opa,rustls

diff --git a/kbs/docker/Dockerfile.intel-trust-authority b/kbs/docker/Dockerfile.intel-trust-authority
@@ -3,11 +3,7 @@ FROM rust:latest as builder
 WORKDIR /usr/src/kbs
 COPY . .
 
-RUN apt-get update && apt install -y wget git
-
-RUN wget https://go.dev/dl/go1.20.1.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz
-ENV PATH="/usr/local/go/bin:${PATH}"
+RUN apt-get update && apt install -y git
 
 # Build and Install KBS
 RUN cargo install --path kbs/src/kbs --no-default-features --features intel-trust-authority-as,rustls,resource,opa
@@ -18,6 +14,4 @@ LABEL org.opencontainers.image.source="https://github.com/confidential-container
 
 RUN apt update && apt install -y ca-certificates
 
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libssl.so.1.1 /usr/lib/x86_64-linux-gnu/libssl.so.1.1
-COPY --from=builder /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
 COPY --from=builder /usr/local/cargo/bin/kbs /usr/local/bin/kbs
diff --git a/kbs/quickstart.md b/kbs/quickstart.md
@@ -13,13 +13,6 @@ curl https://sh.rustup.rs -sSf | sh
 source "$HOME/.cargo/env"
 ```
 
-In order to compile some Go components (e.g. the OPA policy engine), install
-the Go compiler (>= 1.20):
-```shell
-sudo apt-get install -y golang-1.20
-export PATH=/usr/lib/go-1.20/bin:$PATH
-```
-
 Install dependencies:
 ```shell
 curl -L "https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key" | sudo apt-key add -