diff options
| author | David Sterba <dsterba@suse.com> | 2024-01-26 06:00:23 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2024-01-26 06:02:24 +0100 |
| commit | 6ee9c9b4779746da5363e49fb48503fa6bc76a7a (patch) | |
| tree | 107c47daf646d48ac5993085657b3301bdbc72ed | |
| parent | 337ef1141dba98daed936237cfea76a51f050538 (diff) | |
| download | btrfs-progs-6ee9c9b4779746da5363e49fb48503fa6bc76a7a.tar.gz | |
btrfs-progs: ci: sync build options in Dockerfiles and runner scripts
The runner scripts ci/ci-build... pass build options that work for each
distro, however this was not matching some Dockerfiles. Pulling such
image would then fail due to missing dependencies (namely libudev).
Signed-off-by: David Sterba <dsterba@suse.com>
| -rwxr-xr-x | ci/ci-build-leap153 | 2 | ||||
| -rwxr-xr-x | ci/ci-build-leap154 | 2 | ||||
| -rw-r--r-- | ci/images/ci-centos-7-x86_64/Dockerfile | 2 | ||||
| -rw-r--r-- | ci/images/ci-centos-8-x86_64/Dockerfile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ci/ci-build-leap153 b/ci/ci-build-leap153 index 338d6384..612035d5 100755 --- a/ci/ci-build-leap153 +++ b/ci/ci-build-leap153 @@ -31,4 +31,4 @@ gzip --force --best devel.tar cd "$CIIMAGEDIR" cp "$SOURCEDIR/devel.tar.gz" . ./docker-build -./docker-run -- ./test-build devel --disable-documentation "$@" +./docker-run -- ./test-build devel --disable-documentation --disable-zoned "$@" diff --git a/ci/ci-build-leap154 b/ci/ci-build-leap154 index dc97b598..3f54a5e3 100755 --- a/ci/ci-build-leap154 +++ b/ci/ci-build-leap154 @@ -31,4 +31,4 @@ gzip --force --best devel.tar cd "$CIIMAGEDIR" cp "$SOURCEDIR/devel.tar.gz" . ./docker-build -./docker-run -- ./test-build devel --disable-documentation "$@" +./docker-run -- ./test-build devel --disable-documentation --disable-zoned "$@" diff --git a/ci/images/ci-centos-7-x86_64/Dockerfile b/ci/images/ci-centos-7-x86_64/Dockerfile index 89beef70..6b49055d 100644 --- a/ci/images/ci-centos-7-x86_64/Dockerfile +++ b/ci/images/ci-centos-7-x86_64/Dockerfile @@ -29,7 +29,7 @@ COPY ./test-build . COPY ./run-tests . COPY ./devel.tar.gz . -CMD ./test-build devel --disable-documentation +CMD ./test-build devel --disable-documentation --disable-libudev # Continue with: # cd /tmp diff --git a/ci/images/ci-centos-8-x86_64/Dockerfile b/ci/images/ci-centos-8-x86_64/Dockerfile index edc9ed90..b10f5112 100644 --- a/ci/images/ci-centos-8-x86_64/Dockerfile +++ b/ci/images/ci-centos-8-x86_64/Dockerfile @@ -32,7 +32,7 @@ COPY ./test-build . COPY ./run-tests . COPY ./devel.tar.gz . -CMD ./test-build devel --disable-documentation --disable-zoned +CMD ./test-build devel --disable-documentation --disable-libudev --disable-zoned # Continue with: # cd /tmp |