Skip to content
This repository was archived by the owner on Jul 10, 2019. It is now read-only.

Commit a0bd364

Browse files
authored
Merge pull request #10 from hisasann/feature/using_dockfile_arg
Feature/using dockfile arg
2 parents 3154e1c + 9b23921 commit a0bd364

21 files changed

+85
-198
lines changed

.env.dev

Lines changed: 0 additions & 3 deletions
This file was deleted.

.env.prod

Lines changed: 0 additions & 3 deletions
This file was deleted.

.env.stg

Lines changed: 0 additions & 3 deletions
This file was deleted.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,6 @@ dist
8282

8383
# Service worker
8484
sw.*
85+
86+
/.settings/
87+
/.project
Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# specify the node base image with your desired version node:<version>
2-
FROM node:8
2+
FROM node:8.10.0
33

44
MAINTAINER hisasann
55

6+
# https://qiita.com/rh_taro/items/40373a30ead444ae9ca7
7+
RUN echo "deb http://deb.debian.org/debian jessie main" > /etc/apt/sources.list \
8+
&& echo "deb http://security.debian.org jessie/updates main" >> /etc/apt/sources.list
9+
610
# install dependency package
711
RUN apt-get update \
812
&& apt-get install -y \
@@ -21,31 +25,34 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
2125
&& apt-get clean \
2226
&& rm -rf /var/lib/apt/lists/*
2327

28+
# Install app dependencies
29+
COPY package.json /src/package.json
30+
COPY yarn.lock /src/yarn.lock
31+
RUN cd /src; yarn install
32+
2433
# Bundle app source
2534
ADD ./src /src/src/
2635

27-
# Install app dependencies
36+
# Copy files
2837
COPY .babelrc /src/.babelrc
2938
COPY .eslintrc.js /src/.eslintrc.js
3039
COPY .prettierrc.js /src/.prettierrc.js
3140
COPY jest.config.js /src/jest.config.js
3241
COPY nuxt.config.ts /src/nuxt.config.ts
3342
COPY tsconfig.json /src/tsconfig.json
34-
COPY package.json /src/package.json
35-
COPY yarn.lock /src/yarn.lock
3643
COPY tools/run-test.sh /src/run-test.sh
3744

38-
#COPY index.js /src/index.js
39-
45+
# Run test
4046
RUN chmod 755 /src/run-test.sh
4147

42-
RUN cd /src; yarn install
43-
4448
EXPOSE 4000
4549

4650
WORKDIR /src
4751

48-
RUN npm run build:prod
52+
# RUNTIME 時の環境変数を Nuxt.js に渡すにはここに書くしか方法はない
53+
ENV RUNTIME_ENV=docker
54+
ENV BUILD_ENV=docker
55+
56+
RUN env
4957

50-
CMD ["npm", "run", "start"]
51-
#CMD ["node", "index.js"]
58+
CMD ["/bin/sh", "-c", "npm run build:docker && npm run start"]

Dockerfile.dev

Lines changed: 0 additions & 51 deletions
This file was deleted.

Dockerfile.stg

Lines changed: 0 additions & 51 deletions
This file was deleted.

docker-compose.dev.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

docker-compose.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
envName=docker-compose
2+
internalEndpointUrl=http://host.docker.internal:5000
3+
externalEndpointUrl=http://localhost:5000

docker-compose.prod.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)