From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Wed, 7 Aug 2019 03:37:00 +0000 (+0200)
Subject: dockerfile: use PREFIX instead of cp
X-Git-Tag: working-ls180~1148^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=99de39fc79fa948e1f844faa81206532efabc268;p=yosys.git

dockerfile: use PREFIX instead of cp
---

diff --git a/Dockerfile b/Dockerfile
index d21f6dc5b..027514a3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,19 +31,22 @@ RUN apt-get update -qq \
  && apt-get autoclean && apt-get clean && apt-get -y autoremove \
  && rm -rf /var/lib/apt/lists
 
-COPY . /
+COPY . /yosys
 
-RUN make \
+ENV PREFIX /opt/yosys
+
+RUN cd /yosys \
+ && make \
  && make install \
- && mkdir dist && cp yosys yosys-abc yosys-config yosys-filterlib yosys-smtbmc dist/
+ && make test
 
 #---
 
 FROM base
 
-COPY --from=build /dist /opt/yosys
+COPY --from=build /opt/yosys /opt/yosys
 
-ENV PATH /opt/yosys:$PATH
+ENV PATH /opt/yosys/bin:$PATH
 
 RUN useradd -m yosys
 USER yosys