diff --git a/1.0/Dockerfile b/1.0/Dockerfile index 9f517b0..d2dc014 100644 --- a/1.0/Dockerfile +++ b/1.0/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \ # verify gpg and sha256: https://iojs.org/dist/v1.0.0/SHASUMS256.txt.gpg # gpg: aka "Rod Vagg " -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys C273792F7D83545D +RUN gpg --keyserver pool.sks-keyservers.net --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D ENV IOJS_VERSION 1.0.2 diff --git a/1.0/onbuild/Dockerfile b/1.0/onbuild/Dockerfile index 75939ce..eb29b7f 100644 --- a/1.0/onbuild/Dockerfile +++ b/1.0/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM iojs/iojs:1.0 +FROM iojs:1.0.2 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/1.0/slim/Dockerfile b/1.0/slim/Dockerfile index 5a8a0b6..3b5fa50 100644 --- a/1.0/slim/Dockerfile +++ b/1.0/slim/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # verify gpg and sha256: https://iojs.org/dist/v1.0.0/SHASUMS256.txt.gpg # gpg: aka "Rod Vagg " -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys C273792F7D83545D +RUN gpg --keyserver pool.sks-keyservers.net --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D ENV IOJS_VERSION 1.0.2 diff --git a/README.md b/README.md index c1f0c32..810859f 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,13 @@ -iojs/iojs +iojs ========= -[![dockeri.co](http://dockeri.co/image/iojs/iojs)](https://registry.hub.docker.com/u/iojs/iojs/) +[![dockeri.co](http://dockeri.co/image/_/iojs)](https://registry.hub.docker.com/_/iojs/) [![issues](https://img.shields.io/github/issues/iojs/docker-iojs.svg) ![starts](https://img.shields.io/github/stars/iojs/docker-iojs.svg)](https://github.com/iojs/docker-iojs) The official iojs docker image, made with love by the iojs community. -## Supported tags -*and respective Dockerfile links* - -* [`1.0` `latest` (1.0/Dockerfile)](https://github.com/iojs/docker-iojs/blob/master/1.0/Dockerfile) -* [`1.0-onbuild` `onbuild` (1.0/onbuild/Dockerfile)](https://github.com/iojs/docker-iojs/blob/master/1.0/onbuild/Dockerfile) -* [`1.0-slim` `slim` (1.0/slim/Dockerfile)](https://github.com/iojs/docker-iojs/blob/master/1.0/slim/Dockerfile) - ## What is iojs? *from [iojs.org/faq.html](https://iojs.org/faq.html)* @@ -29,7 +22,7 @@ This project aims to continue development of io.js under an "open governance mod If you want to distribute your application on the docker registry, create a `Dockerfile` in the root of application directory: ``` -FROM iojs/iojs:onbuild +FROM iojs:onbuild # Expose the ports that your app uses. In Example: EXPOSE 8080 @@ -46,5 +39,5 @@ $ docker run --rm -it iojs-app To run a single script, you can mount it in a volume under `/usr/src/app`. From the root of your application directory (assuming your script is named `index.js`): ``` -$ docker run -v ${PWD}:/usr/src/app -w /usr/src/app --it --rm iojs/iojs iojs index.js +$ docker run -v ${PWD}:/usr/src/app -w /usr/src/app --it --rm iojs iojs index.js ``` diff --git a/update.sh b/update.sh index 5b4a752..fd9fc88 100755 --- a/update.sh +++ b/update.sh @@ -16,6 +16,6 @@ for version in "${versions[@]}"; do sed -ri ' s/^(ENV IOJS_VERSION) .*/\1 '"$fullVersion"'/; ' "$version/Dockerfile" "$version/slim/Dockerfile" - sed -ri 's/^(FROM iojs\/iojs):.*/\1:'"$fullVersion"'/' "$version/onbuild/Dockerfile" + sed -ri 's/^(FROM iojs):.*/\1:'"$fullVersion"'/' "$version/onbuild/Dockerfile" ) done