mirror of
https://github.com/AmigaPorts/docker-amiga-gcc.git
synced 2025-11-21 01:32:07 +00:00
Merge pull request #1 from AmigaPorts/MBeijer-patch-1
Update base packages
This commit is contained in:
@ -12,7 +12,7 @@ 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 autoconf pkg-config lhasa
|
||||
RUN apt-get update && apt-get install -y apt-utils cmake wget curl git make automake autoconf pkg-config lhasa unzip gcc-multilib libtool
|
||||
RUN echo "root:root" | chpasswd
|
||||
|
||||
RUN ln -s /opt/${CROSS_PFX} /tools
|
||||
|
||||
@ -9,7 +9,7 @@ COPY --from=build-env /opt/${CROSS_PFX} ./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 autoconf pkg-config lhasa
|
||||
RUN apt-get update && apt-get install -y cmake wget curl git make automake autoconf pkg-config lhasa unzip gcc-multilib libtool
|
||||
RUN echo "root:root" | chpasswd
|
||||
|
||||
RUN ln -s /opt/${CROSS_PFX} /tools
|
||||
@ -34,4 +34,4 @@ 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 PATH ${PATH}:${CROSS_ROOT}/bin
|
||||
# END COMMON
|
||||
# END COMMON
|
||||
|
||||
@ -9,7 +9,7 @@ COPY --from=build-env /opt/${CROSS_PFX} ./opt/${CROSS_PFX}
|
||||
# START COMMON
|
||||
MAINTAINER Marlon Beijer "marlon@amigadev.com"
|
||||
|
||||
RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkg-config lhasa libc6:i386 libstdc++6:i386
|
||||
RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y cmake wget curl git make automake autoconf pkg-config lhasa unzip gcc-multilib libtool libc6:i386 libstdc++6:i386
|
||||
RUN echo "root:root" | chpasswd
|
||||
|
||||
RUN ln -s /opt/${CROSS_PFX} /tools
|
||||
|
||||
Reference in New Issue
Block a user