Merge branch 'master' into add-x86_64-aros-v1-docker

This commit is contained in:
apiraino 2020-02-15 15:38:18 +01:00
commit 8849684979
3 changed files with 6 additions and 9 deletions

View File

@ -1,11 +1,11 @@
FROM sebastianbergmann/amiga-gcc:latest as build-env
FROM ubuntu:19.04
FROM amigadev/docker-base:latest
ENV CROSS_PFX m68k-amigaos
# Temporary fix
COPY --from=build-env /opt/amiga ./opt/amiga
COPY --from=build-env /opt/amiga /opt/amiga
RUN ln -s /opt/amiga /opt/${CROSS_PFX}
@ -38,6 +38,3 @@ ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
ENV PATH ${PATH}:${CROSS_ROOT}/bin
# END COMMON
RUN git clone https://github.com/AmigaPorts/aros-stuff.git
RUN cd aros-stuff/pthreads && make install

View File

@ -1,10 +1,10 @@
FROM amigadev/adtools:latest as build-env
FROM ubuntu:19.04
FROM amigadev/docker-base:latest
ENV CROSS_PFX ppc-amigaos
COPY --from=build-env /opt/${CROSS_PFX} ./opt/${CROSS_PFX}
COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
# START COMMON
MAINTAINER Marlon Beijer "marlon@amigadev.com"

View File

@ -1,10 +1,10 @@
FROM amigadev/morphos-cross-toolchain:latest as build-env
FROM ubuntu:19.04
FROM amigadev/docker-base:latest
ENV CROSS_PFX ppc-morphos
COPY --from=build-env /opt/${CROSS_PFX} ./opt/${CROSS_PFX}
COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
# START COMMON
MAINTAINER Marlon Beijer "marlon@amigadev.com"