Skip to content

Commit

Permalink
Merge pull request #751 from jirutka/alpine-tmpl
Browse files Browse the repository at this point in the history
Rewrite template script for Alpine Linux
  • Loading branch information
Christian Brauner committed Feb 26, 2016
2 parents e5712bb + 1125e05 commit 127ef99
Show file tree
Hide file tree
Showing 5 changed files with 483 additions and 319 deletions.
2 changes: 2 additions & 0 deletions config/templates/Makefile.am
Expand Up @@ -5,6 +5,8 @@ EXTRA_DIST = common.seccomp
SUBDIRS = common.conf.d

templatesconfig_DATA = \
alpine.common.conf \
alpine.userns.conf \
archlinux.common.conf \
archlinux.userns.conf \
centos.common.conf \
Expand Down
20 changes: 20 additions & 0 deletions config/templates/alpine.common.conf.in
@@ -0,0 +1,20 @@
# This derives from the global common config.
lxc.include = @LXCTEMPLATECONFIG@/common.conf

# Doesn't support consoles in /dev/lxc/.
lxc.devttydir =

# Drop another (potentially) harmful capabilities.
lxc.cap.drop = audit_write
lxc.cap.drop = ipc_owner
lxc.cap.drop = mknod
lxc.cap.drop = setfcap
lxc.cap.drop = setpcap
lxc.cap.drop = sys_nice
lxc.cap.drop = sys_pacct
lxc.cap.drop = sys_ptrace
lxc.cap.drop = sys_rawio
lxc.cap.drop = sys_resource
lxc.cap.drop = sys_tty_config
lxc.cap.drop = syslog
lxc.cap.drop = wake_alarm
2 changes: 2 additions & 0 deletions config/templates/alpine.userns.conf.in
@@ -0,0 +1,2 @@
# This derives from the global userns config.
lxc.include = @LXCTEMPLATECONFIG@/userns.conf
2 changes: 2 additions & 0 deletions configure.ac
Expand Up @@ -654,6 +654,8 @@ AC_CONFIG_FILES([
config/init/upstart/Makefile
config/etc/Makefile
config/templates/Makefile
config/templates/alpine.common.conf
config/templates/alpine.userns.conf
config/templates/archlinux.common.conf
config/templates/archlinux.userns.conf
config/templates/centos.common.conf
Expand Down

0 comments on commit 127ef99

Please sign in to comment.