Przeglądaj źródła

Merge pull request #7035 from tianon/standardize-apt-get-install

Standardize "apt-get install" usage across the repo
Sven Dowideit 11 lat temu
rodzic
commit
503d124677

+ 1 - 2
Dockerfile

@@ -28,8 +28,7 @@ FROM	ubuntu:14.04
 MAINTAINER	Tianon Gravi <admwiggin@gmail.com> (@tianon)
 MAINTAINER	Tianon Gravi <admwiggin@gmail.com> (@tianon)
 
 
 # Packaged dependencies
 # Packaged dependencies
-RUN	apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
-	apt-utils \
+RUN	apt-get update && apt-get install -y \
 	aufs-tools \
 	aufs-tools \
 	automake \
 	automake \
 	btrfs-tools \
 	btrfs-tools \

+ 1 - 2
README.md

@@ -131,8 +131,7 @@ Here's a typical Docker build process:
 
 
 ```bash
 ```bash
 FROM ubuntu:12.04
 FROM ubuntu:12.04
-RUN apt-get update
-RUN apt-get install -q -y python python-pip curl
+RUN apt-get update && apt-get install -y python python-pip curl
 RUN curl -sSL https://github.com/shykes/helloflask/archive/master.tar.gz | tar -xzv
 RUN curl -sSL https://github.com/shykes/helloflask/archive/master.tar.gz | tar -xzv
 RUN cd helloflask-master && pip install -r requirements.txt
 RUN cd helloflask-master && pip install -r requirements.txt
 ```
 ```

+ 1 - 1
contrib/desktop-integration/iceweasel/Dockerfile

@@ -29,7 +29,7 @@ FROM debian:wheezy
 MAINTAINER Daniel Mizyrycki <daniel@docker.com>
 MAINTAINER Daniel Mizyrycki <daniel@docker.com>
 
 
 # Install Iceweasel and "sudo"
 # Install Iceweasel and "sudo"
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq iceweasel sudo
+RUN apt-get update && apt-get install -y iceweasel sudo
 
 
 # create sysadmin account
 # create sysadmin account
 RUN useradd -m -d /data -p saIVpsc0EVTwA sysadmin
 RUN useradd -m -d /data -p saIVpsc0EVTwA sysadmin

+ 1 - 1
docs/Dockerfile

@@ -4,7 +4,7 @@
 FROM 		debian:jessie
 FROM 		debian:jessie
 MAINTAINER	Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit)
 MAINTAINER	Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit)
 
 
-RUN 	apt-get update && apt-get install -yq make python-pip python-setuptools vim-tiny git gettext
+RUN 	apt-get update && apt-get install -y make python-pip python-setuptools vim-tiny git gettext
 
 
 RUN	pip install mkdocs
 RUN	pip install mkdocs
 
 

+ 3 - 4
docs/sources/articles/cfengine_process_management.md

@@ -65,13 +65,12 @@ The first two steps can be done as part of a Dockerfile, as follows.
     FROM ubuntu
     FROM ubuntu
     MAINTAINER Eystein Måløy Stenberg <eytein.stenberg@gmail.com>
     MAINTAINER Eystein Måløy Stenberg <eytein.stenberg@gmail.com>
 
 
-    RUN apt-get -y install wget lsb-release unzip ca-certificates
+    RUN apt-get update && apt-get install -y wget lsb-release unzip ca-certificates
 
 
     # install latest CFEngine
     # install latest CFEngine
     RUN wget -qO- http://cfengine.com/pub/gpg.key | apt-key add -
     RUN wget -qO- http://cfengine.com/pub/gpg.key | apt-key add -
     RUN echo "deb http://cfengine.com/pub/apt $(lsb_release -cs) main" > /etc/apt/sources.list.d/cfengine-community.list
     RUN echo "deb http://cfengine.com/pub/apt $(lsb_release -cs) main" > /etc/apt/sources.list.d/cfengine-community.list
-    RUN apt-get update
-    RUN apt-get install cfengine-community
+    RUN apt-get update && apt-get install -y cfengine-community
 
 
     # install cfe-docker process management policy
     # install cfe-docker process management policy
     RUN wget https://github.com/estenberg/cfe-docker/archive/master.zip -P /tmp/ && unzip /tmp/master.zip -d /tmp/
     RUN wget https://github.com/estenberg/cfe-docker/archive/master.zip -P /tmp/ && unzip /tmp/master.zip -d /tmp/
@@ -80,7 +79,7 @@ The first two steps can be done as part of a Dockerfile, as follows.
     RUN rm -rf /tmp/cfe-docker-master /tmp/master.zip
     RUN rm -rf /tmp/cfe-docker-master /tmp/master.zip
 
 
     # apache2 and openssh are just for testing purposes, install your own apps here
     # apache2 and openssh are just for testing purposes, install your own apps here
-    RUN apt-get -y install openssh-server apache2
+    RUN apt-get update && apt-get install -y openssh-server apache2
     RUN mkdir -p /var/run/sshd
     RUN mkdir -p /var/run/sshd
     RUN echo "root:password" | chpasswd  # need a password for ssh
     RUN echo "root:password" | chpasswd  # need a password for ssh
 
 

+ 2 - 7
docs/sources/articles/using_supervisord.md

@@ -28,19 +28,14 @@ new image.
 
 
     FROM ubuntu:13.04
     FROM ubuntu:13.04
     MAINTAINER examples@docker.com
     MAINTAINER examples@docker.com
-    RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-    RUN apt-get update
-    RUN apt-get upgrade -y
 
 
 ## Installing Supervisor
 ## Installing Supervisor
 
 
 We can now install our SSH and Apache daemons as well as Supervisor in
 We can now install our SSH and Apache daemons as well as Supervisor in
 our container.
 our container.
 
 
-    RUN apt-get install -y openssh-server apache2 supervisor
-    RUN mkdir -p /var/lock/apache2 /var/run/apache2
-    RUN mkdir -p /var/run/sshd
-    RUN mkdir -p /var/log/supervisor
+    RUN apt-get update && apt-get install -y openssh-server apache2 supervisor
+    RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/run/sshd /var/log/supervisor
 
 
 Here we're installing the `openssh-server`,
 Here we're installing the `openssh-server`,
 `apache2` and `supervisor`
 `apache2` and `supervisor`

+ 2 - 2
docs/sources/examples/apt-cacher-ng.Dockerfile

@@ -9,7 +9,7 @@ FROM		ubuntu
 MAINTAINER	SvenDowideit@docker.com
 MAINTAINER	SvenDowideit@docker.com
 
 
 VOLUME		["/var/cache/apt-cacher-ng"]
 VOLUME		["/var/cache/apt-cacher-ng"]
-RUN		apt-get update ; apt-get install -yq apt-cacher-ng
+RUN		apt-get update && apt-get install -y apt-cacher-ng
 
 
 EXPOSE		3142
 EXPOSE		3142
-CMD		chmod 777 /var/cache/apt-cacher-ng ; /etc/init.d/apt-cacher-ng start ; tail -f /var/log/apt-cacher-ng/*
+CMD		chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/*

+ 3 - 3
docs/sources/examples/apt-cacher-ng.md

@@ -28,10 +28,10 @@ Use the following Dockerfile:
     MAINTAINER  SvenDowideit@docker.com
     MAINTAINER  SvenDowideit@docker.com
 
 
     VOLUME      ["/var/cache/apt-cacher-ng"]
     VOLUME      ["/var/cache/apt-cacher-ng"]
-    RUN     apt-get update ; apt-get install -yq apt-cacher-ng
+    RUN     apt-get update && apt-get install -y apt-cacher-ng
 
 
     EXPOSE      3142
     EXPOSE      3142
-    CMD     chmod 777 /var/cache/apt-cacher-ng ; /etc/init.d/apt-cacher-ng start ; tail -f /var/log/apt-cacher-ng/*
+    CMD     chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/*
 
 
 To build the image using:
 To build the image using:
 
 
@@ -61,7 +61,7 @@ a local version of a common base:
 
 
     FROM ubuntu
     FROM ubuntu
     RUN  echo 'Acquire::http { Proxy "http://dockerhost:3142"; };' >> /etc/apt/apt.conf.d/01proxy
     RUN  echo 'Acquire::http { Proxy "http://dockerhost:3142"; };' >> /etc/apt/apt.conf.d/01proxy
-    RUN apt-get update ; apt-get install vim git
+    RUN apt-get update && apt-get install -y vim git
 
 
     # docker build -t my_ubuntu .
     # docker build -t my_ubuntu .
 
 

+ 2 - 3
docs/sources/examples/mongodb.md

@@ -65,13 +65,12 @@ a MongoDB repository file for the package manager.
 After this initial preparation we can update our packages and install MongoDB.
 After this initial preparation we can update our packages and install MongoDB.
 
 
     # Update apt-get sources AND install MongoDB
     # Update apt-get sources AND install MongoDB
-    RUN apt-get update
-    RUN apt-get install -y -q mongodb-org
+    RUN apt-get update && apt-get install -y mongodb-org
 
 
 > **Tip:** You can install a specific version of MongoDB by using a list
 > **Tip:** You can install a specific version of MongoDB by using a list
 > of required packages with versions, e.g.:
 > of required packages with versions, e.g.:
 > 
 > 
->     RUN apt-get install -y -q mongodb-org=2.6.1 mongodb-org-server=2.6.1 mongodb-org-shell=2.6.1 mongodb-org-mongos=2.6.1 mongodb-org-tools=2.6.1
+>     RUN apt-get update && apt-get install -y mongodb-org=2.6.1 mongodb-org-server=2.6.1 mongodb-org-shell=2.6.1 mongodb-org-mongos=2.6.1 mongodb-org-tools=2.6.1
 
 
 MongoDB requires a data directory. Let's create it as the final step of our
 MongoDB requires a data directory. Let's create it as the final step of our
 installation instructions.
 installation instructions.

+ 3 - 4
docs/sources/examples/mongodb/Dockerfile

@@ -11,8 +11,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 RUN echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | tee /etc/apt/sources.list.d/10gen.list
 RUN echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | tee /etc/apt/sources.list.d/10gen.list
 
 
 # Update apt-get sources AND install MongoDB
 # Update apt-get sources AND install MongoDB
-RUN apt-get update
-RUN apt-get install -y -q mongodb-org
+RUN apt-get update && apt-get install -y mongodb-org
 
 
 # Create the MongoDB data directory
 # Create the MongoDB data directory
 RUN mkdir -p /data/db
 RUN mkdir -p /data/db
@@ -20,5 +19,5 @@ RUN mkdir -p /data/db
 # Expose port #27017 from the container to the host
 # Expose port #27017 from the container to the host
 EXPOSE 27017
 EXPOSE 27017
 
 
-# Set usr/bin/mongod as the dockerized entry-point application
-ENTRYPOINT usr/bin/mongod
+# Set /usr/bin/mongod as the dockerized entry-point application
+ENTRYPOINT ["/usr/bin/mongod"]

+ 2 - 6
docs/sources/examples/postgresql_service.Dockerfile

@@ -13,17 +13,13 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B97B0AFCAA
 #     of PostgreSQL, ``9.3``.
 #     of PostgreSQL, ``9.3``.
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 
 
-# Update the Ubuntu and PostgreSQL repository indexes
-RUN apt-get update
-
 # Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3
 # Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3
 #  There are some warnings (in red) that show up during the build. You can hide
 #  There are some warnings (in red) that show up during the build. You can hide
 #  them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
 #  them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y -q install python-software-properties software-properties-common
-RUN apt-get -y -q install postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
+RUN apt-get update && apt-get install -y python-software-properties software-properties-common postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
 
 
 # Note: The official Debian and Ubuntu images automatically ``apt-get clean``
 # Note: The official Debian and Ubuntu images automatically ``apt-get clean``
-# after each ``apt-get`` 
+# after each ``apt-get``
 
 
 # Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed``
 # Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed``
 USER postgres
 USER postgres

+ 2 - 6
docs/sources/examples/postgresql_service.md

@@ -35,17 +35,13 @@ Start by creating a new `Dockerfile`:
     #     of PostgreSQL, ``9.3``.
     #     of PostgreSQL, ``9.3``.
     RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
     RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 
 
-    # Update the Ubuntu and PostgreSQL repository indexes
-    RUN apt-get update
-
     # Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3
     # Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3
     #  There are some warnings (in red) that show up during the build. You can hide
     #  There are some warnings (in red) that show up during the build. You can hide
     #  them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
     #  them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
-    RUN apt-get -y -q install python-software-properties software-properties-common
-    RUN apt-get -y -q install postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
+    RUN apt-get update && apt-get install -y python-software-properties software-properties-common postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
 
 
     # Note: The official Debian and Ubuntu images automatically ``apt-get clean``
     # Note: The official Debian and Ubuntu images automatically ``apt-get clean``
-    # after each ``apt-get`` 
+    # after each ``apt-get``
 
 
     # Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed``
     # Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed``
     USER postgres
     USER postgres

+ 4 - 5
docs/sources/examples/running_redis_service.md

@@ -13,8 +13,7 @@ Firstly, we create a `Dockerfile` for our new Redis
 image.
 image.
 
 
     FROM        ubuntu:12.10
     FROM        ubuntu:12.10
-    RUN         apt-get update
-    RUN         apt-get -y install redis-server
+    RUN         apt-get update && apt-get install -y redis-server
     EXPOSE      6379
     EXPOSE      6379
     ENTRYPOINT  ["/usr/bin/redis-server"]
     ENTRYPOINT  ["/usr/bin/redis-server"]
 
 
@@ -49,9 +48,9 @@ container to only this container.
 Once inside our freshly created container we need to install Redis to
 Once inside our freshly created container we need to install Redis to
 get the `redis-cli` binary to test our connection.
 get the `redis-cli` binary to test our connection.
 
 
-    $ apt-get update
-    $ apt-get -y install redis-server
-    $ service redis-server stop
+    $ sudo apt-get update
+    $ sudo apt-get install redis-server
+    $ sudo service redis-server stop
 
 
 As we've used the `--link redis:db` option, Docker
 As we've used the `--link redis:db` option, Docker
 has created some environment variables in our web application container.
 has created some environment variables in our web application container.

+ 2 - 18
docs/sources/examples/running_riak_service.md

@@ -25,13 +25,6 @@ of. We'll use [Ubuntu](https://registry.hub.docker.com/_/ubuntu/) (tag:
     FROM ubuntu:latest
     FROM ubuntu:latest
     MAINTAINER Hector Castro hector@basho.com
     MAINTAINER Hector Castro hector@basho.com
 
 
-Next, we update the APT cache and apply any updates:
-
-    # Update the APT cache
-    RUN sed -i.bak 's/main$/main universe/' /etc/apt/sources.list
-    RUN apt-get update
-    RUN apt-get upgrade -y
-
 After that, we install and setup a few dependencies:
 After that, we install and setup a few dependencies:
 
 
  - `curl` is used to download Basho's APT
  - `curl` is used to download Basho's APT
@@ -46,7 +39,7 @@ After that, we install and setup a few dependencies:
 <!-- -->
 <!-- -->
 
 
     # Install and setup project dependencies
     # Install and setup project dependencies
-    RUN apt-get install -y curl lsb-release supervisor openssh-server
+    RUN apt-get update && apt-get install -y curl lsb-release supervisor openssh-server
 
 
     RUN mkdir -p /var/run/sshd
     RUN mkdir -p /var/run/sshd
     RUN mkdir -p /var/log/supervisor
     RUN mkdir -p /var/log/supervisor
@@ -61,23 +54,14 @@ Next, we add Basho's APT repository:
 
 
     RUN curl -sSL http://apt.basho.com/gpg/basho.apt.key | apt-key add --
     RUN curl -sSL http://apt.basho.com/gpg/basho.apt.key | apt-key add --
     RUN echo "deb http://apt.basho.com $(lsb_release -cs) main" > /etc/apt/sources.list.d/basho.list
     RUN echo "deb http://apt.basho.com $(lsb_release -cs) main" > /etc/apt/sources.list.d/basho.list
-    RUN apt-get update
 
 
 After that, we install Riak and alter a few defaults:
 After that, we install Riak and alter a few defaults:
 
 
     # Install Riak and prepare it to run
     # Install Riak and prepare it to run
-    RUN apt-get install -y riak
+    RUN apt-get update && apt-get install -y riak
     RUN sed -i.bak 's/127.0.0.1/0.0.0.0/' /etc/riak/app.config
     RUN sed -i.bak 's/127.0.0.1/0.0.0.0/' /etc/riak/app.config
     RUN echo "ulimit -n 4096" >> /etc/default/riak
     RUN echo "ulimit -n 4096" >> /etc/default/riak
 
 
-Almost there. Next, we add a hack to get us by the lack of
-`initctl`:
-
-    # Hack for initctl
-    # See: https://github.com/docker/docker/issues/1024
-    RUN dpkg-divert --local --rename --add /sbin/initctl
-    RUN ln -s /bin/true /sbin/initctl
-
 Then, we expose the Riak Protocol Buffers and HTTP interfaces, along
 Then, we expose the Riak Protocol Buffers and HTTP interfaces, along
 with SSH:
 with SSH:
 
 

+ 1 - 4
docs/sources/examples/running_ssh_service.Dockerfile

@@ -5,10 +5,7 @@
 FROM    ubuntu:12.04
 FROM    ubuntu:12.04
 MAINTAINER Thatcher R. Peskens "thatcher@dotcloud.com"
 MAINTAINER Thatcher R. Peskens "thatcher@dotcloud.com"
 
 
-# make sure the package repository is up to date
-RUN apt-get update
-
-RUN apt-get install -y openssh-server
+RUN apt-get update && apt-get install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN mkdir /var/run/sshd
 RUN echo 'root:screencast' |chpasswd
 RUN echo 'root:screencast' |chpasswd
 
 

+ 1 - 4
docs/sources/examples/running_ssh_service.md

@@ -15,10 +15,7 @@ quick access to a test container.
     FROM     ubuntu:12.04
     FROM     ubuntu:12.04
     MAINTAINER Thatcher R. Peskens "thatcher@dotcloud.com"
     MAINTAINER Thatcher R. Peskens "thatcher@dotcloud.com"
 
 
-    # make sure the package repository is up to date
-    RUN apt-get update
-
-    RUN apt-get install -y openssh-server
+    RUN apt-get update && apt-get install -y openssh-server
     RUN mkdir /var/run/sshd
     RUN mkdir /var/run/sshd
     RUN echo 'root:screencast' |chpasswd
     RUN echo 'root:screencast' |chpasswd
 
 

+ 2 - 9
docs/sources/reference/builder.md

@@ -516,23 +516,16 @@ For example you might add something like this:
     FROM      ubuntu
     FROM      ubuntu
     MAINTAINER Victor Vieux <victor@docker.com>
     MAINTAINER Victor Vieux <victor@docker.com>
 
 
-    # make sure the package repository is up to date
-    RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-    RUN apt-get update
-
-    RUN apt-get install -y inotify-tools nginx apache2 openssh-server
+    RUN apt-get update && apt-get install -y inotify-tools nginx apache2 openssh-server
 
 
     # Firefox over VNC
     # Firefox over VNC
     #
     #
     # VERSION               0.3
     # VERSION               0.3
 
 
     FROM ubuntu
     FROM ubuntu
-    # make sure the package repository is up to date
-    RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-    RUN apt-get update
 
 
     # Install vnc, xvfb in order to create a 'fake' display and firefox
     # Install vnc, xvfb in order to create a 'fake' display and firefox
-    RUN apt-get install -y x11vnc xvfb firefox
+    RUN apt-get update && apt-get install -y x11vnc xvfb firefox
     RUN mkdir /.vnc
     RUN mkdir /.vnc
     # Setup a password
     # Setup a password
     RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
     RUN x11vnc -storepasswd 1234 ~/.vnc/passwd

+ 152 - 23
docs/sources/userguide/dockerimages.md

@@ -245,8 +245,7 @@ example now for building our own Sinatra image for our development team.
     # This is a comment
     # This is a comment
     FROM ubuntu:14.04
     FROM ubuntu:14.04
     MAINTAINER Kate Smith <ksmith@example.com>
     MAINTAINER Kate Smith <ksmith@example.com>
-    RUN apt-get -qq update
-    RUN apt-get -qqy install ruby ruby-dev
+    RUN apt-get update && apt-get install -y ruby ruby-dev
     RUN gem install sinatra
     RUN gem install sinatra
 
 
 Let's look at what our `Dockerfile` does. Each instruction prefixes a statement and is capitalized.
 Let's look at what our `Dockerfile` does. Each instruction prefixes a statement and is capitalized.
@@ -272,38 +271,168 @@ Sinatra gem.
 Now let's take our `Dockerfile` and use the `docker build` command to build an image.
 Now let's take our `Dockerfile` and use the `docker build` command to build an image.
 
 
     $ sudo docker build -t="ouruser/sinatra:v2" .
     $ sudo docker build -t="ouruser/sinatra:v2" .
-    Uploading context  2.56 kB
-    Uploading context
+    Sending build context to Docker daemon 2.048 kB
+    Sending build context to Docker daemon 
     Step 0 : FROM ubuntu:14.04
     Step 0 : FROM ubuntu:14.04
-     ---> 99ec81b80c55
+     ---> e54ca5efa2e9
     Step 1 : MAINTAINER Kate Smith <ksmith@example.com>
     Step 1 : MAINTAINER Kate Smith <ksmith@example.com>
-     ---> Running in 7c5664a8a0c1
-     ---> 2fa8ca4e2a13
-    Removing intermediate container 7c5664a8a0c1
-    Step 2 : RUN apt-get -qq update
-     ---> Running in b07cc3fb4256
-     ---> 50d21070ec0c
-    Removing intermediate container b07cc3fb4256
-    Step 3 : RUN apt-get -qqy install ruby ruby-dev
-     ---> Running in a5b038dd127e
+     ---> Using cache
+     ---> 851baf55332b
+    Step 2 : RUN apt-get update && apt-get install -y ruby ruby-dev
+     ---> Running in 3a2558904e9b
     Selecting previously unselected package libasan0:amd64.
     Selecting previously unselected package libasan0:amd64.
     (Reading database ... 11518 files and directories currently installed.)
     (Reading database ... 11518 files and directories currently installed.)
     Preparing to unpack .../libasan0_4.8.2-19ubuntu1_amd64.deb ...
     Preparing to unpack .../libasan0_4.8.2-19ubuntu1_amd64.deb ...
-    . . .
+    Unpacking libasan0:amd64 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package libatomic1:amd64.
+    Preparing to unpack .../libatomic1_4.8.2-19ubuntu1_amd64.deb ...
+    Unpacking libatomic1:amd64 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package libgmp10:amd64.
+    Preparing to unpack .../libgmp10_2%3a5.1.3+dfsg-1ubuntu1_amd64.deb ...
+    Unpacking libgmp10:amd64 (2:5.1.3+dfsg-1ubuntu1) ...
+    Selecting previously unselected package libisl10:amd64.
+    Preparing to unpack .../libisl10_0.12.2-1_amd64.deb ...
+    Unpacking libisl10:amd64 (0.12.2-1) ...
+    Selecting previously unselected package libcloog-isl4:amd64.
+    Preparing to unpack .../libcloog-isl4_0.18.2-1_amd64.deb ...
+    Unpacking libcloog-isl4:amd64 (0.18.2-1) ...
+    Selecting previously unselected package libgomp1:amd64.
+    Preparing to unpack .../libgomp1_4.8.2-19ubuntu1_amd64.deb ...
+    Unpacking libgomp1:amd64 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package libitm1:amd64.
+    Preparing to unpack .../libitm1_4.8.2-19ubuntu1_amd64.deb ...
+    Unpacking libitm1:amd64 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package libmpfr4:amd64.
+    Preparing to unpack .../libmpfr4_3.1.2-1_amd64.deb ...
+    Unpacking libmpfr4:amd64 (3.1.2-1) ...
+    Selecting previously unselected package libquadmath0:amd64.
+    Preparing to unpack .../libquadmath0_4.8.2-19ubuntu1_amd64.deb ...
+    Unpacking libquadmath0:amd64 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package libtsan0:amd64.
+    Preparing to unpack .../libtsan0_4.8.2-19ubuntu1_amd64.deb ...
+    Unpacking libtsan0:amd64 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package libyaml-0-2:amd64.
+    Preparing to unpack .../libyaml-0-2_0.1.4-3ubuntu3_amd64.deb ...
+    Unpacking libyaml-0-2:amd64 (0.1.4-3ubuntu3) ...
+    Selecting previously unselected package libmpc3:amd64.
+    Preparing to unpack .../libmpc3_1.0.1-1ubuntu1_amd64.deb ...
+    Unpacking libmpc3:amd64 (1.0.1-1ubuntu1) ...
+    Selecting previously unselected package openssl.
+    Preparing to unpack .../openssl_1.0.1f-1ubuntu2.4_amd64.deb ...
+    Unpacking openssl (1.0.1f-1ubuntu2.4) ...
+    Selecting previously unselected package ca-certificates.
+    Preparing to unpack .../ca-certificates_20130906ubuntu2_all.deb ...
+    Unpacking ca-certificates (20130906ubuntu2) ...
+    Selecting previously unselected package manpages.
+    Preparing to unpack .../manpages_3.54-1ubuntu1_all.deb ...
+    Unpacking manpages (3.54-1ubuntu1) ...
+    Selecting previously unselected package binutils.
+    Preparing to unpack .../binutils_2.24-5ubuntu3_amd64.deb ...
+    Unpacking binutils (2.24-5ubuntu3) ...
+    Selecting previously unselected package cpp-4.8.
+    Preparing to unpack .../cpp-4.8_4.8.2-19ubuntu1_amd64.deb ...
+    Unpacking cpp-4.8 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package cpp.
+    Preparing to unpack .../cpp_4%3a4.8.2-1ubuntu6_amd64.deb ...
+    Unpacking cpp (4:4.8.2-1ubuntu6) ...
+    Selecting previously unselected package libgcc-4.8-dev:amd64.
+    Preparing to unpack .../libgcc-4.8-dev_4.8.2-19ubuntu1_amd64.deb ...
+    Unpacking libgcc-4.8-dev:amd64 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package gcc-4.8.
+    Preparing to unpack .../gcc-4.8_4.8.2-19ubuntu1_amd64.deb ...
+    Unpacking gcc-4.8 (4.8.2-19ubuntu1) ...
+    Selecting previously unselected package gcc.
+    Preparing to unpack .../gcc_4%3a4.8.2-1ubuntu6_amd64.deb ...
+    Unpacking gcc (4:4.8.2-1ubuntu6) ...
+    Selecting previously unselected package libc-dev-bin.
+    Preparing to unpack .../libc-dev-bin_2.19-0ubuntu6_amd64.deb ...
+    Unpacking libc-dev-bin (2.19-0ubuntu6) ...
+    Selecting previously unselected package linux-libc-dev:amd64.
+    Preparing to unpack .../linux-libc-dev_3.13.0-30.55_amd64.deb ...
+    Unpacking linux-libc-dev:amd64 (3.13.0-30.55) ...
+    Selecting previously unselected package libc6-dev:amd64.
+    Preparing to unpack .../libc6-dev_2.19-0ubuntu6_amd64.deb ...
+    Unpacking libc6-dev:amd64 (2.19-0ubuntu6) ...
+    Selecting previously unselected package ruby.
+    Preparing to unpack .../ruby_1%3a1.9.3.4_all.deb ...
+    Unpacking ruby (1:1.9.3.4) ...
+    Selecting previously unselected package ruby1.9.1.
+    Preparing to unpack .../ruby1.9.1_1.9.3.484-2ubuntu1_amd64.deb ...
+    Unpacking ruby1.9.1 (1.9.3.484-2ubuntu1) ...
+    Selecting previously unselected package libruby1.9.1.
+    Preparing to unpack .../libruby1.9.1_1.9.3.484-2ubuntu1_amd64.deb ...
+    Unpacking libruby1.9.1 (1.9.3.484-2ubuntu1) ...
+    Selecting previously unselected package manpages-dev.
+    Preparing to unpack .../manpages-dev_3.54-1ubuntu1_all.deb ...
+    Unpacking manpages-dev (3.54-1ubuntu1) ...
+    Selecting previously unselected package ruby1.9.1-dev.
+    Preparing to unpack .../ruby1.9.1-dev_1.9.3.484-2ubuntu1_amd64.deb ...
+    Unpacking ruby1.9.1-dev (1.9.3.484-2ubuntu1) ...
+    Selecting previously unselected package ruby-dev.
+    Preparing to unpack .../ruby-dev_1%3a1.9.3.4_all.deb ...
+    Unpacking ruby-dev (1:1.9.3.4) ...
+    Setting up libasan0:amd64 (4.8.2-19ubuntu1) ...
+    Setting up libatomic1:amd64 (4.8.2-19ubuntu1) ...
+    Setting up libgmp10:amd64 (2:5.1.3+dfsg-1ubuntu1) ...
+    Setting up libisl10:amd64 (0.12.2-1) ...
+    Setting up libcloog-isl4:amd64 (0.18.2-1) ...
+    Setting up libgomp1:amd64 (4.8.2-19ubuntu1) ...
+    Setting up libitm1:amd64 (4.8.2-19ubuntu1) ...
+    Setting up libmpfr4:amd64 (3.1.2-1) ...
+    Setting up libquadmath0:amd64 (4.8.2-19ubuntu1) ...
+    Setting up libtsan0:amd64 (4.8.2-19ubuntu1) ...
+    Setting up libyaml-0-2:amd64 (0.1.4-3ubuntu3) ...
+    Setting up libmpc3:amd64 (1.0.1-1ubuntu1) ...
+    Setting up openssl (1.0.1f-1ubuntu2.4) ...
+    Setting up ca-certificates (20130906ubuntu2) ...
+    debconf: unable to initialize frontend: Dialog
+    debconf: (TERM is not set, so the dialog frontend is not usable.)
+    debconf: falling back to frontend: Readline
+    debconf: unable to initialize frontend: Readline
+    debconf: (This frontend requires a controlling tty.)
+    debconf: falling back to frontend: Teletype
+    Setting up manpages (3.54-1ubuntu1) ...
+    Setting up binutils (2.24-5ubuntu3) ...
+    Setting up cpp-4.8 (4.8.2-19ubuntu1) ...
+    Setting up cpp (4:4.8.2-1ubuntu6) ...
+    Setting up libgcc-4.8-dev:amd64 (4.8.2-19ubuntu1) ...
+    Setting up gcc-4.8 (4.8.2-19ubuntu1) ...
+    Setting up gcc (4:4.8.2-1ubuntu6) ...
+    Setting up libc-dev-bin (2.19-0ubuntu6) ...
+    Setting up linux-libc-dev:amd64 (3.13.0-30.55) ...
+    Setting up libc6-dev:amd64 (2.19-0ubuntu6) ...
+    Setting up manpages-dev (3.54-1ubuntu1) ...
+    Setting up libruby1.9.1 (1.9.3.484-2ubuntu1) ...
+    Setting up ruby1.9.1-dev (1.9.3.484-2ubuntu1) ...
+    Setting up ruby-dev (1:1.9.3.4) ...
     Setting up ruby (1:1.9.3.4) ...
     Setting up ruby (1:1.9.3.4) ...
     Setting up ruby1.9.1 (1.9.3.484-2ubuntu1) ...
     Setting up ruby1.9.1 (1.9.3.484-2ubuntu1) ...
     Processing triggers for libc-bin (2.19-0ubuntu6) ...
     Processing triggers for libc-bin (2.19-0ubuntu6) ...
-     ---> 2acb20f17878
-    Removing intermediate container a5b038dd127e
-    Step 4 : RUN gem install sinatra
-     ---> Running in 5e9d0065c1f7
-    . . .
+    Processing triggers for ca-certificates (20130906ubuntu2) ...
+    Updating certificates in /etc/ssl/certs... 164 added, 0 removed; done.
+    Running hooks in /etc/ca-certificates/update.d....done.
+     ---> c55c31703134
+    Removing intermediate container 3a2558904e9b
+    Step 3 : RUN gem install sinatra
+     ---> Running in 6b81cb6313e5
+    unable to convert "\xC3" to UTF-8 in conversion from ASCII-8BIT to UTF-8 to US-ASCII for README.rdoc, skipping
+    unable to convert "\xC3" to UTF-8 in conversion from ASCII-8BIT to UTF-8 to US-ASCII for README.rdoc, skipping
+    Successfully installed rack-1.5.2
+    Successfully installed tilt-1.4.1
     Successfully installed rack-protection-1.5.3
     Successfully installed rack-protection-1.5.3
     Successfully installed sinatra-1.4.5
     Successfully installed sinatra-1.4.5
     4 gems installed
     4 gems installed
-     ---> 324104cde6ad
-    Removing intermediate container 5e9d0065c1f7
-    Successfully built 324104cde6ad
+    Installing ri documentation for rack-1.5.2...
+    Installing ri documentation for tilt-1.4.1...
+    Installing ri documentation for rack-protection-1.5.3...
+    Installing ri documentation for sinatra-1.4.5...
+    Installing RDoc documentation for rack-1.5.2...
+    Installing RDoc documentation for tilt-1.4.1...
+    Installing RDoc documentation for rack-protection-1.5.3...
+    Installing RDoc documentation for sinatra-1.4.5...
+     ---> 97feabe5d2ed
+    Removing intermediate container 6b81cb6313e5
+    Successfully built 97feabe5d2ed
 
 
 We've specified our `docker build` command and used the `-t` flag to identify
 We've specified our `docker build` command and used the `-t` flag to identify
 our new image as belonging to the user `ouruser`, the repository name `sinatra`
 our new image as belonging to the user `ouruser`, the repository name `sinatra`

+ 2 - 1
hack/release.sh

@@ -290,7 +290,8 @@ echo deb $(s3_url)/ubuntu docker main > /etc/apt/sources.list.d/docker.list
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
 
 
 # Install docker
 # Install docker
-apt-get update ; apt-get install -y lxc-docker
+apt-get update
+apt-get install -y lxc-docker
 
 
 #
 #
 # Alternatively, just use the curl-able install.sh script provided at $(s3_url)
 # Alternatively, just use the curl-able install.sh script provided at $(s3_url)