From b6743d37a24050f4fcaea8dfdeeb61f1df2c5412 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 26 Sep 2014 17:40:15 -0600 Subject: [PATCH] Run `update.sh` --- buildpack-deps/README.md | 2 ++ clojure/README.md | 5 ++++- gcc/README.md | 2 ++ golang/README.md | 2 ++ hello-world/README.md | 4 +++- hello-world/update.sh | 3 +++ hylang/README.md | 2 ++ java/README.md | 2 ++ jruby/README.md | 2 ++ mongo/README.md | 5 +++++ mysql/README.md | 2 ++ nginx/README.md | 2 ++ node/README.md | 2 ++ perl/README.md | 10 ++++++---- php/README.md | 2 ++ postgres/README.md | 6 ++++++ python/README.md | 2 ++ rails/README.md | 2 ++ redis/README.md | 6 ++++++ ruby/README.md | 2 ++ ubuntu/README.md | 19 +++---------------- wordpress/README.md | 3 +++ 22 files changed, 65 insertions(+), 22 deletions(-) diff --git a/buildpack-deps/README.md b/buildpack-deps/README.md index 63225bd56b6c..0971077231c0 100644 --- a/buildpack-deps/README.md +++ b/buildpack-deps/README.md @@ -12,6 +12,8 @@ things like Ruby Gems, PyPI modules, etc. For example, `buildpack-deps` would let you do a `bundle install` in an arbitrary application directory without knowing beforehand that `ssl.h` is required to build a dependent module. + + # How to use this image This stack is designed to be the foundation of a language-stack image. diff --git a/clojure/README.md b/clojure/README.md index 78bd86443fff..c2927b2c0935 100644 --- a/clojure/README.md +++ b/clojure/README.md @@ -1,6 +1,7 @@ # Supported tags and respective `Dockerfile` links -- [`latest` (*Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/30ed1b891ea059a33ca56f04ecf6f467bbbd2362/Dockerfile) +- [`latest`, `lein-2.5.0` (*Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/27d0141c22bedbf78b908bf5bebd6629fc10a491/Dockerfile) +- [`lein-2.4.3` (*Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/30ed1b891ea059a33ca56f04ecf6f467bbbd2362/Dockerfile) # What is Clojure? @@ -11,6 +12,8 @@ other Lisps, Clojure treats code as data and has a macro system. > [wikipedia.org/wiki/Clojure](http://en.wikipedia.org/wiki/Clojure) + + # How to use this image ## Start a Lein/Clojure instance in your app diff --git a/gcc/README.md b/gcc/README.md index cf6eaddd94f9..39956b497fd3 100644 --- a/gcc/README.md +++ b/gcc/README.md @@ -15,6 +15,8 @@ growth of free software, as both a tool and an example. > [wikipedia.org/wiki/GNU_Compiler_Collection](https://en.wikipedia.org/wiki/GNU_Compiler_Collection) + + # How to use this image ## Start a GCC instance running your app diff --git a/golang/README.md b/golang/README.md index 0a0ff0dde07d..fcc58c88d739 100644 --- a/golang/README.md +++ b/golang/README.md @@ -26,6 +26,8 @@ key-value maps), and a large standard library. > [wikipedia.org/wiki/Go_(programming_language)](http://en.wikipedia.org/wiki/Go_(programming_language)) + + # How to use this image ## Start a Go instance in your app diff --git a/hello-world/README.md b/hello-world/README.md index 47a94f383df7..7a191af11fa3 100644 --- a/hello-world/README.md +++ b/hello-world/README.md @@ -25,7 +25,9 @@ $ docker images hello-world REPOSITORY TAG IMAGE ID VIRTUAL SIZE - hello-world latest 565a9d68a73f 922 B + hello-world latest f86750113cd2 910 B + + # User Feedback diff --git a/hello-world/update.sh b/hello-world/update.sh index 1f94c8dfd655..8b64ccccd3ee 100755 --- a/hello-world/update.sh +++ b/hello-world/update.sh @@ -15,3 +15,6 @@ echo echo '$ docker images hello-world' docker images hello-world | awk -F' +' '{ print $1"\t"$2"\t"$3"\t"$5 }' | column -t -s$'\t' } | sed 's/^/ /' + +echo +echo '%%LOGO%%' diff --git a/hylang/README.md b/hylang/README.md index 735e595c4336..80c74e1c08b8 100644 --- a/hylang/README.md +++ b/hylang/README.md @@ -14,6 +14,8 @@ the data structure of both into Python's AST. > [wikipedia.org/wiki/Hy](https://en.wikipedia.org/wiki/Hy) + + # How to use this image ## Create a `Dockerfile` in your Hy project diff --git a/java/README.md b/java/README.md index d4bb1d66c78b..a75f92005d5b 100644 --- a/java/README.md +++ b/java/README.md @@ -15,6 +15,8 @@ Java is a registered trademark of Oracle and/or its affiliates. > [wikipedia.org/wiki/Java_(programming_language)](http://en.wikipedia.org/wiki/Java_(programming_language)) + + # How to use this image ## Start a Java instance in your app diff --git a/jruby/README.md b/jruby/README.md index 0f7a1eef00c8..f00790a21b5e 100644 --- a/jruby/README.md +++ b/jruby/README.md @@ -21,6 +21,8 @@ Ruby that you already know and love. With JRuby you are able to take advantage of real native threads, enhanced garbage collection, and even import and use java libraries. + + # How to use this image ## Create a `Dockerfile` in your Ruby app project diff --git a/mongo/README.md b/mongo/README.md index 6dc4f3f4cd24..e8744a9bf061 100644 --- a/mongo/README.md +++ b/mongo/README.md @@ -13,17 +13,22 @@ First developed by the software company 10gen (now MongoDB Inc.) in October 2007 > [wikipedia.org/wiki/MongoDB](https://en.wikipedia.org/wiki/MongoDB) + + # How to use this image ## start a mongo instance + docker run --name some-mongo -d mongo This image includes `EXPOSE 27017` (the mongo port), so standard container linking will make it automatically available to the linked containers (as the following examples illustrate). ## connect to it from an application + docker run --name some-app --link some-mongo:mongo -d application-that-uses-mongo ## ... or via `mongo` + docker run -it --link some-mongo:mongo --rm mongo sh -c 'exec mongo "$MONGO_PORT_27017_TCP_ADDR:$MONGO_PORT_27017_TCP_PORT/test"' # User Feedback diff --git a/mysql/README.md b/mysql/README.md index 8616ed50b70e..8d7d7e674ce6 100644 --- a/mysql/README.md +++ b/mysql/README.md @@ -13,6 +13,8 @@ Oracle Corporation and/or affiliates own the copyright and trademark for MySQL. > [wikipedia.org/wiki/MySQL](https://en.wikipedia.org/wiki/MySQL) + + # How to use this image ## start a mysql instance diff --git a/nginx/README.md b/nginx/README.md index 27dc9010e1f7..be4f8a4a3dea 100644 --- a/nginx/README.md +++ b/nginx/README.md @@ -8,6 +8,8 @@ Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP, H > [wikipedia.org/wiki/Nginx](https://en.wikipedia.org/wiki/Nginx) + + # How to use this image ## hosting some simple static content diff --git a/node/README.md b/node/README.md index 814da43a492c..50e819dd4e12 100644 --- a/node/README.md +++ b/node/README.md @@ -27,6 +27,8 @@ software such as Apache. > [wikipedia.org/wiki/Node.js](https://en.wikipedia.org/wiki/Node.js) + + # How to use this image ## Create a `Dockerfile` in your Node.js app project diff --git a/perl/README.md b/perl/README.md index 6bb80186754f..d7542b33c566 100644 --- a/perl/README.md +++ b/perl/README.md @@ -1,9 +1,9 @@ # Supported tags and respective `Dockerfile` links -- [`latest`, `5`, `5.20`, `5.20.0` (*5.020.000-64bit/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140804.0/5.020.000-64bit/Dockerfile) -- [`5.18`, `5.18.2` (*5.018.002-64bit/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140804.0/5.018.002-64bit/Dockerfile) -- [`latest-threaded`, `5-threaded`, `5.20-threaded`, `5.20.0-threaded` (*5.020.000-64bit,threaded/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140804.0/5.020.000-64bit,threaded/Dockerfile) -- [`5.18-threaded`, `5.18.2-threaded` (*5.018.002-64bit,threaded/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140804.0/5.018.002-64bit,threaded/Dockerfile) +- [`latest`, `5`, `5.20`, `5.20.1` (*5.020.001-64bit/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140922.0/5.020.001-64bit/Dockerfile) +- [`5.18`, `5.18.2` (*5.018.002-64bit/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140922.0/5.018.002-64bit/Dockerfile) +- [`latest-threaded`, `5-threaded`, `5.20-threaded`, `5.20.1-threaded` (*5.020.001-64bit,threaded/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140922.0/5.020.001-64bit,threaded/Dockerfile) +- [`5.18-threaded`, `5.18.2-threaded` (*5.018.002-64bit,threaded/Dockerfile*)](https://github.com/perl/docker-perl/blob/r20140922.0/5.018.002-64bit,threaded/Dockerfile) # What is Perl? @@ -13,6 +13,8 @@ including C, shell scripting (sh), AWK, and sed. > [wikipedia.org/wiki/Perl](https://en.wikipedia.org/wiki/Perl) + + # How to use this image ## Create a `Dockerfile` in your Perl app project diff --git a/php/README.md b/php/README.md index ff540decc132..410d523b4a6e 100644 --- a/php/README.md +++ b/php/README.md @@ -20,6 +20,8 @@ interface (CGI). > [wikipedia.org/wiki/PHP](http://en.wikipedia.org/wiki/PHP) + + # How to use this image. ## With Command Line diff --git a/postgres/README.md b/postgres/README.md index 042bb3703ecc..57afe62473c1 100644 --- a/postgres/README.md +++ b/postgres/README.md @@ -8,24 +8,30 @@ - [`9.4-beta2`, `9.4` (*9.4/Dockerfile*)](https://github.com/docker-library/postgres/blob/94aee2022d2014230fad3d054c048678137281d1/9.4/Dockerfile) # What is PostgreSQL? + PostgreSQL, often simply "Postgres", is an object-relational database management system (ORDBMS) with an emphasis on extensibility and standards-compliance. As a database server, its primary function is to store data, securely and supporting best practices, and retrieve it later, as requested by other software applications, be it those on the same computer or those running on another computer across a network (including the Internet). It can handle workloads ranging from small single-machine applications to large Internet-facing applications with many concurrent users. Recent versions also provide replication of the database itself for security and scalability. PostgreSQL implements the majority of the SQL:2011 standard, is ACID-compliant and transactional (including most DDL statements) avoiding locking issues using multiversion concurrency control (MVCC), provides immunity to dirty reads and full serializability; handles complex SQL queries using many indexing methods that are not available in other databases; has updateable views and materialized views, triggers, foreign keys; supports functions and stored procedures, and other expandability, and has a large number of extensions written by third parties. In addition to the possibility of working with the major proprietary and open source databases, PostgreSQL supports migration from them, by its extensive standard SQL support and available migration tools. And if proprietary extensions had been used, by its extensibility that can emulate many through some built-in and third-party open source compatibility extensions, such as for Oracle. > [wikipedia.org/wiki/PostgreSQL](https://en.wikipedia.org/wiki/PostgreSQL) + + # How to use this image ## start a postgres instance + docker run --name some-postgres -d postgres This image includes `EXPOSE 5432` (the postgres port), so standard container linking will make it automatically available to the linked containers. The default `postgres` user and database are created in the entrypoint with `initdb`. > The postgres database is a default database meant for use by users, utilities and third party applications. [postgresql.org/docs](http://www.postgresql.org/docs/9.3/interactive/app-initdb.html) ## connect to it from an application + docker run --name some-app --link some-postgres:postgres -d application-that-uses-postgres ## ... or via `psql` + docker run -it --link some-postgres:postgres --rm postgres sh -c 'exec psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres' # User Feedback diff --git a/python/README.md b/python/README.md index 027ea6910779..291a95c7a21d 100644 --- a/python/README.md +++ b/python/README.md @@ -20,6 +20,8 @@ Windows 2000 and later. > [wikipedia.org/wiki/Python_(programming_language)](https://en.wikipedia.org/wiki/Python_(programming_language)) + + # How to use this image ## Create a `Dockerfile` in your Python app project diff --git a/rails/README.md b/rails/README.md index d9bf9a7e0762..97cae77aab49 100644 --- a/rails/README.md +++ b/rails/README.md @@ -14,6 +14,8 @@ the web server. > [wikipedia.org/wiki/Ruby_on_Rails](https://en.wikipedia.org/wiki/Ruby_on_Rails) + + # How to use this image ## Create a `Dockerfile` in your Rails app project diff --git a/redis/README.md b/redis/README.md index 66356eb61f30..bc706f8fd641 100644 --- a/redis/README.md +++ b/redis/README.md @@ -11,13 +11,17 @@ - [`2.8.9` (*2.8.9/Dockerfile*)](https://github.com/docker-library/redis/blob/ffb29617e5dcfe71adf67842d18063c410beede7/2.8.9/Dockerfile) # What is Redis? + Redis is an open-source, networked, in-memory, key-value data store with optional durability. It is written in ANSI C. The development of Redis has been sponsored by Pivotal since May 2013; before that, it was sponsored by VMware. According to the monthly ranking by DB-Engines.com, Redis is the most popular key-value store. The name Redis means REmote DIctionary Server. > [wikipedia.org/wiki/Redis](https://en.wikipedia.org/wiki/Redis) + + # How to use this image ## start a redis instance + docker run --name some-redis -d redis This image includes `EXPOSE 6379` (the redis port), so standard container linking will make it automatically available to the linked containers (as the following examples illustrate). @@ -31,9 +35,11 @@ If persistence is enabled, data is stored in the `VOLUME /data`, which can be us For more about Redis Persistence, see [http://redis.io/topics/persistence](http://redis.io/topics/persistence). ## connect to it from an application + docker run --name some-app --link some-redis:redis -d application-that-uses-redis ## ... or via `redis-cli` + docker run -it --link some-redis:redis --rm redis sh -c 'exec redis-cli -h "$REDIS_PORT_6379_TCP_ADDR" -p "$REDIS_PORT_6379_TCP_PORT"' ## Additionally, If you want to use your own redis.conf ... diff --git a/ruby/README.md b/ruby/README.md index b37a2e2609cd..da4832765c2e 100644 --- a/ruby/README.md +++ b/ruby/README.md @@ -17,6 +17,8 @@ type system and automatic memory management. > [wikipedia.org/wiki/Ruby_(programming_language)](https://en.wikipedia.org/wiki/Ruby_(programming_language)) + + # How to use this image ## Create a `Dockerfile` in your Ruby app project diff --git a/ubuntu/README.md b/ubuntu/README.md index 779e35515ee1..47d10c7eef4c 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -1,8 +1,8 @@ # Supported tags and respective `Dockerfile` links -- [`12.04.5`, `12.04`, `precise` (*precise/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/dd046d19e123c7849e691c7f66848029b46fe47e/precise/Dockerfile) -- [`14.04.1`, `14.04`, `trusty`, `latest` (*trusty/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/dd046d19e123c7849e691c7f66848029b46fe47e/trusty/Dockerfile) -- [`14.10`, `utopic` (*utopic/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/dd046d19e123c7849e691c7f66848029b46fe47e/utopic/Dockerfile) +- [`12.04.5`, `12.04`, `precise` (*precise/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/2b105575647a7e2030ff344d427c3920b89e17a9/precise/Dockerfile) +- [`14.04.1`, `14.04`, `trusty`, `latest` (*trusty/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/2b105575647a7e2030ff344d427c3920b89e17a9/trusty/Dockerfile) +- [`14.10`, `utopic` (*utopic/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/2b105575647a7e2030ff344d427c3920b89e17a9/utopic/Dockerfile) **Built with [Stackbrew](https://github.com/dotcloud/stackbrew/) from [github.com/dotcloud/stackbrew/blob/master/library/ubuntu](https://github.com/dotcloud/stackbrew/blob/master/library/ubuntu)** @@ -68,19 +68,6 @@ As of April 18 2014 these images are based on the official Ubuntu Minimal packag deb http://archive.ubuntu.com/ubuntu/ precise-security universe deb-src http://archive.ubuntu.com/ubuntu/ precise-security universe -## Issues - -If you run into any problems with this image, please check (and potentially file new) [issues on the tianon/docker-brew-ubuntu-core repo](https://github.com/tianon/docker-brew-ubuntu-core/issues), which is the source for this image. - -## Installed packages - -* [lucid (10.04) minimal](http://packages.ubuntu.com/trusty/ubuntu-minimal) -* [precise (12.04) minimal](http://packages.ubuntu.com/trusty/ubuntu-minimal) -* [quantal (12.10) minimal](http://packages.ubuntu.com/trusty/ubuntu-minimal) -* [raring (13.04) minimal](http://packages.ubuntu.com/trusty/ubuntu-minimal) -* [saucy (13.10) minimal](http://packages.ubuntu.com/trusty/ubuntu-minimal) -* [trusty (14.04) minimal](http://packages.ubuntu.com/trusty/ubuntu-minimal) - # User Feedback ## Issues diff --git a/wordpress/README.md b/wordpress/README.md index f688198ed824..b0aa7a7c049b 100644 --- a/wordpress/README.md +++ b/wordpress/README.md @@ -3,10 +3,13 @@ - [`4.0.0`, `4.0`, `4`, `latest` (*Dockerfile*)](https://github.com/docker-library/wordpress/blob/aee00669e7c43f435f021cb02871bffd63d5677a/Dockerfile) # What is WordPress? + WordPress is a free and open source blogging tool and a content management system (CMS) based on PHP and MySQL, which runs on a web hosting service. Features include a plugin architecture and a template system. WordPress is used by more than 22.0% of the top 10 million websites as of August 2013. WordPress is the most popular blogging system in use on the Web, at more than 60 million websites. The most popular languages used are English, Spanish and Bahasa Indonesia. > [wikipedia.org/wiki/WordPress](https://en.wikipedia.org/wiki/WordPress) + + # How to use this image docker run --name some-wordpress --link some-mysql:mysql -d wordpress