diff options
| author | Elan Ruusamäe | 2016-11-23 09:39:03 (GMT) |
|---|---|---|
| committer | Elan Ruusamäe | 2016-11-23 09:39:03 (GMT) |
| commit | b23f7f377ea18f68980e8da29cc43b861c2f23c9 (patch) | |
| tree | 132731c4c42f14df38c08eddbbc16b5bb22db2ae | |
| parent | 06459a6a572c927c091bf350f82b20d0367a9377 (diff) | |
| download | cleanbuild-b23f7f377ea18f68980e8da29cc43b861c2f23c9.zip cleanbuild-b23f7f377ea18f68980e8da29cc43b861c2f23c9.tar.gz | |
require perl-modules to workaround pld git installation failure
baggins suggested that every fucking place installing git should do
this. so here it fucking is
Installing set #5
Processing dependencies...
...
git-core-2.10.2-1.x86_64 marks expat-2.2.0-4.x86_64 (cap libexpat.so.1()(64bit))
git-core-2.10.2-1.x86_64 marks perl-Error-0.17021-1.noarch (cap perl(Error))
perl-Error-0.17021-1.noarch marks perl-Scalar-List-Utils-1.46-1.x86_64 (cap perl(Scalar::Util))
git-core-2.10.2-1.x86_64 marks perl-Git-2.10.2-1.noarch (cap perl(Git))
perl-Git-2.10.2-1.noarch marks perl-modules-5.24.0-1.x86_64 (cap perl(Time::Local))
error: perl-modules-5.24.0-1.x86_64 conflicts with perl-Scalar-List-Utils-1.46-1.x86_64
| -rwxr-xr-x | build-docker.sh | 5 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/build-docker.sh b/build-docker.sh index 61befb0..85f2d9b 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -1,4 +1,5 @@ #!/bin/sh -# note: docker file is kept in subdir, as docker build uploads context to docker first when building -# and when it contains poldek cache and rpm root, it's big, unneccessary and maybe lack of permissions +# note: docker file is kept in subdir, as docker build uploads context to docker first when building +# and when it contains poldek cache and rpm root, it's big, unneccessary and may lack of permissions +# however .dockerignore could solve all that docker build -t pld/cleanbuild docker diff --git a/docker/Dockerfile b/docker/Dockerfile index dc21806..aa07a08 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ RUN set -x \ # first upgrade to latest && poldek --upgrade-dist \ # install build deps - && poldek -u rpm-build pwdutils coreutils util-linux git-core gawk sudo \ + && poldek -u rpm-build perl-modules pwdutils coreutils util-linux git-core gawk sudo \ # this will setup builder user && poldek -u pld-builder-chroot \ # temporarily until package is fixed |