Fix RBE testing (#1862)

Author: palfrey

.github/workflows/main.yaml

@@ -43,6 +43,7 @@ jobs:
         DOCKERFILE_HASH=$(sha256sum "$GITHUB_WORKSPACE/tools/toolchain-nativelink/Dockerfile" | awk '{print $1}')
         IMAGE_DETAILS=$(aws ecr describe-images --repository-name ${{ secrets.RBE_ECR_REPOSITORY_NAME }} --image-ids imageTag=$DOCKERFILE_HASH)
         if [ $? -ne 0 ]; then
+          echo "Run tools/toolchain-nativelink/toolchain-nativelink.sh locally and upload a new version of the stock image"
           exit 1;
         fi
         echo "RBE_IMAGE=${{ secrets.RBE_ECR_AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.RBE_ECR_AWS_ACCOUNT_REGION }}.amazonaws.com/${{ secrets.RBE_ECR_REPOSITORY_NAME }}:$DOCKERFILE_HASH" >> $GITHUB_ENV

tools/toolchain-nativelink/Dockerfile

@@ -24,8 +24,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
     python3=3.10.6-1~22.04 \
     python3-minimal=3.10.6-1~22.04 \
     libpython3-stdlib=3.10.6-1~22.04 \
-    curl=7.81.0-1ubuntu1.17 \
-    ca-certificates=20230311ubuntu0.22.04.1 \
+    curl=7.81.0-1ubuntu1.20 \
+    ca-certificates=20240203~22.04.1 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

tools/toolchain-nativelink/toolchain-nativelink.sh

@@ -2,11 +2,11 @@
 
 set -xeuo pipefail
 
-ECR=${ECR:?Error: ECR is not set}
+ECR=${ECR:-299166832260}
 ECR_PROFILE=${ECR_PROFILE:?Error: ECR_PROFILE is not set}
-ECR_USER=${ECR_USER:?Error: ECR_USER is not set}
-ECR_REGION=${ECR_REGION:?Error: ECR_REGION is not set}
-BUILDX_NO_CACHE=${BUILDX_NO_CACHE:-true}
+ECR_USER=${ECR_USER:-AWS}
+ECR_REGION=${ECR_REGION:-us-east-2}
+BUILDX_NO_CACHE=${BUILDX_NO_CACHE:-false}
 
 function ecr_login() {
     aws ecr get-login-password --profile "${ECR_PROFILE}" --region "${ECR_REGION}" | docker login --username "${ECR_USER}" --password-stdin "${ECR}.dkr.ecr.${ECR_REGION}.amazonaws.com"
@@ -23,7 +23,7 @@ else
 fi
 
 # Build the Docker image and tag it with the hash
-docker buildx build --no-cache="${BUILDX_NO_CACHE}" --platform linux/amd64 -t "${ECR}.dkr.ecr.${ECR_REGION}.amazonaws.com/nativelink-rbe:$IMAGE_TAG" -f 'Dockerfile' .
+docker buildx build --no-cache="${BUILDX_NO_CACHE}" --platform linux/amd64 -t "${ECR}.dkr.ecr.${ECR_REGION}.amazonaws.com/nativelink-rbe:$IMAGE_TAG" --load -f 'Dockerfile' .
 
 ecr_login
 docker push "${ECR}.dkr.ecr.${ECR_REGION}.amazonaws.com/nativelink-rbe:$IMAGE_TAG"