Skip to content

Upgrade docker and VBox guest addons #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slobo wants to merge 1 commit into
base: azk_iso
Choose a base branch
from
Open

Upgrade docker and VBox guest addons #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
all:
docker rm run-debian2docker
docker build -t debian2docker .
docker run -i -t --privileged --name run-debian2docker debian2docker
docker cp run-debian2docker:/debian2docker.iso .

2 changes: 1 addition & 1 deletion hooks/build-vbox-guest.chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

# Build VBox guest additions
VBOX_VERSION=5.0.2
VBOX_VERSION=6.0.4

mkdir -p /vboxguest
cd /vboxguest
Expand Down
4 changes: 2 additions & 2 deletions hooks/docker.chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ set -e

if [ ! -f /usr/bin/docker ]
then
wget https://get.docker.io/builds/Linux/x86_64/docker-latest.tgz -O /tmp/docker.tgz
wget https://download.docker.com/linux/static/stable/x86_64/docker-18.09.1.tgz -O /tmp/docker.tgz
mkdir /tmp/docker
tar -xpf /tmp/docker.tgz -C /tmp/docker/
rm /tmp/docker.tgz
mv /tmp/docker/usr/local/bin/docker /usr/bin/docker
mv /tmp/docker/docker/* /usr/bin/
rm -rf /tmp/docker
fi

Expand Down
4 changes: 2 additions & 2 deletions includes.chroot/etc/init.d/docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
BASE=$(basename $0)

# modify these in /etc/default/$BASE (/etc/default/docker)
DOCKER=/usr/bin/$BASE
DOCKER=/usr/bin/dockerd
DOCKER_PIDFILE=/var/run/$BASE.pid
DOCKER_LOGFILE=/var/log/$BASE.log
DOCKER_OPTS=
Expand Down Expand Up @@ -109,7 +109,7 @@ case "$1" in
--exec "$DOCKER" \
--pidfile "$DOCKER_PIDFILE" \
-- \
-d -p "$DOCKER_PIDFILE" \
-p "$DOCKER_PIDFILE" \
$DOCKER_OPTS \
-g "$DOCKER_DIR" -H unix:// \
>> "$DOCKER_LOGFILE" 2>&1
Expand Down