[Git][NTPsec/ntpsec][master] 2 commits: Use latest docker image when building docker images

Matt Selsky (@selsky) gitlab at mg.gitlab.com
Thu Dec 22 17:43:53 UTC 2022



Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
eff644a4 by Matt Selsky at 2022-12-22T12:37:24-05:00
Use latest docker image when building docker images

We were previously using the "stable" version of docker and this tag hasn't
been updated in 2 years. We instead switch to "latest" since we have no need to
pin to a specific version.

The "stable" version of docker was older than 20.10.10 and it caused issues for
linux distributions using glibc >= 2.34 because of how clone3() is used.

See https://github.com/AkihiroSuda/clone3-workaround for additional details.

- - - - -
dc948158 by Matt Selsky at 2022-12-22T12:42:40-05:00
Remove call to emerge-webrsync in Gentoo docker image building

We pull portage from docker so there's no need to pull portage over the web
additionally.

- - - - -


2 changed files:

- .dockerfiles/gentoo
- .gitlab-docker-ci.yml


Changes:

=====================================
.dockerfiles/gentoo
=====================================
@@ -4,5 +4,4 @@ FROM gentoo/stage3
 
 COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo
 
-RUN emerge-webrsync
 RUN emerge -q y sys-libs/libcap sys-devel/bison net-misc/pps-tools


=====================================
.gitlab-docker-ci.yml
=====================================
@@ -3,9 +3,9 @@
     # Try to save some time by only grabbing the most recent commit
     GIT_DEPTH: '1'
   stage: build
-  image: docker:stable
+  image: docker
   services:
-    - docker:stable-dind
+    - docker:dind
   script:
     - IMAGE_NAME=${CI_JOB_NAME/build-/}
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/4de6974777668eb68d443da011d0a6aff8ed1267...dc948158a2ce64479b296bdb973992a7f0521a3b

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/4de6974777668eb68d443da011d0a6aff8ed1267...dc948158a2ce64479b296bdb973992a7f0521a3b
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20221222/b8f9e423/attachment-0001.htm>


More information about the vc mailing list