1
0
mirror of https://github.com/AmigaPorts/docker-amiga-gcc.git synced 2025-11-20 00:31:57 +00:00

New attempt at separating stuff

This commit is contained in:
Marlon Beijer
2019-06-25 18:07:32 +02:00
parent 3ed192af40
commit d6695d2df0
2 changed files with 7 additions and 4 deletions

View File

@ -1,6 +1,6 @@
MAINTAINER Marlon Beijer "marlon@amigadev.com"
RUN apt-get update && apt-get install -y apt-utils cmake wget git make
RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkgconfig lhasa
RUN echo "root:root" | chpasswd
ENV CROSS_ROOT /opt/${CROSS_PFX}
@ -24,4 +24,5 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
ENV PATH ${PATH}:${CROSS_ROOT}/bin

View File

@ -1,14 +1,16 @@
FROM sebastianbergmann/amiga-gcc:latest
FROM ubuntu:19.04
ENV CROSS_PFX m68k-amigaos
# Temporary fix
COPY --from=sebastianbergmann/amiga-gcc:latest /opt/amiga ./opt/amiga
RUN ln -s /opt/amiga /opt/${CROSS_PFX}
# START COMMON
MAINTAINER Marlon Beijer "marlon@amigadev.com"
RUN apt-get update && apt-get install -y apt-utils cmake wget git make
RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkgconfig lhasa
RUN echo "root:root" | chpasswd
ENV CROSS_ROOT /opt/${CROSS_PFX}