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 #667 from le91688/add-flatcc

Browse Source 
add flatcc to Dockcross base image
This commit is contained in:
Matt McCormick 2022-03-08 09:34:19 -05:00 committed by GitHub
commit 9764a2ece1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/common.docker
View File

@ -2,11 +2,13 @@ WORKDIR /usr/src
ARG GIT_VERSION=2.32.0 ARG GIT_VERSION=2.32.0
ARG CMAKE_VERSION=3.21.1 ARG CMAKE_VERSION=3.21.1
ARG FLATCC_VERSION=0.6.0
# Image build scripts # Image build scripts
COPY \ COPY \
imagefiles/build-and-install-cmake.sh \ imagefiles/build-and-install-cmake.sh \
imagefiles/build-and-install-curl.sh \ imagefiles/build-and-install-curl.sh \
imagefiles/build-and-install-flatcc.sh \
imagefiles/build-and-install-git.sh \ imagefiles/build-and-install-git.sh \
imagefiles/build-and-install-ninja.sh \ imagefiles/build-and-install-ninja.sh \
imagefiles/build-and-install-openssl.sh \ imagefiles/build-and-install-openssl.sh \
@ -28,6 +30,7 @@ RUN \
PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \ PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \
/buildscripts/install-python-packages.sh -python ${PYTHON} && \ /buildscripts/install-python-packages.sh -python ${PYTHON} && \
/buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \ /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \
/buildscripts/build-and-install-flatcc.sh && \
rm -rf /buildscripts rm -rf /buildscripts
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd

23
imagefiles/build-and-install-flatcc.sh Executable file
View File

@ -0,0 +1,23 @@
#!/usr/bin/env bash
set -ex
if ! command -v git &> /dev/null; then
echo >&2 'error: "git" not found!'
exit 1
fi
if [[ "${FLATCC_VERSION}" == "" ]]; then
echo >&2 'error: FLATCC_VERSION env. variable must be set to a non-empty value'
exit 1
fi
cd /usr/src
git clone https://github.com/dvidelabs/flatcc.git flatcc -b v$FLATCC_VERSION --depth 1
cd flatcc
cmake -DFLATCC_INSTALL=on && make install > /dev/null
./scripts/cleanall.sh