Dockerfile for ubuntu16.04

diff --git a/src/Makefile b/src/Makefile
index ddde199..4e36a98 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -198,6 +198,9 @@ install-dockerfile :
        install -d -m 755 $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1510
        install -m 755 driver/docker/dockerfile/ubuntu1510/Dockerfile $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1510/Dockerfile
        install -m 755 driver/docker/dockerfile/ubuntu1510/80proxy $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1510/80proxy
+       install -d -m 755 $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1604
+       install -m 755 driver/docker/dockerfile/ubuntu1604/Dockerfile $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1604/Dockerfile
+       install -m 755 driver/docker/dockerfile/ubuntu1604/80proxy $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1604/80proxy
 
 install-service :
        install -d -m 755 $(DESTDIR)$(systemddir)/system

diff --git a/src/driver/docker/dockerfile/ubuntu1604/80proxy b/src/driver/docker/dockerfile/ubuntu1604/80proxy
new file mode 100644 (file)
index 0000000..503eb85
--- /dev/null
+++ b/src/driver/docker/dockerfile/ubuntu1604/80proxy
@@ -0,0 +1,4 @@
+Acquire::http::proxy "http://xxx";
+Acquire::https::proxy "http://xxx";
+Acquire::ftp::proxy "http://xxx";
+

diff --git a/src/driver/docker/dockerfile/ubuntu1604/Dockerfile b/src/driver/docker/dockerfile/ubuntu1604/Dockerfile
new file mode 100644 (file)
index 0000000..330c324
--- /dev/null
+++ b/src/driver/docker/dockerfile/ubuntu1604/Dockerfile
@@ -0,0 +1,44 @@
+FROM ubuntu:16.04
+MAINTAINER NIWA Hideyuki
+
+# setup proxy
+# The first # is removed, rewrite the following "http://xxx" in proxy. 
+# Please rewrite in "80proxy" file similarly. 
+
+#ENV http_proxy http://xxx
+#ENV https_proxy http://xxx
+#ENV ftp_proxy http://xxx
+#ADD 80proxy /etc/apt/apt.conf.d/
+
+ENV container docker
+ENV DEBIAN_FRONTEND noninteractive
+
+# install packages
+RUN apt-get update 
+RUN apt-get install --reinstall -y --force-yes upstart
+RUN apt-get install --reinstall -y --force-yes sysvinit-utils || true
+RUN mv /sbin/initctl.distrib /sbin/initctl
+RUN apt-get install -qq -y --force-yes rsyslog initscripts apt-utils sudo vim \
+       less openssh-server net-tools
+RUN rm -f /etc/apt/apt.conf.d/docker*
+RUN rm -rf /etc/systemd/system/*
+RUN systemctl mask systemd-logind.service
+RUN systemctl set-default multi-user.target
+RUN systemctl enable rsyslog ssh
+
+# setup ssh
+RUN printf "\nUseDNS=no\n" >> /etc/ssh/sshd_config
+RUN printf "\nGSSAPIAuthentication no\nAddressFamily inet\n" >>/etc/ssh/ssh_config
+RUN rm -rf /etc/ssh/ssh_host_rsa_key && ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+RUN sed -i /etc/ssh/sshd_config \
+       -e "s/PermitRootLogin without-password/PermitRootLogin yes/"
+
+# setup passwd
+RUN passwd -l root
+
+
+VOLUME ["/sys/fs/cgroup"]
+VOLUME ["/run"]
+
+CMD ["/sbin/init"]
+

diff --git a/src/driver/docker/fulcon-setup b/src/driver/docker/fulcon-setup
index a966b29..b34a2c4 100755 (executable)
--- a/src/driver/docker/fulcon-setup
+++ b/src/driver/docker/fulcon-setup
@@ -156,7 +156,7 @@ do
        if [ x"$IMAGENAME" == x"$i" ]; then
                MATCHFLG=1
                if [ $FLG_N -eq 1 ]; then
-                       setup_new_image $i
+                       generate_new_image $i
                else
                        download_new_image $i
                fi