Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

job-builder: add amazon-ecr-credential-helper to the job builder #723

Merged
merged 3 commits into from
Feb 22, 2022
Merged

job-builder: add amazon-ecr-credential-helper to the job builder #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6efb333
job-builder: add amazon-ecr-credential-helper to the job builder
tpalashki Feb 21, 2022
bf003d7
increment the builder version
tpalashki Feb 21, 2022
bb0ab34
Merge branch 'main' into person/tpalashki/job-builder
mivanov1988 Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion projects/control-service/projects/job-builder-rootless/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,21 @@ RUN chmod +x /build_image.sh

# Setup Python and Git
## Update & Install dependencies
## go and make are used to build amazon-ecr-credential-helper (see below)
RUN apk add --no-cache --update \
git \
bash
bash \
go \
make

# pull and build amazon-ecr-credential-helper; it is required to authenticate to ecr when pushing images
RUN git clone https://github.com/awslabs/amazon-ecr-credential-helper.git \
&& cd amazon-ecr-credential-helper \
&& make \
&& mv bin/local/docker-credential-ecr-login /usr/local/bin \
&& chmod +x /usr/local/bin/docker-credential-ecr-login \
&& cd .. \
&& rm amazon-ecr-credential-helper/ -rf

RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/main python3=3.7.10-r0 py3-pip \
&& pip3 install -U pip \
Expand Down
2 changes: 1 addition & 1 deletion projects/control-service/projects/job-builder-rootless/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.1dev2
1.3.2