Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-10 05:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #519 from bensuperpc/update_bullseye

Browse Source 
Update images to debian bullseye
This commit is contained in:
Matt McCormick 2021-06-30 09:51:45 -04:00 committed by GitHub
commit 37a75535ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.in
View File

@ -1,4 +1,6 @@
FROM debian:buster-slim ARG DOCKER_IMAGE=debian:bullseye-slim
FROM $DOCKER_IMAGE
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
#include "common.debian" #include "common.debian"

5
common.debian
View File

@ -36,10 +36,7 @@ RUN \
xz-utils \ xz-utils \
zip \ zip \
zlib1g-dev \ zlib1g-dev \
# python-is-python3 \ python-is-python3 \
&& apt-get clean autoclean --yes \ && apt-get clean autoclean --yes \
&& apt-get autoremove --yes \ && apt-get autoremove --yes \
&& rm -rf /var/lib/{apt,dpkg,cache,log}/ && rm -rf /var/lib/{apt,dpkg,cache,log}/
RUN ln -s /usr/bin/python3 /usr/bin/python \
&& ln -s /usr/bin/pip3 /usr/bin/pip

6
linux-x64-clang/Dockerfile.in
View File

@ -1,9 +1,9 @@
FROM dockcross/base:latest FROM dockcross/base:latest
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# flang # flang
RUN echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster main" >> /etc/apt/sources.list \ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
&& echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster main" >> /etc/apt/sources.list \ && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - \ && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \ && apt-get update \
&& apt-get purge --autoremove -y gcc g++ software-properties-common \ && apt-get purge --autoremove -y gcc g++ software-properties-common \
&& apt-get -y install clang libc++-dev libc++abi-dev clang-format clang-tidy lldb \ && apt-get -y install clang libc++-dev libc++abi-dev clang-format clang-tidy lldb \