[Git][NTPsec/ntpsec][master] 2 commits: .dockerfiles: Rearrange dependencies

Hal Murray (@hal.murray) gitlab at mg.gitlab.com
Thu Jan 30 12:48:57 UTC 2025 


Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
05746a36 by James Browning at 2025-01-30T12:45:02+00:00
.dockerfiles: Rearrange dependencies

- - - - -
df2fbec6 by James Browning at 2025-01-30T12:45:02+00:00
ntpsec: Fail louder except for four instances

- Alpine edge
- Debian cross ARMhf
- Debian unstable
- Ubuntu devel

- - - - -


24 changed files:

- .dockerfiles/alpine
- .dockerfiles/alpine-edge
- .dockerfiles/alpine-pages
- .dockerfiles/alpine-seccomp
- .dockerfiles/centos-latest
- .dockerfiles/clang
- .dockerfiles/coverity
- .dockerfiles/cross-armhf
- .dockerfiles/debian-oldstable
- .dockerfiles/debian-stable
- .dockerfiles/debian-stable-i386
- .dockerfiles/debian-stable-mdns
- .dockerfiles/debian-testing
- .dockerfiles/debian-unstable
- .dockerfiles/fedora-latest
- .dockerfiles/gentoo
- .dockerfiles/opensuse-leap
- .dockerfiles/python2
- .dockerfiles/python3
- .dockerfiles/ubuntu-latest
- .dockerfiles/ubuntu-rolling
- .gitlab-ci.yml
- .gitlab-docker-ci.yml
- .gitlab-opttest-ci.yml


Changes:

=====================================
.dockerfiles/alpine
=====================================
@@ -5,4 +5,11 @@
 FROM alpine
 
 RUN apk update
-RUN apk add gcc bison musl-dev openssl-dev libcap-dev python3-dev libbsd
+RUN apk add \
+	bison \
+	gcc \
+	libbsd \
+	libcap-dev \
+	musl-dev \
+	openssl-dev \
+	python3-dev


=====================================
.dockerfiles/alpine-edge
=====================================
@@ -5,4 +5,11 @@
 FROM alpine:edge
 
 RUN apk update
-RUN apk add gcc bison musl-dev openssl-dev libcap-dev python3-dev libbsd
+RUN apk add \
+	bison \
+	gcc \
+	libbsd \
+	libcap-dev \
+	musl-dev \
+	openssl-dev \
+	python3-dev


=====================================
.dockerfiles/alpine-pages
=====================================
@@ -5,4 +5,14 @@
 FROM alpine
 
 RUN apk update
-RUN apk add gcc bison musl-dev openssl-dev libcap-dev python3-dev libbsd asciidoctor findutils gzip
+RUN apk add \
+	asciidoctor \
+	bison \
+	findutils \
+	gcc \
+	gzip \
+	libbsd \
+	libcap-dev \
+	musl-dev \
+	openssl-dev \
+	python3-dev


=====================================
.dockerfiles/alpine-seccomp
=====================================
@@ -5,4 +5,12 @@
 FROM alpine
 
 RUN apk update
-RUN apk add gcc bison musl-dev openssl-dev libcap-dev python3-dev libbsd libseccomp-dev
+RUN apk add \
+	bison \
+	gcc \
+	libbsd \
+	libcap-dev \
+	libseccomp-dev \
+	musl-dev \
+	openssl-dev \
+	python3-dev


=====================================
.dockerfiles/centos-latest
=====================================
@@ -7,4 +7,11 @@ FROM quay.io/centos/centos:stream9
 RUN dnf -y install dnf-plugins-core
 RUN dnf config-manager --set-enabled crb
 RUN dnf -y install epel-release
-RUN dnf -y install bison gcc openssl-devel libcap-devel python3-devel pps-tools-devel libbsd-devel
+RUN dnf -y install \
+	bison \
+	gcc \
+	libbsd-devel \
+	libcap-devel \
+	openssl-devel \
+	python3-devel \
+	pps-tools-devel


=====================================
.dockerfiles/clang
=====================================
@@ -5,4 +5,12 @@
 FROM debian:testing-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison libssl-dev libcap-dev pps-tools python3-dev libbsd-dev clang
+RUN apt-get install -y \
+	bison \
+	clang \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/coverity
=====================================
@@ -7,4 +7,14 @@
 FROM debian:stable-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev curl git
+RUN apt-get install -y \
+	bison \
+	curl \
+	gcc \
+	git \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/cross-armhf
=====================================
@@ -6,5 +6,15 @@ FROM debian:testing
 
 RUN dpkg --add-architecture armhf
 RUN apt-get update
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y bison gcc gcc-arm-linux-gnueabihf git make netbase pps-tools python-is-python3 wget
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y libssl-dev:armhf libpython3-dev:armhf
+RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \
+	bison \
+	gcc \
+	gcc-arm-linux-gnueabihf \
+	git \
+	libpython3-dev:armhf \
+	libssl-dev:armhf \
+	make \
+	netbase \
+	pps-tools \
+	python-is-python3 \
+	wget


=====================================
.dockerfiles/debian-oldstable
=====================================
@@ -5,4 +5,12 @@
 FROM debian:oldstable-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev
+RUN apt-get install -y \
+	bison \
+	gcc \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/debian-stable
=====================================
@@ -5,4 +5,12 @@
 FROM debian:stable-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev
+RUN apt-get install -y \
+	bison \
+	gcc \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/debian-stable-i386
=====================================
@@ -5,4 +5,12 @@
 FROM i386/debian:stable-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev
+RUN apt-get install -y \
+	bison \
+	gcc \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/debian-stable-mdns
=====================================
@@ -5,4 +5,13 @@
 FROM debian:stable-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev libavahi-compat-libdnssd-dev
+RUN apt-get install -y \
+	bison \
+	gcc \
+	libavahi-compat-libdnssd-dev \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/debian-testing
=====================================
@@ -5,4 +5,12 @@
 FROM debian:testing-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev
+RUN apt-get install -y \
+	bison \
+	gcc \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/debian-unstable
=====================================
@@ -5,4 +5,13 @@
 FROM debian:unstable-slim
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev gpsd
+RUN apt-get install -y \
+	bison \
+	gcc \
+	gpsd \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/fedora-latest
=====================================
@@ -4,4 +4,11 @@
 
 FROM fedora:latest
 
-RUN dnf -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel libbsd-devel
+RUN dnf -y install \
+	bison \
+	gcc \
+	libbsd-devel \
+	libcap-devel \
+	openssl-devel \
+	pps-tools-devel \
+	python3-devel


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


=====================================
.dockerfiles/opensuse-leap
=====================================
@@ -4,4 +4,12 @@
 
 FROM opensuse/leap
 
-RUN zypper -n install bison gcc libopenssl-devel libcap-devel pps-tools-devel python3-devel python3-curses libbsd-devel
+RUN zypper -n install \
+	bison \
+	gcc \
+	libbsd-devel \
+	libcap-devel \
+	libopenssl-devel \
+	pps-tools-devel \
+	python3-curses \
+	python3-devel


=====================================
.dockerfiles/python2
=====================================
@@ -5,4 +5,11 @@
 FROM python:2-slim
 
 RUN apt-get update -qq
-RUN apt-get install -y -qq netbase bison gcc libssl-dev libcap-dev pps-tools libbsd-dev
+RUN apt-get install -y -qq \
+	bison \
+	gcc \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools


=====================================
.dockerfiles/python3
=====================================
@@ -5,4 +5,11 @@
 FROM python:3-slim
 
 RUN apt-get update -qq
-RUN apt-get install -y -qq netbase bison gcc libssl-dev libcap-dev pps-tools libbsd-dev
+RUN apt-get install -y -qq \
+	bison \
+	gcc \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools


=====================================
.dockerfiles/ubuntu-latest
=====================================
@@ -5,4 +5,12 @@
 FROM ubuntu:latest
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev
+RUN apt-get install -y \
+	bison \
+	gcc \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.dockerfiles/ubuntu-rolling
=====================================
@@ -5,4 +5,12 @@
 FROM ubuntu:rolling
 
 RUN apt-get update
-RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev
+RUN apt-get install -y \
+	bison \
+	gcc \
+	libbsd-dev \
+	libcap-dev \
+	libssl-dev \
+	netbase \
+	pps-tools \
+	python3-dev


=====================================
.gitlab-ci.yml
=====================================
@@ -9,7 +9,6 @@ pages:
     - mv public/latest/404.html public/404.html
     - sed -i -E -e 's!\./(asciidoc\.(js|css))!\./latest/\1!g' public/404.html
     - find public -type f -iregex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -execdir gzip -f --keep {} \;
-  allow_failure: true
   artifacts:
     paths:
        - public
@@ -29,10 +28,6 @@ include:
   tags:
     - gitlab-org
 
-.job_template_allow_failure: &job_definition_allow_failure
-  <<: *job_definition
-  allow_failure: true
-
 alpine-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/alpine
@@ -48,7 +43,8 @@ alpine-refclocks:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
 alpine-edge-basic:
-  <<: *job_definition_allow_failure
+  allow_failure: true
+  <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/alpine-edge
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
@@ -56,13 +52,14 @@ alpine-edge-basic:
     - python3 ./waf uninstall
 
 alpine-edge-refclocks:
-  <<: *job_definition_allow_failure
+  allow_failure: true
+  <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/alpine-edge
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
 AsciiDoc-3-Fedora:
-  <<: *job_definition_allow_failure
+  <<: *job_definition
   image: fedora
   script:
     - yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel wget libxslt docbook-style-xsl
@@ -147,7 +144,8 @@ debian-testing-refclocks:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
 debian-unstable-basic:
-  <<: *job_definition_allow_failure
+  allow_failure: true
+  <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/debian-unstable
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
@@ -155,7 +153,8 @@ debian-unstable-basic:
     - python3 ./waf uninstall
 
 debian-unstable-refclocks:
-  <<: *job_definition_allow_failure
+  allow_failure: true
+  <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/debian-unstable
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
@@ -175,7 +174,8 @@ ubuntu-latest-refclocks:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
 ubuntu-devel-basic:
-  <<: *job_definition_allow_failure
+  <<: *job_definition
+  allow_failure: true
   image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
@@ -183,7 +183,8 @@ ubuntu-devel-basic:
     - python3 ./waf uninstall
 
 ubuntu-devel-refclocks:
-  <<: *job_definition_allow_failure
+  <<: *job_definition
+  allow_failure: true
   image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
@@ -253,7 +254,7 @@ fedora-latest-refclocks:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
 python3:
-  <<: *job_definition_allow_failure
+  <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/python3
   script:
     - python ./waf configure --disable-doc --disable-manpage --refclock=all build
@@ -319,7 +320,8 @@ debian-stable-mDNS-refclocks:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
 cross-armhf-build:
-  <<: *job_definition_allow_failure
+  allow_failure: true
+  <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/cross-armhf
   script:
     - pyver=$(python3 -c 'import sys;print(f"{sys.version_info.major}.{sys.version_info.minor}")')


=====================================
.gitlab-docker-ci.yml
=====================================
@@ -18,7 +18,6 @@
       --tag $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest .
       --file .dockerfiles/$IMAGE_NAME
     - docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest
-  allow_failure: true
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
 
@@ -26,6 +25,7 @@ build-alpine:
   <<: *build_definition
 
 build-alpine-edge:
+  allow_failure: true
   <<: *build_definition
 
 build-alpine-pages:
@@ -59,6 +59,7 @@ build-debian-testing:
   <<: *build_definition
 
 build-debian-unstable:
+  allow_failure: true
   <<: *build_definition
 
 build-fedora-latest:
@@ -83,4 +84,5 @@ build-ubuntu-rolling:
   <<: *build_definition
 
 build-cross-armhf:
+  allow_failure: true
   <<: *build_definition


=====================================
.gitlab-opttest-ci.yml
=====================================
@@ -23,6 +23,7 @@ make-tarball:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
 
 alpine-edge-options-tester:
+  allow_failure: true
   <<: *option_tester_py3_only
   image: alpine:edge
   before_script:
@@ -49,7 +50,6 @@ fedora-latest-options-tester:
 opensuse-leap-options-tester:
   <<: *option_tester_py3_only
   image: opensuse/leap
-  allow_failure: true
   before_script:
     - zypper -n install bison gcc libopenssl-devel libcap-devel pps-tools-devel libseccomp-devel python3-devel python3-curses pkg-config bash
 
@@ -125,6 +125,7 @@ debian-testing-options-tester:
   <<: *deb_option_tester_py3_only
 
 debian-unstable-options-tester:
+  allow_failure: true
   image: debian:unstable-slim
   <<: *deb_option_tester_py3_only
 
@@ -133,6 +134,7 @@ ubuntu-latest-options-tester:
   <<: *deb_option_tester_py3_only
 
 ubuntu-devel-options-tester:
+  allow_failure: true
   image: ubuntu:devel
   <<: *deb_option_tester_py3_only
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/e14856ba72d6cba74aea40bf2fcb61fc76e749c3...df2fbec601e3c710f83025b23479b23580dd806e

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/e14856ba72d6cba74aea40bf2fcb61fc76e749c3...df2fbec601e3c710f83025b23479b23580dd806e
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/20250130/60bbc0a0/attachment-0001.htm>

More information about the vc mailing list