mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 09:04:27 +01:00
Merge pull request #86 from dockcross/depend-on-base-latest
Depend on base latest
This commit is contained in:
commit
451715b6ec
2
Makefile
2
Makefile
@ -39,7 +39,7 @@ test: base.test $(addsuffix .test,$(IMAGES))
|
|||||||
#
|
#
|
||||||
# browser-asmjs
|
# browser-asmjs
|
||||||
#
|
#
|
||||||
browser-asmjs: base browser-asmjs/Dockerfile.in common.docker common.debian
|
browser-asmjs: browser-asmjs/Dockerfile.in common.docker common.debian
|
||||||
sed -e '/common.docker/ r common.docker' -e '/common.debian/ r common.debian' $@/Dockerfile.in > $@/Dockerfile
|
sed -e '/common.docker/ r common.docker' -e '/common.debian/ r common.debian' $@/Dockerfile.in > $@/Dockerfile
|
||||||
mkdir -p $@/imagefiles && cp -r imagefiles $@/
|
mkdir -p $@/imagefiles && cp -r imagefiles $@/
|
||||||
cp -r test browser-asmjs/
|
cp -r test browser-asmjs/
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# The cross-compiling emulator
|
# The cross-compiling emulator
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# Add the cross compiler sources
|
# Add the cross compiler sources
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
|
# This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# Enable 32 bits binaries
|
# Enable 32 bits binaries
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# Add the cross compiler sources
|
# Add the cross compiler sources
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# Add the cross compiler sources
|
# Add the cross compiler sources
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
ENV CROSS_TRIPLE x86_64-linux-gnu
|
ENV CROSS_TRIPLE x86_64-linux-gnu
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
RUN dpkg --add-architecture i386 && \
|
RUN dpkg --add-architecture i386 && \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# WINE is used as an emulator for try_run and tests with CMake.
|
# WINE is used as an emulator for try_run and tests with CMake.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM dockcross/base
|
FROM dockcross/base:latest
|
||||||
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
|
||||||
|
|
||||||
# WINE is used as an emulator for try_run and tests with CMake.
|
# WINE is used as an emulator for try_run and tests with CMake.
|
||||||
|
Loading…
Reference in New Issue
Block a user