From 8086288cdaa8d96171b3943b97c0ea894390eb1b Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 26 Oct 2020 22:08:32 -0600 Subject: [PATCH] modify docker --- Server/docker-compose.yml | 7 +++++++ Server/dockerfile | 12 ++++++++++++ dockerfile | 11 ----------- drone.yml | 18 +++++++++--------- 4 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 Server/docker-compose.yml create mode 100644 Server/dockerfile delete mode 100644 dockerfile diff --git a/Server/docker-compose.yml b/Server/docker-compose.yml new file mode 100644 index 0000000..dc9c20b --- /dev/null +++ b/Server/docker-compose.yml @@ -0,0 +1,7 @@ +version: '3' + +services: + web: + build: . + ports: + - "8111:8111" \ No newline at end of file diff --git a/Server/dockerfile b/Server/dockerfile new file mode 100644 index 0000000..ef0fbfe --- /dev/null +++ b/Server/dockerfile @@ -0,0 +1,12 @@ +FROM node:12.18.1 + +WORKDIR /app + +COPY . . + +WORKDIR /src + +RUN npm install + +EXPOSE 8111 +CMD [ "node", "app.js 8111" ] \ No newline at end of file diff --git a/dockerfile b/dockerfile deleted file mode 100644 index 123fb2e..0000000 --- a/dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM node:12.18.1 - -WORKDIR /app - -COPY ./Server . - -WORKDIR /Server/src - -RUN npm install - -CMD [ "node", "app.js" ] \ No newline at end of file diff --git a/drone.yml b/drone.yml index 49a3276..f066b34 100644 --- a/drone.yml +++ b/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: