From 133afde1036bad6b5ef3c7bd476a9ac47b4cea5e Mon Sep 17 00:00:00 2001 From: FrantiĊĦek Zatloukal Date: Apr 10 2020 08:39:36 +0000 Subject: Make container build require less deps --- diff --git a/Dockerfile b/Dockerfile index 6ca2ee7..1b9e9cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/ diff --git a/Makefile b/Makefile index 376e837..ca5bbee 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ endif 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')