fedora-qa / oraculum

Clone
Source Code
GIT

#13 Make container build require less deps
Merged 4 years ago by frantisekz. Opened 4 years ago by frantisekz.
light_makefile  into  master

file modified
+1 -1 
@@ -1,7 +1,7 @@ 
 

  FROM fedora:32 AS builder
 

  USER root
 

  

- RUN dnf -y install rpm-build pyp2rpm make git redhat-lsb-core
 

+ RUN dnf -y install rpm-build pyp2rpm make git-core
 

  

  COPY . /opt/app-root/src/oraculum/

file modified
+1 -1 
@@ -36,7 +36,7 @@ 
 

  SPECFILE=$(SRC).spec
 

  BASEARCH:=$(shell uname -i)
 

  DIST:=$(shell rpm --eval '%{dist}')
 

- TARGETVER:=$(shell lsb_release -r |grep -o '[0-9]*')
 

+ TARGETVER:=$(shell cat /etc/os-release |grep "VERSION_ID" |grep -o '[0-9]*')
 

  TARGETDIST:=fc$(TARGETVER)
 

  VERSION:=$(shell rpmspec -q --queryformat="%{VERSION}\n" $(SPECFILE) | head -1)
 

  RELEASE:=$(shell rpmspec -q --queryformat="%{RELEASE}\n" $(SPECFILE) | head -1 | sed 's/$(DIST)/\.$(TARGETDIST)/g')

TODO:

  • Test this
  • Test this on EPEL

Pull-Request has been merged by frantisekz
4 years ago
Metadata
None
No Tags
Changes Summary 2
+1 -1
file changed
Dockerfile
+1 -1
file changed
Makefile
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.