mirror of
https://github.com/AmigaPorts/docker-amiga-gcc.git
synced 2025-11-21 10:05:00 +00:00
New attempt at separating stuff
This commit is contained in:
@ -1,6 +1,6 @@
|
|||||||
MAINTAINER Marlon Beijer "marlon@amigadev.com"
|
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
|
RUN echo "root:root" | chpasswd
|
||||||
|
|
||||||
ENV CROSS_ROOT /opt/${CROSS_PFX}
|
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/
|
COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
|
||||||
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
|
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
|
||||||
@ -1,14 +1,16 @@
|
|||||||
FROM sebastianbergmann/amiga-gcc:latest
|
FROM ubuntu:19.04
|
||||||
|
|
||||||
ENV CROSS_PFX m68k-amigaos
|
ENV CROSS_PFX m68k-amigaos
|
||||||
|
|
||||||
# Temporary fix
|
# Temporary fix
|
||||||
|
COPY --from=sebastianbergmann/amiga-gcc:latest /opt/amiga ./opt/amiga
|
||||||
RUN ln -s /opt/amiga /opt/${CROSS_PFX}
|
RUN ln -s /opt/amiga /opt/${CROSS_PFX}
|
||||||
|
|
||||||
|
|
||||||
# START COMMON
|
# START COMMON
|
||||||
MAINTAINER Marlon Beijer "marlon@amigadev.com"
|
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
|
RUN echo "root:root" | chpasswd
|
||||||
|
|
||||||
ENV CROSS_ROOT /opt/${CROSS_PFX}
|
ENV CROSS_ROOT /opt/${CROSS_PFX}
|
||||||
|
|||||||
Reference in New Issue
Block a user