-
Notifications
You must be signed in to change notification settings - Fork 454
CDRIVER-5971 Use Amazon ECR to obtain OCI images in EVG #2058
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.
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
Changes from 4 commits
f0a3b52
49e0004
6bc0ae8
4e8a720
4facc36
de02400
e82983c
ccd8a01
aafc97f
9af26b4
589b9e4
e7786b1
08645e6
2c73cdc
fe67921
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -1,4 +1,4 @@ | ||||||||||
VERSION --arg-scope-and-set --pass-args 0.7 | ||||||||||
VERSION --arg-scope-and-set --pass-args --use-function-keyword 0.7 | ||||||||||
LOCALLY | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add a
Suggested change
(I'm not set on this parameter name, but just an example.) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Chose the name |
||||||||||
|
||||||||||
IMPORT ./tools/ AS tools | ||||||||||
|
@@ -114,7 +114,7 @@ test-cxx-driver: | |||||||||
|
||||||||||
# PREP_CMAKE "warms up" the CMake installation cache for the current environment | ||||||||||
PREP_CMAKE: | ||||||||||
COMMAND | ||||||||||
FUNCTION | ||||||||||
LET scratch=/opt/mongoc-cmake | ||||||||||
# Copy the minimal amount that we need, as to avoid cache invalidation | ||||||||||
COPY tools/use.sh tools/platform.sh tools/paths.sh tools/base.sh tools/download.sh \ | ||||||||||
|
@@ -148,7 +148,7 @@ multibuild: | |||||||||
# release-archive : | ||||||||||
# Create a release archive of the source tree. (Refer to dev docs) | ||||||||||
release-archive: | ||||||||||
FROM alpine:3.20 | ||||||||||
FROM 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/alpine:3.20 | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Parameterize the registry:
Suggested change
and so on for other updated image references There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Replaced all DockerHub-provided image names with |
||||||||||
RUN apk add git bash | ||||||||||
ARG --required prefix | ||||||||||
ARG --required ref | ||||||||||
|
@@ -193,7 +193,7 @@ release-archive: | |||||||||
|
||||||||||
# Obtain the signing public key. Exported as an artifact /c-driver.pub | ||||||||||
signing-pubkey: | ||||||||||
FROM alpine:3.20 | ||||||||||
FROM 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/alpine:3.20 | ||||||||||
RUN apk add curl | ||||||||||
RUN curl --location --silent --fail "https://pgp.mongodb.com/c-driver.pub" -o /c-driver.pub | ||||||||||
SAVE ARTIFACT /c-driver.pub | ||||||||||
|
@@ -203,7 +203,7 @@ signing-pubkey: | |||||||||
# to be used to access them. (Refer to dev docs) | ||||||||||
sign-file: | ||||||||||
# Pull from Garasign: | ||||||||||
FROM artifactory.corp.mongodb.com/release-tools-container-registry-local/garasign-gpg | ||||||||||
FROM artifactory.corp.mongodb.com/release-infrastructure/garasign-gpg | ||||||||||
# Copy the file to be signed | ||||||||||
ARG --required file | ||||||||||
COPY $file /s/file | ||||||||||
|
@@ -223,7 +223,7 @@ sign-file: | |||||||||
# Generate a signed release artifact. Refer to the "Earthly" page of our dev docs for more information. | ||||||||||
# (Refer to dev docs) | ||||||||||
signed-release: | ||||||||||
FROM alpine:3.20 | ||||||||||
FROM 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/alpine:3.20 | ||||||||||
RUN apk add git | ||||||||||
# The version of the release. This affects the filepaths of the output and is the default for --ref | ||||||||||
ARG --required version | ||||||||||
|
@@ -312,7 +312,7 @@ sbom-validate: | |||||||||
--exclude jira | ||||||||||
|
||||||||||
snyk: | ||||||||||
FROM --platform=linux/amd64 ubuntu:24.04 | ||||||||||
FROM --platform=linux/amd64 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/ubuntu:24.04 | ||||||||||
RUN apt-get update && apt-get -y install curl | ||||||||||
RUN curl --location https://github.com/snyk/cli/releases/download/v1.1291.1/snyk-linux -o /usr/local/bin/snyk | ||||||||||
RUN chmod a+x /usr/local/bin/snyk | ||||||||||
|
@@ -384,7 +384,7 @@ test-vcpkg-manifest-mode: | |||||||||
make test-manifest-mode | ||||||||||
|
||||||||||
vcpkg-base: | ||||||||||
FROM alpine:3.18 | ||||||||||
FROM 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/alpine:3.18 | ||||||||||
RUN apk add cmake curl gcc g++ musl-dev ninja-is-really-ninja zip unzip tar \ | ||||||||||
build-base git pkgconf perl bash linux-headers | ||||||||||
ENV VCPKG_ROOT=/opt/vcpkg-git | ||||||||||
|
@@ -443,7 +443,7 @@ env.alpine3.19: | |||||||||
DO --pass-args +ALPINE_ENV --version=3.19 | ||||||||||
|
||||||||||
env.archlinux: | ||||||||||
FROM --pass-args tools+init-env --from archlinux | ||||||||||
FROM --pass-args tools+init-env --from 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/archlinux | ||||||||||
RUN pacman-key --init | ||||||||||
ARG --required purpose | ||||||||||
|
||||||||||
|
@@ -462,9 +462,9 @@ env.centos7: | |||||||||
DO --pass-args +CENTOS_ENV --version=7 | ||||||||||
|
||||||||||
ALPINE_ENV: | ||||||||||
COMMAND | ||||||||||
FUNCTION | ||||||||||
ARG --required version | ||||||||||
FROM --pass-args tools+init-env --from alpine:$version | ||||||||||
FROM --pass-args tools+init-env --from 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/alpine:$version | ||||||||||
# XXX: On Alpine, we just use the system's CMake. At time of writing, it is | ||||||||||
# very up-to-date and much faster than building our own from source (since | ||||||||||
# Kitware does not (yet) provide libmuslc builds of CMake) | ||||||||||
|
@@ -484,9 +484,9 @@ ALPINE_ENV: | |||||||||
DO --pass-args tools+ADD_C_COMPILER --clang_pkg="gcc clang compiler-rt" | ||||||||||
|
||||||||||
UBUNTU_ENV: | ||||||||||
COMMAND | ||||||||||
FUNCTION | ||||||||||
ARG --required version | ||||||||||
FROM --pass-args tools+init-env --from ubuntu:$version | ||||||||||
FROM --pass-args tools+init-env --from 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/ubuntu:$version | ||||||||||
RUN __install curl build-essential | ||||||||||
ARG --required purpose | ||||||||||
|
||||||||||
|
@@ -502,13 +502,13 @@ UBUNTU_ENV: | |||||||||
DO +PREP_CMAKE | ||||||||||
|
||||||||||
CENTOS_ENV: | ||||||||||
COMMAND | ||||||||||
FUNCTION | ||||||||||
ARG --required version | ||||||||||
FROM --pass-args tools+init-env --from centos:$version | ||||||||||
FROM --pass-args tools+init-env --from 901841024863.dkr.ecr.us-east-1.amazonaws.com/dockerhub/library/centos:$version | ||||||||||
# Update repositories to use vault.centos.org | ||||||||||
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ | ||||||||||
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* | ||||||||||
RUN yum -y install epel-release && yum -y update | ||||||||||
RUN yum -y --enablerepo=extras install epel-release && yum -y update | ||||||||||
RUN yum -y install curl gcc gcc-c++ make | ||||||||||
ARG --required purpose | ||||||||||
|
||||||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment appears unrelated to this class's purpose.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops, outdated comment from old changes. Fixed.