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

Test to separate the main with the common

This commit is contained in:
Marlon Beijer
2019-06-25 17:22:52 +02:00
parent be20785e8e
commit d0cc2c8416
3 changed files with 13 additions and 7 deletions

View File

@ -1,10 +1,8 @@
FROM sebastianbergmann/amiga-gcc:latest
MAINTAINER Marlon Beijer "marlon@amigadev.com"
RUN apt-get update && apt-get install -y apt-utils cmake wget git make
RUN echo "root:root" | chpasswd
ENV CROSS_PFX m68k-amigaos
ENV CROSS_ROOT /opt/${CROSS_PFX}
# Temporary fix
@ -13,9 +11,9 @@ RUN rm /opt/${CROSS_PFX} ; ln -s /opt/amiga /opt/${CROSS_PFX}
WORKDIR /work
ENTRYPOINT ["/entry/entrypoint.sh"]
COPY imagefiles/cmake.sh /usr/local/bin/cmake
COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
COPY imagefiles/entrypoint.sh /entry/
COPY ../imagefiles/cmake.sh /usr/local/bin/cmake
COPY ../imagefiles/ccmake.sh /usr/local/bin/ccmake
COPY ../imagefiles/entrypoint.sh /entry/
ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
@ -25,6 +23,6 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
CXX=${CROSS_ROOT}/bin/${CROSS_PFX}-g++ \
RANLIB=${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib
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_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr

8
m68k-amigaos/Dockerfile Normal file
View File

@ -0,0 +1,8 @@
FROM sebastianbergmann/amiga-gcc:latest
ENV CROSS_PFX m68k-amigaos
# Temporary fix
RUN ln -s /opt/amiga /opt/${CROSS_PFX}
#include "../common.docker"