Skip to content

Commit 7eb631a

Browse files
authored
CDRIVER-5814 Use less Artifactory for Earthly images (#1927)
1 parent a414c93 commit 7eb631a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Earthfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ test-cxx-driver:
119119
# Create the VERSION_CURRENT file using Git. This file is exported as an artifact at /
120120
version-current:
121121
# Run on Alpine, which does this work the fastest
122-
FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.18
122+
FROM alpine:3.18
123123
# Install Python and Git, the only things required for this job:
124124
RUN apk add git python3
125125
# Copy only the .git/ directory and calc_release_version, which are enough to get the VERSION_CURRENT
@@ -174,7 +174,7 @@ multibuild:
174174
# release-archive :
175175
# Create a release archive of the source tree. (Refer to dev docs)
176176
release-archive:
177-
FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.20
177+
FROM alpine:3.20
178178
RUN apk add git bash
179179
ARG --required prefix
180180
ARG --required ref
@@ -219,7 +219,7 @@ release-archive:
219219

220220
# Obtain the signing public key. Exported as an artifact /c-driver.pub
221221
signing-pubkey:
222-
FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.20
222+
FROM alpine:3.20
223223
RUN apk add curl
224224
RUN curl --location --silent --fail "https://pgp.mongodb.com/c-driver.pub" -o /c-driver.pub
225225
SAVE ARTIFACT /c-driver.pub
@@ -249,7 +249,7 @@ sign-file:
249249
# Generate a signed release artifact. Refer to the "Earthly" page of our dev docs for more information.
250250
# (Refer to dev docs)
251251
signed-release:
252-
FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.20
252+
FROM alpine:3.20
253253
RUN apk add git
254254
# The version of the release. This affects the filepaths of the output and is the default for --ref
255255
ARG --required version
@@ -338,7 +338,7 @@ sbom-validate:
338338
--exclude jira
339339

340340
snyk:
341-
FROM --platform=linux/amd64 artifactory.corp.mongodb.com/dockerhub/library/ubuntu:24.04
341+
FROM --platform=linux/amd64 ubuntu:24.04
342342
RUN apt-get update && apt-get -y install curl
343343
RUN curl --location https://github.com/snyk/cli/releases/download/v1.1291.1/snyk-linux -o /usr/local/bin/snyk
344344
RUN chmod a+x /usr/local/bin/snyk
@@ -410,7 +410,7 @@ test-vcpkg-manifest-mode:
410410
make test-manifest-mode
411411

412412
vcpkg-base:
413-
FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.18
413+
FROM alpine:3.18
414414
RUN apk add cmake curl gcc g++ musl-dev ninja-is-really-ninja zip unzip tar \
415415
build-base git pkgconf perl bash linux-headers
416416
ENV VCPKG_ROOT=/opt/vcpkg-git
@@ -469,7 +469,7 @@ env.alpine3.19:
469469
DO --pass-args +ALPINE_ENV --version=3.19
470470

471471
env.archlinux:
472-
FROM --pass-args tools+init-env --from artifactory.corp.mongodb.com/dockerhub/library/archlinux
472+
FROM --pass-args tools+init-env --from archlinux
473473
RUN pacman-key --init
474474
ARG --required purpose
475475

@@ -490,7 +490,7 @@ env.centos7:
490490
ALPINE_ENV:
491491
COMMAND
492492
ARG --required version
493-
FROM --pass-args tools+init-env --from artifactory.corp.mongodb.com/dockerhub/library/alpine:$version
493+
FROM --pass-args tools+init-env --from alpine:$version
494494
# XXX: On Alpine, we just use the system's CMake. At time of writing, it is
495495
# very up-to-date and much faster than building our own from source (since
496496
# Kitware does not (yet) provide libmuslc builds of CMake)
@@ -512,7 +512,7 @@ ALPINE_ENV:
512512
UBUNTU_ENV:
513513
COMMAND
514514
ARG --required version
515-
FROM --pass-args tools+init-env --from artifactory.corp.mongodb.com/dockerhub/library/ubuntu:$version
515+
FROM --pass-args tools+init-env --from ubuntu:$version
516516
RUN __install curl build-essential
517517
ARG --required purpose
518518

@@ -530,7 +530,7 @@ UBUNTU_ENV:
530530
CENTOS_ENV:
531531
COMMAND
532532
ARG --required version
533-
FROM --pass-args tools+init-env --from artifactory.corp.mongodb.com/dockerhub/library/centos:$version
533+
FROM --pass-args tools+init-env --from centos:$version
534534
# Update repositories to use vault.centos.org
535535
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
536536
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*

tools/earthly.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if ! is-file "$EARTHLY_EXE"; then
3636
fi
3737

3838
run-earthly() {
39-
"$EARTHLY_EXE" --buildkit-image artifactory.corp.mongodb.com/dockerhub/earthly/buildkitd:v${EARTHLY_VERSION} "$@"
39+
"$EARTHLY_EXE" "$@"
4040
}
4141

4242
if is-main; then

0 commit comments

Comments
 (0)