migrated single version per branch

mutterio · Oct 9, 2015 · 811e89b · 811e89b
1 parent 281b749
commit 811e89b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 45 deletions.
diff --git a/0.10/Dockerfile → Dockerfile b/0.10/Dockerfile → Dockerfile
@@ -1,25 +1,25 @@
 FROM mutterio/mini-base
 
-ENV VERSION=v0.10.39 CMD=node DOMAIN=nodejs.org
+ENV VERSION=v0.10.39
 
 RUN apk update && \
   apk add --virtual build-dependencies make gcc g++ python paxctl curl && \
-  curl -sSL https://${DOMAIN}/dist/${VERSION}/${CMD}-${VERSION}.tar.gz | tar -xz && \
-  cd /${CMD}-${VERSION} && \
+  curl -sSL https://nodejs.org/dist/${VERSION}/node-${VERSION}.tar.gz | tar -xz && \
+  cd /node-${VERSION} && \
   NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
   export CFLAGS="$CFLAGS -D__USE_MISC" && \
   ./configure --prefix=/usr && \
   make -j${NPROC} -C out mksnapshot && \
   paxctl -c -m out/Release/mksnapshot && \
   make -j${NPROC} && \
   make install && \
-  paxctl -cm /usr/bin/${CMD} && \
+  paxctl -cm /usr/bin/node && \
   apk del build-dependencies && \
   apk add openssl ca-certificates libgcc libstdc++ && \
   npm install -g npm && \
   cd / && \
   rm -rf \
-    /${CMD}-${VERSION} \
+    /node-${VERSION} \
     /var/cache/apk/* \
     /tmp/* \
     /root/.npm \

diff --git a/0.10/Makefile → Makefile b/0.10/Makefile → Makefile
diff --git a/0.10/dev/Dockerfile → dev/Dockerfile b/0.10/dev/Dockerfile → dev/Dockerfile
@@ -1,24 +1,24 @@
 FROM mutterio/mini-base
 
-ENV VERSION=v0.10.39 CMD=node DOMAIN=nodejs.org
+ENV VERSION=v0.10.39
 
 RUN apk update && \
   apk add make gcc g++ python paxctl curl openssl ca-certificates \
     libgcc libstdc++ && \
-  curl -sSL https://${DOMAIN}/dist/${VERSION}/${CMD}-${VERSION}.tar.gz | tar -xz && \
-  cd /${CMD}-${VERSION} && \
+  curl -sSL https://nodejs.org/dist/${VERSION}/node-${VERSION}.tar.gz | tar -xz && \
+  cd /node-${VERSION} && \
   NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
   export CFLAGS="$CFLAGS -D__USE_MISC" && \
   ./configure --prefix=/usr && \
   make -j${NPROC} -C out mksnapshot && \
   paxctl -c -m out/Release/mksnapshot && \
   make -j${NPROC} && \
   make install && \
-  paxctl -cm /usr/bin/${CMD} && \
+  paxctl -cm /usr/bin/node && \
   npm install -g npm && \
   cd / && \
   rm -rf \
-    /${CMD}-${VERSION} \
+    /node-${VERSION} \
     /var/cache/apk/* \
     /tmp/* \
     /root/.npm \

diff --git a/0.10/dev/Makefile → dev/Makefile b/0.10/dev/Makefile → dev/Makefile
@@ -1,6 +1,6 @@
 REGISTRY=mutterio
 NAME=mini-nodejs
-TAG=builder
+TAG=builder_4.1.2
 
 build: Dockerfile
 	docker build -t ${NAME} .

diff --git a/iojs/Dockerfile b/iojs/Dockerfile
diff --git a/iojs/Makefile b/iojs/Makefile