Skip to content

Commit 09bcb83

Browse files
committed
chore(docker) tweak
1 parent 7ca600a commit 09bcb83

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mhart/alpine-node:6
1+
FROM mhart/alpine-node:8
22

33
# Install required dependencies (Alpine Linux packages)
44
RUN apk update && \
@@ -25,8 +25,7 @@ RUN echo $user' ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
2525
WORKDIR /external
2626

2727
# Install (global) NPM packages/dependencies
28-
RUN npm install -g \
29-
node-gyp
28+
RUN yarn global add node-gyp
3029

3130
# Make project directory with permissions
3231
RUN mkdir /project
@@ -38,4 +37,4 @@ WORKDIR /project
3837
COPY . .
3938

4039
# Install (local) NPM packages and build
41-
RUN npm install && npm run postinstall
40+
RUN yarn

docker/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#! /usr/bin/env sh
22

33
PROJECTNAME="react-redux-feathers"
4-
5-
PROJECTDIR=$(dirname $(dirname $(readlink -f "$0")))
4+
PROJECTDIR=$(pwd)
65

76
docker build \
87
--build-arg user=$USER \

docker/run.dev.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#! /usr/bin/env sh
22

3-
PROJECTDIR=$(dirname $(dirname $(readlink -f "$0")))
3+
PROJECTNAME="react-redux-feathers"
4+
PROJECTDIR=$(pwd)
45

56
docker run -it \
67
-u $USER \
78
-v $PROJECTDIR:/project \
89
-v /project/node_modules \
910
--expose=3000 --expose=3001 \
1011
-p 3000:3000 -p 3001:3001 -p 3030:3030 \
11-
react-redux-feathers \
12+
$PROJECTNAME \
1213
npm run dev

docker/run.prod.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#! /usr/bin/env sh
22

3+
PROJECTNAME="react-redux-feathers"
4+
35
docker run -it \
46
--expose=8080 \
57
-p 8080:8080 -p 3030:3030 \
6-
react-redux-feathers \
8+
$PROJECTNAME \
79
npm start

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066"
6464

6565
"@types/node@*":
66-
version "8.0.52"
67-
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.52.tgz#8e7f47747868e7687f2cd4922966e2d6af78d22d"
66+
version "8.0.53"
67+
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
6868

6969
7070
version "6.0.66"
@@ -1620,12 +1620,12 @@ caniuse-api@^2.0.0:
16201620
lodash.uniq "^4.5.0"
16211621

16221622
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
1623-
version "1.0.30000764"
1624-
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000764.tgz#d73ab11ae62f6a9e2f69867d6d9c23ae3f2e5d8d"
1623+
version "1.0.30000765"
1624+
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000765.tgz#15555432420baacbb169bc51e5b6de804c9994b4"
16251625

16261626
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000760:
1627-
version "1.0.30000764"
1628-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000764.tgz#97ea7472f9d3e691eede34f21983cfc219ac7842"
1627+
version "1.0.30000765"
1628+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000765.tgz#aa1a75019276b48463c0fca2a5257fb9f26a7c9d"
16291629

16301630
capture-stack-trace@^1.0.0:
16311631
version "1.0.0"
@@ -9270,8 +9270,8 @@ wordwrap@~1.0.0:
92709270
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
92719271

92729272
worker-farm@^1.3.1:
9273-
version "1.5.1"
9274-
resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.1.tgz#8e9f4a7da4f3c595aa600903051b969390423fa1"
9273+
version "1.5.2"
9274+
resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae"
92759275
dependencies:
92769276
errno "^0.1.4"
92779277
xtend "^4.0.1"

0 commit comments

Comments
 (0)