Skip to content

Commit

Permalink
Merge pull request #41 from fga-eps-mds/release/v0.3.1
Browse files Browse the repository at this point in the history
Release 3
  • Loading branch information
vitorcx authored Nov 27, 2019
2 parents 29274ab + 16de90d commit 419b326
Show file tree
Hide file tree
Showing 50 changed files with 4,899 additions and 2,498 deletions.
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VUE_APP_MODE=development
VUE_APP_API_URL=http://0.0.0.0:8000/
2 changes: 2 additions & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VUE_APP_MODE=production
VUE_APP_API_URL=http://45.55.46.19:8001/
3 changes: 2 additions & 1 deletion .env.staging
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VUE_APP_API_URL=https://acacia-backend-staging.herokuapp.com
VUE_APP_MODE=staging
VUE_APP_API_URL=http://45.55.46.19:8000/
25 changes: 0 additions & 25 deletions .github/workflows/cd.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: deploy-production

on:
push:
branches:
- master

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: Docker login
run: docker login --username=${{secrets.DOCKER_USER}} --password=${{secrets.DOCKER_PASS}}
- name: Docker build
run: docker build -t acaciaelis/acacia:node-prod .
- name: Docker push
run: docker push acaciaelis/acacia:node-prod
22 changes: 22 additions & 0 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

name: deploy-staging

on:
push:
branches:
- develop
- release/*

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: Docker login
run: docker login --username=${{secrets.DOCKER_USER}} --password=${{secrets.DOCKER_PASS}}
- name: Docker build
run: docker build -t acaciaelis/acacia:node-staging .
- name: Docker push
run: docker push acaciaelis/acacia:node-staging
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,3 @@ RUN mkdir -p /app && cp -a /tmp/node_modules /app/

WORKDIR /app
ADD . /app

EXPOSE 8080

CMD npm run build:stage; npm start
19 changes: 19 additions & 0 deletions docker-compose.deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: '3'
services:
node-staging:
container_name: node-staging
image: acaciaelis/acacia:node-staging
command: sh -c "npm run build-stage && npm start"
ports:
- "8080:8080"
labels:
- "com.centurylinklabs.watchtower.enable=true"

node-production:
container_name: node-production
image: acaciaelis/acacia:node-prod
command: sh -c "npm run build-prod && npm start"
ports:
- "8081:8080"
labels:
- "com.centurylinklabs.watchtower.enable=true"
Loading

0 comments on commit 419b326

Please sign in to comment.