modify docker
parent
bcc551e405
commit
8086288cda
|
|
@ -0,0 +1,7 @@
|
|||
version: '3'
|
||||
|
||||
services:
|
||||
web:
|
||||
build: .
|
||||
ports:
|
||||
- "8111:8111"
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
FROM node:12.18.1
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY . .
|
||||
|
||||
WORKDIR /src
|
||||
|
||||
RUN npm install
|
||||
|
||||
EXPOSE 8111
|
||||
CMD [ "node", "app.js 8111" ]
|
||||
11
dockerfile
11
dockerfile
|
|
@ -1,11 +0,0 @@
|
|||
FROM node:12.18.1
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY ./Server .
|
||||
|
||||
WORKDIR /Server/src
|
||||
|
||||
RUN npm install
|
||||
|
||||
CMD [ "node", "app.js" ]
|
||||
18
drone.yml
18
drone.yml
|
|
@ -2,15 +2,6 @@ kind: pipeline
|
|||
type: docker
|
||||
name: default
|
||||
steps:
|
||||
- name: dockerize
|
||||
image: docker
|
||||
volumes:
|
||||
- name: docker_sock
|
||||
path: /var/run/docker.sock
|
||||
commands:
|
||||
- docker build --tag ofb_angular .
|
||||
- docker images
|
||||
|
||||
- name: build_client
|
||||
image: node
|
||||
commands:
|
||||
|
|
@ -18,6 +9,15 @@ steps:
|
|||
- npm install
|
||||
- node node_modules/@angular/cli/bin/ng build --prod --configuration=production
|
||||
|
||||
- name: dockerize
|
||||
image: docker-compose
|
||||
volumes:
|
||||
- name: docker_sock
|
||||
path: /var/run/docker.sock
|
||||
commands:
|
||||
- cd Server
|
||||
- docker-compose up -d
|
||||
|
||||
volumes:
|
||||
- name: docker_sock
|
||||
host:
|
||||
|
|
|
|||
Loading…
Reference in New Issue