From ed178ea9b5b20ebe229e834c1beffa160b9304ee Mon Sep 17 00:00:00 2001 From: Per Weijnitz Date: Wed, 22 Jul 2020 18:15:41 +0200 Subject: [PATCH 1/2] Update Dockerfile to working condition --- Dockerfile | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3513ec4..6ac7231 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,24 @@ -FROM centos:7 as builder -RUN yum install -y gcc gcc-c++ python git perl-Pod-Simple gperf patch autoconf automake make makedepend bison flex ncurses-devel gmp-devel mpfr-devel libmpc-devel gettext-devel texinfo wget -# LhA was missing in some of the steps -RUN yum install -y http://ftp.tu-chemnitz.de/pub/linux/dag/redhat/el6/en/x86_64/rpmforge/RPMS/lha-1.14i-19.2.2.el6.rf.x86_64.rpm -RUN git clone https://github.com/bebbo/amiga-gcc && cd amiga-gcc && make update && make all +FROM debian:10.4-slim AS builder + +RUN echo deb http://deb.debian.org/debian/ buster main non-free contrib >/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster main non-free contrib >>/etc/apt/sources.list &&\ + echo deb http://security.debian.org/debian-security buster/updates main contrib non-free >>/etc/apt/sources.list &&\ + echo deb-src http://security.debian.org/debian-security buster/updates main contrib non-free >>/etc/apt/sources.list &&\ + echo deb http://deb.debian.org/debian/ buster-updates main contrib non-free >>/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free >>/etc/apt/sources.list + +RUN apt-get -y update &&\ + apt-get -y install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev autoconf rsync git lhasa + +RUN git clone https://github.com/bebbo/amiga-gcc &&\ + cd amiga-gcc &&\ + make update &&\ + make all -j + + + +FROM debian:10.4-slim -FROM centos:7 -RUN yum install -y make git COPY --from=builder /opt/amiga /opt/amiga + +RUN apt-get -y install make git From 1503302f39030a3ea8f0c510e5eaa001da5506f3 Mon Sep 17 00:00:00 2001 From: Per Weijnitz Date: Wed, 22 Jul 2020 19:21:42 +0200 Subject: [PATCH 2/2] Remove unnecessary repository sections and adjust install target --- Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ac7231..7d9468a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM debian:10.4-slim AS builder -RUN echo deb http://deb.debian.org/debian/ buster main non-free contrib >/etc/apt/sources.list &&\ - echo deb-src http://deb.debian.org/debian/ buster main non-free contrib >>/etc/apt/sources.list &&\ - echo deb http://security.debian.org/debian-security buster/updates main contrib non-free >>/etc/apt/sources.list &&\ - echo deb-src http://security.debian.org/debian-security buster/updates main contrib non-free >>/etc/apt/sources.list &&\ - echo deb http://deb.debian.org/debian/ buster-updates main contrib non-free >>/etc/apt/sources.list &&\ - echo deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free >>/etc/apt/sources.list +RUN echo deb http://deb.debian.org/debian/ buster main >/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster main >>/etc/apt/sources.list &&\ + echo deb http://security.debian.org/debian-security buster/updates main >>/etc/apt/sources.list &&\ + echo deb-src http://security.debian.org/debian-security buster/updates main >>/etc/apt/sources.list &&\ + echo deb http://deb.debian.org/debian/ buster-updates main >>/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster-updates main >>/etc/apt/sources.list RUN apt-get -y update &&\ apt-get -y install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev autoconf rsync git lhasa @@ -21,4 +21,6 @@ FROM debian:10.4-slim COPY --from=builder /opt/amiga /opt/amiga -RUN apt-get -y install make git +RUN echo deb http://deb.debian.org/debian/ buster main >/etc/apt/sources.list &&\ + apt-get -y update &&\ + apt-get -y install make git