diff --git a/CHANGELOG.md b/CHANGELOG.md index eb54fde..650bdda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ Due to the nature of versioning and the fact this repository houses multiple Doc Each release records it's own specific changes in a VERSIONS.md file. +## 2016.07.28 + +- `alpine-nginx-nodejs`: upgraded Node.js to v6.2.1. + +### Releases + +- [Released `v4.2.1` of `alpine-nginx-nodejs`](https://github.com/smebberson/docker-alpine/tree/alpine-nginx-nodejs-v4.0.0/alpine-nginx-nodejs) + ## 2016.07.27 - `alpine-nginx-nodejs`: upgraded Node.js to v6.0.0. diff --git a/README.md b/README.md index 3005021..16c665f 100644 --- a/README.md +++ b/README.md @@ -291,7 +291,7 @@ Latest version is `3.0.0`, or `latest`. This image includes both Nginx and Node.js. It's suitable if you want to have Node.js perform configuration for Nginx. -Latest version is `4.2.0`, or `latest`. +Latest version is `4.2.1`, or `latest`. - [README.md](https://github.com/smebberson/docker-alpine/blob/master/alpine-nginx-nodejs/README.md) - [VERSIONS.md](https://github.com/smebberson/docker-alpine/blob/master/alpine-nginx-nodejs/VERSIONS.md) diff --git a/alpine-nginx-nodejs/Dockerfile b/alpine-nginx-nodejs/Dockerfile index bb94779..91e0860 100644 --- a/alpine-nginx-nodejs/Dockerfile +++ b/alpine-nginx-nodejs/Dockerfile @@ -1,7 +1,7 @@ FROM smebberson/alpine-nginx:3.0.0 MAINTAINER Scott Mebberson -ENV NODE_VERSION=v6.2.0 NPM_VERSION=3 +ENV NODE_VERSION=v6.2.1 NPM_VERSION=3 RUN echo "http://dl-4.alpinelinux.org/alpine/v3.2/main" >> /etc/apk/repositories && \ apk add --update git curl make gcc g++ python linux-headers libgcc libstdc++ binutils-gold && \ diff --git a/alpine-nginx-nodejs/NODEJS.md b/alpine-nginx-nodejs/NODEJS.md index d675fe9..f5e89e4 100644 --- a/alpine-nginx-nodejs/NODEJS.md +++ b/alpine-nginx-nodejs/NODEJS.md @@ -6,6 +6,7 @@ You can [read more about how these images are versioned here](https://github.com ## 6.x branch of Node.js +- Node v6.1.1: [v4.2.1](VERSIONS.md#v421) - Node v6.1.0: [v4.2.0](VERSIONS.md#v420) - Node v6.1.0: [v4.1.0](VERSIONS.md#v410) - Node v6.0.0: [v4.0.0](VERSIONS.md#v400) diff --git a/alpine-nginx-nodejs/README.md b/alpine-nginx-nodejs/README.md index 55490f8..5a6c370 100644 --- a/alpine-nginx-nodejs/README.md +++ b/alpine-nginx-nodejs/README.md @@ -12,7 +12,8 @@ This image features: ## Versions -- `4.2.0`, `latest` [(Dockerfile)](https://github.com/smebberson/docker-alpine/blob/alpine-nginx-nodejs-v4.2.0/alpine-nginx-nodejs/Dockerfile) +- `4.2.1`, `latest` [(Dockerfile)](https://github.com/smebberson/docker-alpine/blob/alpine-nginx-nodejs-v4.2.1/alpine-nginx-nodejs/Dockerfile) +- `4.2.0` [(Dockerfile)](https://github.com/smebberson/docker-alpine/blob/alpine-nginx-nodejs-v4.2.0/alpine-nginx-nodejs/Dockerfile) - `4.1.0` [(Dockerfile)](https://github.com/smebberson/docker-alpine/blob/alpine-nginx-nodejs-v4.1.0/alpine-nginx-nodejs/Dockerfile) - `4.0.0` [(Dockerfile)](https://github.com/smebberson/docker-alpine/blob/alpine-nginx-nodejs-v4.0.0/alpine-nginx-nodejs/Dockerfile) - `3.1.1` [(Dockerfile)](https://github.com/smebberson/docker-alpine/blob/alpine-nginx-nodejs-v3.1.0/alpine-nginx-nodejs/Dockerfile) diff --git a/alpine-nginx-nodejs/VERSIONS.md b/alpine-nginx-nodejs/VERSIONS.md index 95a3fc6..420a7c4 100644 --- a/alpine-nginx-nodejs/VERSIONS.md +++ b/alpine-nginx-nodejs/VERSIONS.md @@ -4,10 +4,19 @@ This file contains all software versions, that correspond to a version of this i ## Latest -Same as v4.2.0. +Same as v4.2.1. Usage: `smebberson/alpine-nginx-nodejs` or `smebberson/alpine-nginx-nodejs:latest`. +## v4.2.1 + +- [smebberson/alpine-nginx: v3.0.0][smebbersonalpinenginx300] +- [nginx][nginx]: v1.8.1 +- [Node.js][nodejs]: v6.2.1 +- [NPM][npm]: 3.10.5 + +Usage: `smebberson/alpine-nginx-nodejs:4.2.1`. + ## v4.2.0 - [smebberson/alpine-nginx: v3.0.0][smebbersonalpinenginx300]