From 6ba8b01acbac23e0a6e1fd2e91367976f05a7117 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 24 Nov 2014 23:51:55 -0700 Subject: [PATCH] Fix a number of "too-specific" versions --- busybox/README.md | 2 +- busybox/content.md | 2 +- golang/README.md | 12 ++++++------ golang/content.md | 12 ++++++------ jruby/README.md | 6 +++--- jruby/content.md | 6 +++--- rails/README.md | 2 +- rails/content.md | 2 +- ruby/README.md | 6 +++--- ruby/content.md | 6 +++--- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/busybox/README.md b/busybox/README.md index ef04fb936..95f2583fd 100644 --- a/busybox/README.md +++ b/busybox/README.md @@ -39,7 +39,7 @@ BusyBox system. ## Create a `Dockerfile` for a binary - FROM busybox:buildroot-2014.02 + FROM busybox COPY ./my-static-binary /my-static-binary CMD ["/my-static-binary"] diff --git a/busybox/content.md b/busybox/content.md index b9554617c..6fc7d76e0 100644 --- a/busybox/content.md +++ b/busybox/content.md @@ -26,7 +26,7 @@ BusyBox system. ## Create a `Dockerfile` for a binary - FROM busybox:buildroot-2014.02 + FROM busybox COPY ./my-static-binary /my-static-binary CMD ["/my-static-binary"] diff --git a/golang/README.md b/golang/README.md index afcb72152..9656f7131 100644 --- a/golang/README.md +++ b/golang/README.md @@ -38,13 +38,13 @@ The most straightforward way to use this image is to use a Go container as both the build and runtime environment. In your `Dockerfile`, writing something along the lines of the following will compile and run your project: - FROM golang:1.3.1-onbuild + FROM golang:1.3-onbuild This image includes multiple `ONBUILD` triggers which should cover most applications. The build will `COPY . /usr/src/app`, `RUN go get -d -v`, and `RUN go install -v`. -This image also includes the `CMD ["app"]` instruction which is the default command +This image also includes the `CMD ["app"]` instruction which is the default command when running the image without arguments. You can then build and run the Docker image: @@ -58,7 +58,7 @@ There may be occasions where it is not appropriate to run your app inside a container. To compile, but not run your app inside the Docker instance, you can write something like: - docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3.1 go build -v + docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3 go build -v This will add your current directory as a volume to the container, set the working directory to the volume, and run the command `go build` which will tell @@ -66,7 +66,7 @@ go to compile the project in the working directory and output the executable to `myapp`. Alternatively, if you have a `Makefile`, you can run the `make` command inside your container. - docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3.1 make + docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3 make ## Cross-compile your app inside the Docker container @@ -74,11 +74,11 @@ If you need to compile your application for a platform other than `linux/amd64` (such as `windows/386`), this can be easily accomplished with the provided `cross` tags: - docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp -e GOOS=windows -e GOARCH=386 golang:1.3.1-cross go build -v + docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp -e GOOS=windows -e GOARCH=386 golang:1.3-cross go build -v Alternatively, you can build for multiple platforms at once: - docker run --rm -it -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3.1-cross bash + docker run --rm -it -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3-cross bash $ for GOOS in darwin linux; do > for GOARCH in 386 amd64; do > go build -v -o myapp-$GOOS-$GOARCH diff --git a/golang/content.md b/golang/content.md index 1f99cbbe9..e3e1b3c98 100644 --- a/golang/content.md +++ b/golang/content.md @@ -18,13 +18,13 @@ The most straightforward way to use this image is to use a Go container as both the build and runtime environment. In your `Dockerfile`, writing something along the lines of the following will compile and run your project: - FROM golang:1.3.1-onbuild + FROM golang:1.3-onbuild This image includes multiple `ONBUILD` triggers which should cover most applications. The build will `COPY . /usr/src/app`, `RUN go get -d -v`, and `RUN go install -v`. -This image also includes the `CMD ["app"]` instruction which is the default command +This image also includes the `CMD ["app"]` instruction which is the default command when running the image without arguments. You can then build and run the Docker image: @@ -38,7 +38,7 @@ There may be occasions where it is not appropriate to run your app inside a container. To compile, but not run your app inside the Docker instance, you can write something like: - docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3.1 go build -v + docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3 go build -v This will add your current directory as a volume to the container, set the working directory to the volume, and run the command `go build` which will tell @@ -46,7 +46,7 @@ go to compile the project in the working directory and output the executable to `myapp`. Alternatively, if you have a `Makefile`, you can run the `make` command inside your container. - docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3.1 make + docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3 make ## Cross-compile your app inside the Docker container @@ -54,11 +54,11 @@ If you need to compile your application for a platform other than `linux/amd64` (such as `windows/386`), this can be easily accomplished with the provided `cross` tags: - docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp -e GOOS=windows -e GOARCH=386 golang:1.3.1-cross go build -v + docker run --rm -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp -e GOOS=windows -e GOARCH=386 golang:1.3-cross go build -v Alternatively, you can build for multiple platforms at once: - docker run --rm -it -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3.1-cross bash + docker run --rm -it -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp golang:1.3-cross bash $ for GOOS in darwin linux; do > for GOARCH in 386 amd64; do > go build -v -o myapp-$GOOS-$GOARCH diff --git a/jruby/README.md b/jruby/README.md index 799673603..958c78fb3 100644 --- a/jruby/README.md +++ b/jruby/README.md @@ -34,7 +34,7 @@ garbage collection, and even import and use java libraries. ## Create a `Dockerfile` in your Ruby app project - FROM jruby:.1.7.15-onbuild + FROM jruby:1.7-onbuild CMD ["./your-daemon-or-script.rb"] Put this file in the root of your app, next to the `Gemfile`. @@ -54,7 +54,7 @@ The `onbuid` tag expects a `Gemfile.lock` in your app directory. This `docker run` will help you generate one. Run it in the root of your app, next to the `Gemfile`: - docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app jruby:1.7.15 bundle install --system + docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app jruby:1.7 bundle install --system ## Run a single Ruby script @@ -62,7 +62,7 @@ For many simple, single file projects, you may find it inconvenient to write a complete `Dockerfile`. In such cases, you can run a Ruby script by using the Ruby Docker image directly: - docker run -it --rm --name my-running-script -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp jruby:1.7.15 jruby your-daemon-or-script.rb + docker run -it --rm --name my-running-script -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp jruby:1.7 jruby your-daemon-or-script.rb # License diff --git a/jruby/content.md b/jruby/content.md index b2bf6e7e0..5324c963f 100644 --- a/jruby/content.md +++ b/jruby/content.md @@ -22,7 +22,7 @@ garbage collection, and even import and use java libraries. ## Create a `Dockerfile` in your Ruby app project - FROM jruby:.1.7.15-onbuild + FROM jruby:1.7-onbuild CMD ["./your-daemon-or-script.rb"] Put this file in the root of your app, next to the `Gemfile`. @@ -42,7 +42,7 @@ The `onbuid` tag expects a `Gemfile.lock` in your app directory. This `docker run` will help you generate one. Run it in the root of your app, next to the `Gemfile`: - docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app jruby:1.7.15 bundle install --system + docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app jruby:1.7 bundle install --system ## Run a single Ruby script @@ -50,4 +50,4 @@ For many simple, single file projects, you may find it inconvenient to write a complete `Dockerfile`. In such cases, you can run a Ruby script by using the Ruby Docker image directly: - docker run -it --rm --name my-running-script -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp jruby:1.7.15 jruby your-daemon-or-script.rb + docker run -it --rm --name my-running-script -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp jruby:1.7 jruby your-daemon-or-script.rb diff --git a/rails/README.md b/rails/README.md index 1fefee801..e533adf5f 100644 --- a/rails/README.md +++ b/rails/README.md @@ -53,7 +53,7 @@ The `onbuid` tag expects a `Gemfile.lock` in your app directory. This `docker run` will help you generate one. Run it in the root of your app, next to the `Gemfile`: - docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app ruby:2.1.2 bundle install --system + docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app ruby:2.1 bundle install # License diff --git a/rails/content.md b/rails/content.md index a85c610a5..c75b2e508 100644 --- a/rails/content.md +++ b/rails/content.md @@ -42,4 +42,4 @@ The `onbuid` tag expects a `Gemfile.lock` in your app directory. This `docker run` will help you generate one. Run it in the root of your app, next to the `Gemfile`: - docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app ruby:2.1.2 bundle install --system + docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app ruby:2.1 bundle install diff --git a/ruby/README.md b/ruby/README.md index 75e213b9e..eff2eac12 100644 --- a/ruby/README.md +++ b/ruby/README.md @@ -29,7 +29,7 @@ type system and automatic memory management. ## Create a `Dockerfile` in your Ruby app project - FROM ruby:2.1.2-onbuild + FROM ruby:2.1-onbuild CMD ["./your-daemon-or-script.rb"] Put this file in the root of your app, next to the `Gemfile`. @@ -49,7 +49,7 @@ The `onbuid` tag expects a `Gemfile.lock` in your app directory. This `docker run` will help you generate one. Run it in the root of your app, next to the `Gemfile`: - docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app ruby:2.1.2 bundle install --system + docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app ruby:2.1 bundle install --system ## Run a single Ruby script @@ -57,7 +57,7 @@ For many simple, single file projects, you may find it inconvenient to write a complete `Dockerfile`. In such cases, you can run a Ruby script by using the Ruby Docker image directly: - docker run -it --rm --name my-running-script -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp ruby:2.1.2 ruby your-daemon-or-script.rb + docker run -it --rm --name my-running-script -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp ruby:2.1 ruby your-daemon-or-script.rb # License diff --git a/ruby/content.md b/ruby/content.md index f58737f7b..a8f864bf6 100644 --- a/ruby/content.md +++ b/ruby/content.md @@ -14,7 +14,7 @@ type system and automatic memory management. ## Create a `Dockerfile` in your Ruby app project - FROM ruby:2.1.2-onbuild + FROM ruby:2.1-onbuild CMD ["./your-daemon-or-script.rb"] Put this file in the root of your app, next to the `Gemfile`. @@ -34,7 +34,7 @@ The `onbuid` tag expects a `Gemfile.lock` in your app directory. This `docker run` will help you generate one. Run it in the root of your app, next to the `Gemfile`: - docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app ruby:2.1.2 bundle install --system + docker run --rm -v "$(pwd)":/usr/src/app -w /usr/src/app ruby:2.1 bundle install --system ## Run a single Ruby script @@ -42,4 +42,4 @@ For many simple, single file projects, you may find it inconvenient to write a complete `Dockerfile`. In such cases, you can run a Ruby script by using the Ruby Docker image directly: - docker run -it --rm --name my-running-script -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp ruby:2.1.2 ruby your-daemon-or-script.rb + docker run -it --rm --name my-running-script -v "$(pwd)":/usr/src/myapp -w /usr/src/myapp ruby:2.1 ruby your-daemon-or-script.rb