From 5734b05408c48d1410dddb06dfad55434cd6cca2 Mon Sep 17 00:00:00 2001 From: apiraino Date: Tue, 15 Oct 2019 00:20:44 +0200 Subject: [PATCH] moved stuff to the base image --- x86_64-aros.docker | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/x86_64-aros.docker b/x86_64-aros.docker index 41e18d7..383eb38 100644 --- a/x86_64-aros.docker +++ b/x86_64-aros.docker @@ -1,6 +1,4 @@ -FROM amigadev/morphos-cross-toolchain:latest as build-env - -FROM amigadev/docker-base:latest +FROM amigadev/arosv1-cross-toolchain:latest as build-env ENV CROSS_PFX x86_64-aros ENV CROSS_ROOT /opt/${CROSS_PFX} @@ -8,20 +6,7 @@ ENV CROSS_ROOT /opt/${CROSS_PFX} # START COMMON MAINTAINER Marlon Beijer "marlon@amigadev.com" -RUN apt update && apt install -y python-pip genisoimage wget curl git make automake autoconf pkg-config unzip gcc-multilib libtool zlib1g g++ libpng-dev libx11-dev libxcursor-dev libgl1-mesa-dev gawk bison flex netpbm cmake gperf libswitch-perl libasound2-dev python-mako -# RUN apt install -y zzlib1g-dev -RUN echo "root:root" | chpasswd - -RUN ln -s /usr/bin/genisoimage /usr/local/bin/mkisofs - -# Install proper LHA -RUN cd /tmp/ && git clone https://github.com/AmigaPorts/lha.git && cd lha && autoreconf -is && ./configure && make && make check && make install - -# Install xdftool -RUN pip install amitools - WORKDIR /work - ENTRYPOINT ["/entry/entrypoint.sh"] COPY imagefiles/cmake.sh /usr/local/bin/cmake