summaryrefslogtreecommitdiffstats
path: root/redhat/docker/pclinuxos/Dockerfile.x86_64
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2021-05-01 18:08:35 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2021-05-01 18:12:45 +0200
commitc7623fbb061f477b19ddf24de3661203aa33c299 (patch)
tree0e84ce2d64e8cc6bf405be3983e6ccaa82c13c87 /redhat/docker/pclinuxos/Dockerfile.x86_64
parentab1604b61a44147623db257ebc0a92409c219bba (diff)
downloadtde-packaging-c7623fbb.tar.gz
tde-packaging-c7623fbb.zip
RPM: update docker scripts
Diffstat (limited to 'redhat/docker/pclinuxos/Dockerfile.x86_64')
-rw-r--r--redhat/docker/pclinuxos/Dockerfile.x86_6416
1 files changed, 9 insertions, 7 deletions
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 8b8101939..a31c81396 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM pclinuxos:2020
+FROM pclinuxos:2021
ARG TDE_VERSION=14.1.0
ARG ARCH=x86_64
@@ -39,13 +39,15 @@ COPY rpmmacros /home/trinity/.rpmmacros
# Build supplementary development tools
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \
- && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
-USER root
-RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
-
-USER trinity
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm