Skip to content

Commit b40f3bb

Browse files
authored
fix(CI): Update Ubuntu Docker Images for AWS-LC (#767)
1 parent 896491e commit b40f3bb

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

codebuild/bin/install-shared-deps-awslc.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ export NUM_CPU_THREADS=$(nproc)
1717

1818
function download_awslc() {
1919
AWSLC_GIT_URL='https://github.com/awslabs/aws-lc.git'
20-
AWSLC_TAG='v1.5.0'
20+
AWSLC_TAG='main'
21+
AWSLC_SHALLOW_SINCE="2023-04-07T00:00:01"
2122
rm -rf ${AWSLC_SRC_DIR}
2223
mkdir -p ${AWSLC_SRC_DIR}
23-
git clone --depth 1 --branch ${AWSLC_TAG} "${AWSLC_GIT_URL}" "${AWSLC_SRC_DIR}"
24+
git clone --shallow-since ${AWSLC_SHALLOW_SINCE} --branch ${AWSLC_TAG} "${AWSLC_GIT_URL}" "${AWSLC_SRC_DIR}"
2425
}
2526

2627
function build_awslc() {

codebuild/bin/push-docker.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818

1919
set -euxo pipefail
2020

21-
ECS_REGISTRY=${ECS_REGISTRY:-636124823696.dkr.ecr.us-west-2.amazonaws.com/linux-docker-images}
22-
23-
$(aws ecr get-login --no-include-email --region us-west-2)
21+
ECS_SERVER="636124823696.dkr.ecr.us-west-2.amazonaws.com"
22+
ECS_REGISTRY=${ECS_REGISTRY:-${ECS_SERVER}/linux-docker-images}
23+
_AUTH_TOKEN=`aws ecr get-login-password --region us-west-2`
24+
docker login --password ${_AUTH_TOKEN} --username AWS ${ECS_SERVER}
2425

2526
build_image() {
2627
docker build -t $1 -f $1.Dockerfile .
2728
docker tag $1:latest $ECS_REGISTRY:$1
2829
docker push $ECS_REGISTRY:$1
2930
}
3031

31-
build_image trusty-gcc4x-x64
32-
build_image trusty-gcc4x-x86
3332
build_image ubuntu-latest-x64
33+
build_image ubuntu-latest-x64-awslc

codebuild/ubuntu-latest-x64-awslc.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ RUN dpkg -i /tmp/net-tools_*.deb /tmp/netcat-*.deb
1010

1111
ADD bin/setup-apt-cache.sh /usr/local/bin/
1212
ADD bin/setup-apt.sh /usr/local/bin/
13+
1314
RUN setup-apt-cache.sh
15+
ARG EXTRA_PACKAGES="clang perl golang"
1416
RUN setup-apt.sh
1517

1618
ENV PATH=/usr/local/bin:/usr/bin:/bin

0 commit comments

Comments
 (0)