diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-01-30 14:34:02 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-01-30 22:29:41 +0100 |
| commit | 6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch) | |
| tree | 85c02d38ca9dcedc28798ee41c4b16ec7260e9bc /redhat/docker/osstw/Dockerfile.i686 | |
| parent | 87e57a1a070839a44db16a0410ef57902db2df3e (diff) | |
| download | tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip | |
RPM: massive update and cleanup
Diffstat (limited to 'redhat/docker/osstw/Dockerfile.i686')
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 02f84bb8c..7df793232 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,25 +1,25 @@ -FROM opensuse32:tumbleweed +FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 # Add PACKMAN repository RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman -RUN setarch ${ARCH} zypper refresh -RUN setarch ${ARCH} zypper --non-interactive dup -RUN setarch ${ARCH} zypper --non-interactive update - -# Install Trinity build dependencies ADD packages /packages -RUN setarch ${ARCH} zypper install -l -y $(</packages) +RUN setarch ${ARCH} zypper refresh \ + && setarch ${ARCH} zypper -n dup \ + && setarch ${ARCH} zypper -n update \ + && setarch ${ARCH} zypper -n install $(</packages) # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add YUM repository for locally built packages -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch |