~ubuntu-on-ec2/vmbuilder/jenkins_kvm-linux-azure

Viewing changes to templates/img-azure-15.10-docker.tmpl

Committer: Robert Jennings
Date: 2016-02-12 16:37:47 UTC
mfrom: (736.1.4 public)
Revision ID: robert.jennings@canonical.com-20160212163747-alb8foa1lt4lonh1

Merge from lp:~utlemming/vmbuilder/azure_docker
  Ben Howard 2016-02-11 Add default user to the docker group
  Ben Howard 2016-02-11 Cleanup after ourselves
  Ben Howard 2016-02-11 Fix docker addin

files modified:
azure_config.sh

templates/img-azure-15.10-docker.tmpl

templates/img-azure-16.04-docker.tmpl

Show diffs side-by-side

added added

removed removed

templates/img-azure-15.10-docker.tmpl

docker-compose

)

xchroot apt-get -y install --install-suggests ${dpkgs[@]}

xchroot apt-get -y install ${dpkgs[@]}

xchroot apt-get -y clean

# Add the default user to the docker group

cat > ${mp}/etc/cloud/cloud.cfg.d/90-azure-docker.cfg <<EOM

system_info:

# This will affect which distro class gets used

distro: ubuntu

# Default user name + that default users groups (if added/used)

default_user:

name: ubuntu

lock_passwd: True

gecos: Ubuntu

groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video, docker]

sudo: ["ALL=(ALL) NOPASSWD:ALL"]

shell: /bin/bash

EOM

Older »