From 7236d1f8712886f4d3c6b5c4622bccd376a79261 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 2 Mar 2016 10:21:14 -0500 Subject: [PATCH 1/5] ci: Build base image. --- circle.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..4fc7c04 --- /dev/null +++ b/circle.yml @@ -0,0 +1,12 @@ +machine: + services: + - docker + +dependencies: + override: + - docker info + - docker pull thewtex/cross-compiler-base + +test: + override: + - make base From ad06c037dd4911ce5146cfa2a5eebbaa1e2c3872 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 2 Mar 2016 12:24:00 -0500 Subject: [PATCH 2/5] ci: Add DockerHub deployment. --- circle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/circle.yml b/circle.yml index 4fc7c04..5596e62 100644 --- a/circle.yml +++ b/circle.yml @@ -10,3 +10,10 @@ dependencies: test: override: - make base + +deployment: + hub: + branch: master + commands: + - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - docker push thewtex/cross-compiler-base From c5cc02a2d802379cb6d227e7d040aba608a35abf Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 2 Mar 2016 13:15:41 -0500 Subject: [PATCH 3/5] base: Clean up CMake and ninja source trees. --- Dockerfile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index d1737fe..405335e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update && apt-get -y install \ bash \ build-essential \ bzip2 \ + ca-certificates \ curl \ file \ git \ @@ -22,24 +23,25 @@ RUN apt-get update && apt-get -y install \ tar \ vim \ wget \ - xz-utils + xz-utils && \ + apt-get -y clean # Build and install CMake from source. WORKDIR /usr/src RUN git clone git://cmake.org/cmake.git CMake && \ cd CMake && \ - git checkout v3.4.3 -RUN mkdir CMake-build -WORKDIR /usr/src/CMake-build -RUN /usr/src/CMake/bootstrap \ + git checkout v3.4.3 && \ + cd .. && mkdir CMake-build && \ + /usr/src/CMake/bootstrap \ --parallel=$(nproc) \ --prefix=/usr && \ make -j$(nproc) && \ ./bin/cmake -DCMAKE_USE_SYSTEM_CURL:BOOL=ON \ + -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_USE_OPENSSL:BOOL=ON . && \ make install && \ - rm -rf * -WORKDIR /usr/src + cd .. && \ + rm -rf CMake* # Build and install Ninja from source RUN git clone https://github.com/martine/ninja.git && \ @@ -47,4 +49,5 @@ RUN git clone https://github.com/martine/ninja.git && \ git checkout v1.6.0 && \ python ./configure.py --bootstrap && \ ./ninja && \ - cp ./ninja /usr/bin/ + cp ./ninja /usr/bin/ && \ + cd .. && rm -rf ninja From 946e1cd39f2f2d6ded2c3df3b8b3b8627cdbbe29 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 2 Mar 2016 13:18:29 -0500 Subject: [PATCH 4/5] doc: Add CircleCI status badge. --- README.md | 4 ---- README.rst | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 README.md create mode 100644 README.rst diff --git a/README.md b/README.md deleted file mode 100644 index 98250e9..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -cross-compilers -=============== - -Dockerfiles for cross compiling environments diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..b8662e1 --- /dev/null +++ b/README.rst @@ -0,0 +1,7 @@ +cross-compilers +=============== +Dockerfiles for cross compiling environments +-------------------------------------------- + +.. image:: https://circleci.com/gh/thewtex/cross-compilers/tree/master.svg?style=svg + :target: https://circleci.com/gh/thewtex/cross-compilers/tree/master From ff934cbc13f6571f86cdd2117098eae4fdd4121d Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 2 Mar 2016 13:22:38 -0500 Subject: [PATCH 5/5] doc: Add base image description. --- README.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.rst b/README.rst index b8662e1..fd7af0e 100644 --- a/README.rst +++ b/README.rst @@ -5,3 +5,10 @@ Dockerfiles for cross compiling environments .. image:: https://circleci.com/gh/thewtex/cross-compilers/tree/master.svg?style=svg :target: https://circleci.com/gh/thewtex/cross-compilers/tree/master + +.. |base-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-base:latest.svg + :target: https://imagelayers.io/?images=thewtex/cross-compiler-base:latest + +thewtex/cross-compiler-base + |base-images| Base image for other toolchain images. From Debian Jessie with GCC, + make, autotools, CMake, Ninja, Git, and Python.