Skip to content

M
mobi
Commit 11e06322 authored by levante's avatar levante
Browse files
Options

dockerfile

parents fd9c02ef 0a1dd33f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
Dockerfile
View file @ 11e06322
...@@ -2,5 +2,9 @@ FROM 10.0.6.228:5000/node-nginx:8.12.0-slim ...@@ -2,5 +2,9 @@ FROM 10.0.6.228:5000/node-nginx:8.12.0-slim
ARG project=default ARG project=default
WORKDIR /app WORKDIR /app
COPY . /app/ COPY . /app/
<<<<<<< HEAD
RUN npm config set proxy=http://10.0.6.228:3128 && npm set registry https://registry.npm.taobao.org && npm install && npm run build:$project && cp -r dist/* /var/www/html && cp nginx.conf /etc/nginx/conf.d && rm -rf /etc/nginx/sites-enabled && rm -rf /app RUN npm config set proxy=http://10.0.6.228:3128 && npm set registry https://registry.npm.taobao.org && npm install && npm run build:$project && cp -r dist/* /var/www/html && cp nginx.conf /etc/nginx/conf.d && rm -rf /etc/nginx/sites-enabled && rm -rf /app
=======
RUN npm config set proxy=http://10.0.6.228:3128 && npm set registry https://registry.npm.taobao.org && npm install && npm run build:pudong-sit && cp -r dist/* /var/www/html && cp nginx.conf /etc/nginx/conf.d && rm -rf /etc/nginx/sites-enabled && rm -rf /app
>>>>>>> 0a1dd33fc90945da4d045b84f45936fb7d597a46
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment