リビジョン | f78eceb2b4920e9d77f84d9254281235bc40bf74 (tree) |
---|---|
日時 | 2016-04-30 12:34:55 |
作者 | NIWA-Hideyuki <niwa.niwa@nift...> |
コミッター | NIWA-Hideyuki |
Dockerfile for ubuntu16.04
@@ -198,6 +198,9 @@ install-dockerfile : | ||
198 | 198 | install -d -m 755 $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1510 |
199 | 199 | install -m 755 driver/docker/dockerfile/ubuntu1510/Dockerfile $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1510/Dockerfile |
200 | 200 | install -m 755 driver/docker/dockerfile/ubuntu1510/80proxy $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1510/80proxy |
201 | + install -d -m 755 $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1604 | |
202 | + install -m 755 driver/docker/dockerfile/ubuntu1604/Dockerfile $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1604/Dockerfile | |
203 | + install -m 755 driver/docker/dockerfile/ubuntu1604/80proxy $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile/ubuntu1604/80proxy | |
201 | 204 | |
202 | 205 | install-service : |
203 | 206 | install -d -m 755 $(DESTDIR)$(systemddir)/system |
@@ -0,0 +1,4 @@ | ||
1 | +Acquire::http::proxy "http://xxx"; | |
2 | +Acquire::https::proxy "http://xxx"; | |
3 | +Acquire::ftp::proxy "http://xxx"; | |
4 | + |
@@ -0,0 +1,44 @@ | ||
1 | +FROM ubuntu:16.04 | |
2 | +MAINTAINER NIWA Hideyuki | |
3 | + | |
4 | +# setup proxy | |
5 | +# The first # is removed, rewrite the following "http://xxx" in proxy. | |
6 | +# Please rewrite in "80proxy" file similarly. | |
7 | + | |
8 | +#ENV http_proxy http://xxx | |
9 | +#ENV https_proxy http://xxx | |
10 | +#ENV ftp_proxy http://xxx | |
11 | +#ADD 80proxy /etc/apt/apt.conf.d/ | |
12 | + | |
13 | +ENV container docker | |
14 | +ENV DEBIAN_FRONTEND noninteractive | |
15 | + | |
16 | +# install packages | |
17 | +RUN apt-get update | |
18 | +RUN apt-get install --reinstall -y --force-yes upstart | |
19 | +RUN apt-get install --reinstall -y --force-yes sysvinit-utils || true | |
20 | +RUN mv /sbin/initctl.distrib /sbin/initctl | |
21 | +RUN apt-get install -qq -y --force-yes rsyslog initscripts apt-utils sudo vim \ | |
22 | + less openssh-server net-tools | |
23 | +RUN rm -f /etc/apt/apt.conf.d/docker* | |
24 | +RUN rm -rf /etc/systemd/system/* | |
25 | +RUN systemctl mask systemd-logind.service | |
26 | +RUN systemctl set-default multi-user.target | |
27 | +RUN systemctl enable rsyslog ssh | |
28 | + | |
29 | +# setup ssh | |
30 | +RUN printf "\nUseDNS=no\n" >> /etc/ssh/sshd_config | |
31 | +RUN printf "\nGSSAPIAuthentication no\nAddressFamily inet\n" >>/etc/ssh/ssh_config | |
32 | +RUN rm -rf /etc/ssh/ssh_host_rsa_key && ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' | |
33 | +RUN sed -i /etc/ssh/sshd_config \ | |
34 | + -e "s/PermitRootLogin without-password/PermitRootLogin yes/" | |
35 | + | |
36 | +# setup passwd | |
37 | +RUN passwd -l root | |
38 | + | |
39 | + | |
40 | +VOLUME ["/sys/fs/cgroup"] | |
41 | +VOLUME ["/run"] | |
42 | + | |
43 | +CMD ["/sbin/init"] | |
44 | + |
@@ -156,7 +156,7 @@ do | ||
156 | 156 | if [ x"$IMAGENAME" == x"$i" ]; then |
157 | 157 | MATCHFLG=1 |
158 | 158 | if [ $FLG_N -eq 1 ]; then |
159 | - setup_new_image $i | |
159 | + generate_new_image $i | |
160 | 160 | else |
161 | 161 | download_new_image $i |
162 | 162 | fi |