Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
v0ctor committed Jun 8, 2019
2 parents 5572e14 + 5bdeaaa commit 86369ca
Show file tree
Hide file tree
Showing 34 changed files with 474 additions and 143 deletions.
7 changes: 4 additions & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trigger:

steps:
- name: build
image: docker:18.09.5
image: docker:18.09.6
environment:
DOCKER_HOST: tcp://docker.avptp.org:2376
DOCKER_CA:
Expand All @@ -29,6 +29,9 @@ steps:
echo "$DOCKER_CERT" > ~/.docker/cert.pem &&
echo "$DOCKER_KEY" > ~/.docker/key.pem &&
echo "$REGISTRY_CONFIG" > ~/.docker/config.json
- >-
echo -n $([[ $DRONE_BRANCH = 'master' ]] && echo 'production' || echo 'staging') > .environment
- cp config/$(cat .environment).js src/config.js
- >-
echo -n ${DRONE_COMMIT:0:8} > .tag &&
IMAGE="$REGISTRY_HOST/$DRONE_REPO_NAMESPACE/$DRONE_REPO_NAME:$(cat .tag)"
Expand All @@ -42,8 +45,6 @@ steps:
REGISTRY_CONFIG:
from_secret: registry
commands:
- >-
echo -n $([[ $DRONE_BRANCH = 'master' ]] && echo 'production' || echo 'staging') > .environment
- >-
helm template chart
--name $DRONE_REPO_NAME
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Development image
FROM node:10.15.3-alpine AS development
FROM node:10.16.0-alpine AS development

WORKDIR /app

Expand All @@ -19,7 +19,7 @@ RUN apk add --no-cache \


## Builder image
FROM node:10.15.3-alpine AS builder
FROM node:10.16.0-alpine AS builder

WORKDIR /app

Expand All @@ -33,7 +33,7 @@ RUN npm ci \


## Runtime image
FROM nginx:1.16.0-alpine AS runtime
FROM nginx:1.17.0-alpine AS runtime

WORKDIR /app

Expand Down
5 changes: 5 additions & 0 deletions config/development.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {

sentryDsn: null,

};
5 changes: 5 additions & 0 deletions config/production.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {

sentryDsn: 'https://[email protected]/1456276',

};
5 changes: 5 additions & 0 deletions config/staging.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {

sentryDsn: 'https://[email protected]/1456276',

};
Loading

0 comments on commit 86369ca

Please sign in to comment.