Skip to content

Commit 935ba76

Browse files
committed
Sync Dockerfiles with upstream pull requests
1 parent 934d100 commit 935ba76

8 files changed

Lines changed: 17 additions & 6 deletions

File tree

node/4.8/nano/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:4.8.1-nano
1+
FROM node:4.8.1-nanoserver
22

33
RUN mkdir \app
44
WORKDIR /app

node/4.8/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:4.8.1
1+
FROM node:4.8.1-windowsservercore
22

33
RUN mkdir \app
44
WORKDIR /app

node/6.10/nano/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:6.10.1-nano
1+
FROM node:6.10.1-nanoserver
22

33
RUN mkdir \app
44
WORKDIR /app

node/6.10/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:6.10.1
1+
FROM node:6.10.1-windowsservercore
22

33
RUN mkdir \app
44
WORKDIR /app

node/7.7/nano/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:7.7.4-nano
1+
FROM node:7.7.4-nanoserver
22

33
RUN mkdir \app
44
WORKDIR /app

node/7.7/onbuild/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:7.7.4
1+
FROM node:7.7.4-windowsservercore
22

33
RUN mkdir \app
44
WORKDIR /app

node/build.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ docker build -t node:%1 %2 || exit /b
99
docker tag node:%1 node:latest || exit /b
1010
docker tag node:%1 node:%2 || exit /b
1111
docker tag node:%1 node:%3 || exit /b
12+
docker tag node:%1 node:%3-windowsservercore || exit /b
1213

1314
docker build -t node:%1-onbuild %2/onbuild
1415
docker tag node:%1-onbuild node:%2-onbuild || exit /b
@@ -18,6 +19,7 @@ docker build -t node:%1-nano %2/nano || exit /b
1819
docker tag node:%1-nano node:latest-nano || exit /b
1920
docker tag node:%1-nano node:%2-nano || exit /b
2021
docker tag node:%1-nano node:%3-nano || exit /b
22+
docker tag node:%1-nano node:%3-nanoserver || exit /b
2123

2224
docker build -t node:%1-nano-onbuild %2/nano/onbuild || exit /b
2325
docker tag node:%1-nano-onbuild node:%2-nano-onbuild || exit /b

node/sync-core.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
cp 4*/Dockerfile ../../docker-node/4*/windows/windowsservercore/Dockerfile
3+
cp 4*/onbuild/Dockerfile ../../docker-node/4*/windows/windowsservercore/onbuild/Dockerfile
4+
5+
cp 6*/Dockerfile ../../docker-node/6*/windows/windowsservercore/Dockerfile
6+
cp 6*/onbuild/Dockerfile ../../docker-node/6*/windows/windowsservercore/onbuild/Dockerfile
7+
8+
cp 7*/Dockerfile ../../docker-node/7*/windows/windowsservercore/Dockerfile
9+
cp 7*/onbuild/Dockerfile ../../docker-node/7*/windows/windowsservercore/onbuild/Dockerfile

0 commit comments

Comments
 (0)