Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-13 22:51:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #320 from HubertJFarnsworth/move-debian-distro-from-jessie-to-stretch

Browse Source 
Updated debian distro from jessie to stretch
This commit is contained in:
Matt McCormick 2019-04-22 21:39:23 -04:00 committed by GitHub
commit bda0c3d7ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -11,10 +11,10 @@ jobs:
- run: - run:
name: base build name: base build
command: | command: |
docker pull debian:jessie docker pull debian:stretch-slim
make base make base
mkdir -p ~/docker mkdir -p ~/docker
docker save -o ~/docker/base.tar debian:jessie dockcross/base:latest docker save -o ~/docker/base.tar debian:stretch-slim dockcross/base:latest
- run: - run:
name: base test name: base test
command: | command: |

2
Dockerfile.in
View File

@ -1,4 +1,4 @@
FROM debian:jessie-20181112 FROM debian:stretch-20190326-slim
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
#include "common.debian" #include "common.debian"

10
common.debian
View File

@ -5,10 +5,10 @@ ARG DEBIAN_FRONTEND=noninteractive
ARG REPO=http://cdn-fastly.deb.debian.org ARG REPO=http://cdn-fastly.deb.debian.org
RUN \ RUN \
bash -c "echo \"deb $REPO/debian jessie main contrib non-free\" > /etc/apt/sources.list" && \ bash -c "echo \"deb $REPO/debian stretch main contrib non-free\" > /etc/apt/sources.list" && \
bash -c "echo \"deb $REPO/debian jessie-updates main contrib non-free\" >> /etc/apt/sources.list" && \ bash -c "echo \"deb $REPO/debian stretch-updates main contrib non-free\" >> /etc/apt/sources.list" && \
bash -c "echo \"deb $REPO/debian-security jessie/updates main\" >> /etc/apt/sources.list" && \ bash -c "echo \"deb $REPO/debian-security stretch/updates main\" >> /etc/apt/sources.list" && \
bash -c "echo \"deb http://ftp.debian.org/debian jessie-backports main\" >> /etc/apt/sources.list" && \ bash -c "echo \"deb http://ftp.debian.org/debian stretch-backports main\" >> /etc/apt/sources.list" && \
apt-get update --yes && \ apt-get update --yes && \
apt-get install --no-install-recommends --yes \ apt-get install --no-install-recommends --yes \
automake \ automake \
@ -19,9 +19,11 @@ RUN \
bzip2 \ bzip2 \
ca-certificates \ ca-certificates \
curl \ curl \
dirmngr \
file \ file \
gettext \ gettext \
gzip \ gzip \
gnupg \
zip \ zip \
make \ make \
ncurses-dev \ ncurses-dev \

9
imagefiles/install-gosu-binary.sh
View File

@ -33,7 +33,14 @@ curl -o /usr/local/bin/gosu.asc -# -SL $url_key
gpg --verify /usr/local/bin/gosu.asc gpg --verify /usr/local/bin/gosu.asc
# cleanup # cleanup -- need to kill agent so that there is no race condition for
# agent files in $GNUPGHOME. Only need to do this on newer distros
# with gpgconf installed
GPGCONF_BIN="$(command -v gpgconf)" || true
if [ -n "$GPGCONF_BIN" ] && [ -x $GPGCONF_BIN ]; then
gpgconf --kill gpg-agent
fi
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc
chmod +x /usr/local/bin/gosu chmod +x /usr/local/bin/gosu

3
linux-ppc64le/Dockerfile
View File

@ -37,9 +37,6 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
WORKDIR /work WORKDIR /work
# Note: Toolchain file support is currently in debian Experimental according to:
# https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29
# We can switch to that when it becomes stable.
COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/ COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake

2
linux-x86/Dockerfile
View File

@ -33,8 +33,6 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \ CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
# Note: Toolchain file support is currently in debian Experimental:
# https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29
COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/ COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake