Skip to content

Commit

Permalink
Merge branch 'buildroot-2016.05'
Browse files Browse the repository at this point in the history
  • Loading branch information
ailispaw committed Jun 1, 2016
2 parents 38e34e3 + 894db97 commit 5f0461f
Show file tree
Hide file tree
Showing 11 changed files with 146 additions and 236 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ ENV SRC_DIR=/build \
BR_ROOT=/build/buildroot
RUN mkdir -p ${SRC_DIR} ${OVERLAY}

ENV BR_VERSION 2016.02
ENV BR_VERSION 2016.05
RUN wget -qO- https://buildroot.org/downloads/buildroot-${BR_VERSION}.tar.bz2 | tar xj && \
mv buildroot-${BR_VERSION} ${BR_ROOT}

# Apply patches
COPY patches ${SRC_DIR}/patches
RUN for patch in ${SRC_DIR}/patches/*.patch; do \
patch -p1 -d ${BR_ROOT} < ${patch}; \
done
# COPY patches ${SRC_DIR}/patches
# RUN for patch in ${SRC_DIR}/patches/*.patch; do \
# patch -p1 -d ${BR_ROOT} < ${patch}; \
# done

# Setup overlay
COPY overlay ${OVERLAY}
Expand Down Expand Up @@ -50,7 +50,7 @@ RUN mkdir -p usr/bin && \
wget -qO usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DINIT_VERSION}/dumb-init_${DINIT_VERSION}_amd64 && \
chmod +x usr/bin/dumb-init

ENV VERSION 2.0.3
ENV VERSION 2.1.0
RUN mkdir -p etc && \
echo "Welcome to Barge ${VERSION}, $(usr/bin/docker -v)" > etc/motd && \
echo "NAME=\"Barge\"" > etc/os-release && \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KERNEL_VERSION := 4.4.11
BUSYBOX_VERSION := 1.24.1
BUSYBOX_VERSION := 1.24.2

OUTPUTS := output/rootfs.tar.xz output/bzImage output/barge.iso output/barge.img
SOURCES := Dockerfile .dockerignore \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Barge 2.0

Barge is a lightweight Linux distribution for containers made with [Buildroot](http://buildroot.uclibc.org/).
Barge is a lightweight Linux distribution built with [Buildroot](http://buildroot.uclibc.org/) specifically to run [Docker](https://www.docker.com/) containers.

It's designed for a local development in a virtual machine.

Expand All @@ -14,7 +14,7 @@ It's inspired by the following projects.

## Features

- Based on Buildroot 2016.02 with Linux kernel v4.4.11 and GLIBC.
- Built with Buildroot 2016.05 with Linux kernel v4.4.11 and glibc.
- Strip down the Linux kernel modules and drivers
- Busybox + the following utilities from Buildroot
- sudo, bash, wget, xz, sntp, logrotate
Expand Down
Loading

0 comments on commit 5f0461f

Please sign in to comment.