Merge pull request #64 from ssalevan/master

Adjusting Dockerfile to support clean builds
This commit is contained in:
Wolfgang Thaller 2018-08-15 20:23:20 +02:00 committed by GitHub
commit fedaf466ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,6 @@
# vim:ft=dockerfile # vim:ft=dockerfile
FROM ubuntu:16.04
FROM ubuntu:18.04
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
g++ \ g++ \
@ -7,9 +8,8 @@ RUN apt-get update && apt-get -y install \
zlib1g-dev \ zlib1g-dev \
perl texinfo perl texinfo
RUN mkdir /root/Retro68 ADD . /Retro68
COPY . /root/Retro68/
RUN mkdir /root/Retro68-build RUN mkdir /Retro68-build
RUN sh -c "cd /root/Retro68-build && sh ../Retro68/build-toolchain.sh --clean-after-build" RUN bash -c "cd /Retro68-build && bash /Retro68/build-toolchain.bash --clean-after-build"