-
Notifications
You must be signed in to change notification settings - Fork 371
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1970 from alfred-bratterud/0.13-release
0.13 release
- Loading branch information
Showing
801 changed files
with
24,179 additions
and
14,329 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| build_* | ||
| IncludeOS_install/ | ||
| **/build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,106 @@ | ||
| FROM ubuntu:xenial | ||
| FROM ubuntu:xenial as base | ||
|
|
||
| RUN apt-get update && apt-get -y install \ | ||
| sudo \ | ||
| curl \ | ||
| locales \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
| RUN locale-gen en_US.UTF-8 | ||
| ENV LANG=en_US.UTF-8 \ | ||
| LANGUAGE=en_US:en \ | ||
| LC_ALL=en_US.UTF-8 | ||
|
|
||
| # Add fixuid to change permissions for bind-mounts. Set uid to same as host with -u <uid>:<guid> | ||
| RUN addgroup --gid 1000 docker && \ | ||
| adduser --uid 1000 --ingroup docker --home /home/docker --shell /bin/sh --disabled-password --gecos "" docker && \ | ||
| usermod -aG sudo docker && \ | ||
| sed -i.bkp -e \ | ||
| 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' \ | ||
| /etc/sudoers | ||
| RUN USER=docker && \ | ||
| GROUP=docker && \ | ||
| curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.3/fixuid-0.3-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - && \ | ||
| chown root:root /usr/local/bin/fixuid && \ | ||
| chmod 4755 /usr/local/bin/fixuid && \ | ||
| mkdir -p /etc/fixuid && \ | ||
| printf "user: $USER\ngroup: $GROUP\npaths:\n - /service\n" > /etc/fixuid/config.yml | ||
|
|
||
| ARG CUSTOM_TAG | ||
| LABEL org.label-schema.schema-version="1.0" \ | ||
| org.label-schema.name="IncludeOS builder" \ | ||
| org.label-schema.vendor="IncludeOS" \ | ||
| org.label-schema.version=$CUSTOM_TAG \ | ||
| org.label-schema.vcs-url="https://github.com/hioa-cs/includeos" | ||
|
|
||
| RUN echo "LANG=C.UTF-8" > /etc/default/locale | ||
|
|
||
| ######################### | ||
| FROM base as source-build | ||
|
|
||
| RUN apt-get update && apt-get -y install \ | ||
| git \ | ||
| lsb-release \ | ||
| net-tools \ | ||
| sudo \ | ||
| wget \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| RUN useradd --create-home -s /bin/bash ubuntu | ||
| RUN adduser ubuntu sudo | ||
| RUN echo -n 'ubuntu:ubuntu' | chpasswd | ||
| RUN mkdir -p /root/IncludeOS | ||
| WORKDIR /root/IncludeOS | ||
| COPY . . | ||
|
|
||
| # Enable passwordless sudo for users under the "sudo" group | ||
| RUN sed -i.bkp -e \ | ||
| 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' \ | ||
| /etc/sudoers | ||
| # Ability to specify custom tag that overwrites any existing tag. This will then match what IncludeOS reports itself. | ||
| ARG CUSTOM_TAG | ||
| RUN git describe --tags --dirty > /ios_version.txt | ||
| RUN : ${CUSTOM_TAG:=$(git describe --tags)} && git tag -d $(git describe --tags); git tag $CUSTOM_TAG && git describe --tags --dirty > /custom_tag.txt | ||
|
|
||
| # Installation | ||
| RUN ./install.sh -n | ||
|
|
||
| ############################# | ||
| FROM base as grubify | ||
|
|
||
| RUN apt-get update && apt-get -y install \ | ||
| dosfstools \ | ||
| grub-pc | ||
|
|
||
| USER ubuntu | ||
| COPY --from=source-build /usr/local/includeos/scripts/grubify.sh /home/ubuntu/IncludeOS_install/includeos/scripts/grubify.sh | ||
|
|
||
| ADD . /home/ubuntu/IncludeOS | ||
| WORKDIR /home/ubuntu/IncludeOS | ||
| ENTRYPOINT ["fixuid", "/home/ubuntu/IncludeOS_install/includeos/scripts/grubify.sh"] | ||
|
|
||
| RUN sudo apt-get update && \ | ||
| sudo do_bridge="" ./etc/install_all_source.sh \ | ||
| && sudo rm -rf /var/lib/apt/lists/* | ||
| ########################### | ||
| FROM base as build | ||
|
|
||
| RUN apt-get update && apt-get -y install \ | ||
| git \ | ||
| clang-5.0 \ | ||
| cmake \ | ||
| nasm \ | ||
| python-pip \ | ||
| && rm -rf /var/lib/apt/lists/* \ | ||
| && pip install pystache antlr4-python2-runtime && \ | ||
| apt-get remove -y python-pip && \ | ||
| apt autoremove -y | ||
|
|
||
| ARG VCS_REF="Check file /ios_version.txt inside container" | ||
| LABEL org.label-schema.description="Build a service using IncludeOS" \ | ||
| org.label-schema.vcs-ref=$VCS_REF \ | ||
| org.label-schema.docker.cmd="docker run -v $PWD:/service <container>" | ||
|
|
||
| VOLUME /service | ||
| WORKDIR /service | ||
|
|
||
| CMD ./run.sh | ||
| COPY --from=source-build /usr/local/includeos /usr/local/includeos/ | ||
| COPY --from=source-build /usr/local/bin/boot /usr/local/bin/boot | ||
| COPY --from=source-build /root/IncludeOS/etc/install_dependencies_linux.sh / | ||
| COPY --from=source-build /root/IncludeOS/etc/use_clang_version.sh / | ||
| COPY --from=source-build /root/IncludeOS/lib/uplink/starbase /root/IncludeOS/lib/uplink/starbase/ | ||
| COPY --from=source-build /ios_version.txt / | ||
| COPY --from=source-build /custom_tag.txt / | ||
| COPY --from=source-build /root/IncludeOS/etc/docker_entrypoint.sh /entrypoint.sh | ||
| ENTRYPOINT ["/entrypoint.sh"] | ||
|
|
||
| CMD mkdir -p build && \ | ||
| cd build && \ | ||
| cp $(find /usr/local/includeos -name chainloader) /service/build/chainloader && \ | ||
| echo "IncludeOS version:" $(cat /ios_version.txt) "tag:" $(cat /custom_tag.txt) && \ | ||
| cmake .. && \ | ||
| make |
Submodule NaCl
updated
50 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.