diff options
| author | François Andriot <[email protected]> | 2021-01-30 23:53:31 +0100 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2021-01-30 23:57:34 +0100 |
| commit | effbf509eea4f37a1a8660242769ed1746b67ee0 (patch) | |
| tree | 47f019bebdc7f0549e43e57ac57856b2d505468b /redhat/docker/mga7 | |
| parent | 6581dc50b83f203d65eac61c00a159ab2a6ddb5d (diff) | |
| download | tde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.tar.gz tde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.zip | |
RPM: update build scripts for Fedora 33 / CentOS 8
Diffstat (limited to 'redhat/docker/mga7')
| -rw-r--r-- | redhat/docker/mga7/Dockerfile.i686 | 2 | ||||
| -rw-r--r-- | redhat/docker/mga7/Dockerfile.x86_64 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 991ee2320..0d7d949d4 100644 --- a/redhat/docker/mga7/Dockerfile.i686 +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:7 -ARG TDE_VERSION=14.0.8 +ARG TDE_VERSION=14.1.0 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64 index 026549071..1fcf07ccb 100644 --- a/redhat/docker/mga7/Dockerfile.x86_64 +++ b/redhat/docker/mga7/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:7 -ARG TDE_VERSION=14.0.8 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Reset URPMI repositories to default @@ -11,7 +11,7 @@ RUN urpmi.removemedia -a \ # Update distribution # Install Trinity build dependencies -ADD packages.${ARCH} /packages +COPY packages.${ARCH} /packages RUN urpmi.update -a \ && urpmi --auto-select --auto \ && urpmi --auto $(</packages) @@ -29,7 +29,7 @@ RUN rm -rf /home/trinity \ # Configure user trinity USER trinity -ADD rpmmacros /home/trinity/.rpmmacros +COPY rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ |