From 5f1b16f3004d4ba38d33b1b57e423097947f0129 Mon Sep 17 00:00:00 2001
From: Morgan Funtowicz <funtowiczmo@gmail.com>
Date: Thu, 12 Dec 2024 12:48:58 +0100
Subject: [PATCH] misc(ci): export aws creds as output of step

---
 .github/workflows/build_trtllm.yaml | 1 +
 Dockerfile_trtllm                   | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_trtllm.yaml b/.github/workflows/build_trtllm.yaml
index 4e441b34..0c6438f3 100644
--- a/.github/workflows/build_trtllm.yaml
+++ b/.github/workflows/build_trtllm.yaml
@@ -43,6 +43,7 @@ jobs:
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.AWS_ROLE_GITHUB_TGI_TEST }}
+          output-credentials: true
 
       - name: Initialize Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/Dockerfile_trtllm b/Dockerfile_trtllm
index 4f315b59..a9102678 100644
--- a/Dockerfile_trtllm
+++ b/Dockerfile_trtllm
@@ -76,8 +76,6 @@ ENV LD_LIBRARY_PATH="/usr/local/mpi/lib:$LD_LIBRARY_PATH"
 ENV PKG_CONFIG_PATH="/usr/local/mpi/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 # Retrieve potential build arg for S3 caching
-ENV AWS_ACCESS_KEY_ID ${AWS_ACCESS_KEY_ID}
-ENV AWS_SECRET_ACCESS_KEY ${AWS_SECRET_ACCESS_KEY}
 ENV SCCACHE_BUCKET ${SCCACHE_BUCKET}
 ENV SCCACHE_REGION ${SCCACHE_REGION}
 ENV SCCACHE_S3_KEY_PREFIX ${SCCACHE_S3_KEY_PREFIX}
@@ -85,7 +83,8 @@ ENV SCCACHE_S3_KEY_PREFIX ${SCCACHE_S3_KEY_PREFIX}
 COPY . .
 COPY --from=trt-builder /usr/local/tensorrt /usr/local/tensorrt
 COPY --from=mpi-builder /usr/local/mpi /usr/local/mpi
-RUN mkdir $TGI_INSTALL_PREFIX && mkdir "$TGI_INSTALL_PREFIX/include" && mkdir "$TGI_INSTALL_PREFIX/lib" && \
+RUN --mount=type=secret,id=AWS_ACCESS_KEY_ID,env=${AWS_ACCESS_KEY_ID} --mount=type=secret,id=AWS_SECRET_ACCESS_KEY,env=${AWS_SECRET_ACCESS_KEY} \
+    mkdir $TGI_INSTALL_PREFIX && mkdir "$TGI_INSTALL_PREFIX/include" && mkdir "$TGI_INSTALL_PREFIX/lib" && \
     CMAKE_INSTALL_PREFIX=$TGI_INSTALL_PREFIX cargo build --${BUILD_TYPE} --package text-generation-backends-trtllm --bin text-generation-backends-trtllm
 
 FROM nvidia/cuda:12.6.3-cudnn-runtime-ubuntu24.04 AS runtime