Skip to content

Commit

Permalink
Merge pull request #108 from DieterReuter/update-raw-image-0.3.1
Browse files Browse the repository at this point in the history
Update raw image to 0.3.1, increased disk size to 1200 MByte
  • Loading branch information
DieterReuter authored Jul 14, 2019
2 parents d59648a + c80842d commit 4b748ed
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM hypriot/image-builder:latest

ENV HYPRIOT_OS_VERSION=v2.1.0 \
RAW_IMAGE_VERSION=v0.2.2
RAW_IMAGE_VERSION=v0.3.1

#Note that the checksums and build timestamps only apply when fetching missing
#artifacts remotely is enabled to validate downloaded remote artifacts
Expand All @@ -16,7 +16,7 @@ ENV FETCH_MISSING_ARTIFACTS=true \
DOCKER_MACHINE_VERSION="0.16.1" \
KERNEL_VERSION="4.19.58" \
ROOTFS_TAR_CHECKSUM="4437ac3ab8278a4a3994aa9aa36f0f00bc409f80ebdffef23a141dfc0286ecb0" \
RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1c2c6" \
RAW_IMAGE_CHECKSUM="ccff10498fb45fb76c6064988fb01b3543adfdb70ee7e5fb04b51885573684a6" \
BOOTLOADER_BUILD="20190713-140339" \
KERNEL_BUILD="20190713-150518"

Expand Down
7 changes: 7 additions & 0 deletions builder/chroot-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,12 @@ ln -s /sbin/resizefs /sbin/init

# as the Pi does not have a hardware clock we need a fake one
apt-get install -y \
--no-install-recommends \
fake-hwclock

# install packages for managing wireless interfaces
apt-get install -y \
--no-install-recommends \
wpasupplicant \
wireless-tools \
ethtool \
Expand All @@ -203,10 +205,12 @@ apt-get install -y \

# ensure compatibility with Docker install.sh, so `raspbian` will be detected correctly
apt-get install -y \
--no-install-recommends \
lsb-release

# install cloud-init and its required dependencies
apt-get install -y \
--no-install-recommends \
cloud-init \
dirmngr \
less
Expand All @@ -227,6 +231,7 @@ echo '{
#
# Install packages to allow apt to use a repository over HTTPS:
apt-get install -y \
--no-install-recommends \
apt-transport-https \
ca-certificates \
curl \
Expand All @@ -244,6 +249,7 @@ add-apt-repository \
# Install Docker CE
apt-get update
apt-get install -y \
--no-install-recommends \
docker-ce="${DOCKER_ENGINE_VERSION}" \
docker-ce-cli="${DOCKER_ENGINE_VERSION}" \
containerd.io="${CONTAINERD_IO_VERSION}"
Expand All @@ -258,6 +264,7 @@ curl -sSL "https://raw.githubusercontent.com/docker/machine/v${DOCKER_MACHINE_VE

# install Docker Compose via pip
apt-get install -y \
--no-install-recommends \
python
curl -sSL https://bootstrap.pypa.io/get-pip.py | python
pip install docker-compose=="${DOCKER_COMPOSE_VERSION}"
Expand Down

0 comments on commit 4b748ed

Please sign in to comment.