File tree Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -17,10 +17,11 @@ export NUM_CPU_THREADS=$(nproc)
1717
1818function 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
2627function build_awslc() {
Original file line number Diff line number Diff line change 1818
1919set -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
2526build_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
3332build_image ubuntu-latest-x64
33+ build_image ubuntu-latest-x64-awslc
Original file line number Diff line number Diff line change @@ -10,7 +10,9 @@ RUN dpkg -i /tmp/net-tools_*.deb /tmp/netcat-*.deb
1010
1111ADD bin/setup-apt-cache.sh /usr/local/bin/
1212ADD bin/setup-apt.sh /usr/local/bin/
13+
1314RUN setup-apt-cache.sh
15+ ARG EXTRA_PACKAGES="clang perl golang"
1416RUN setup-apt.sh
1517
1618ENV PATH=/usr/local/bin:/usr/bin:/bin
You can’t perform that action at this time.
0 commit comments