build: update config files to support containerpilot v3

This commit is contained in:
Sérgio Ramos 2017-06-20 00:18:34 +01:00
parent 33bca3c2bd
commit 86662ae170
9 changed files with 41 additions and 136 deletions

View File

@ -159,5 +159,6 @@ packages/*/dist
packages/*/buid packages/*/buid
packages/ui-toolkit/styleguide packages/ui-toolkit/styleguide
packages/*/node_modules packages/*/node_modules
packages/*/Dockerfile
legacy legacy

View File

@ -1,11 +1,10 @@
# todo change to 7
FROM quay.io/yldio/alpine-node-containerpilot:latest FROM quay.io/yldio/alpine-node-containerpilot:latest
RUN yarn add lerna@^2.0.0-rc.5 serve \ RUN yarn add lerna@^2.0.0-rc.5 serve \
&& ./node_modules/.bin/lerna clean --yes --scope joyent-cp-frontend --include-filtered-dependencies \ && ./node_modules/.bin/lerna clean --yes --scope joyent-cp-frontend --include-filtered-dependencies \
&& ./node_modules/.bin/lerna bootstrap --scope joyent-cp-frontend --include-filtered-dependencies && ./node_modules/.bin/lerna bootstrap --scope joyent-cp-frontend --include-filtered-dependencies
WORKDIR /home/node/app/packages/cp-frontend WORKDIR /opt/app/packages/cp-frontend
COPY packages/cp-frontend/etc/containerpilot.json /etc/ COPY packages/cp-frontend/etc/containerpilot.json /etc/
ARG CIRCLE_BRANCH ARG CIRCLE_BRANCH
@ -13,5 +12,5 @@ ENV REACT_APP_GQL_HOSTNAME gql-mock-server-$CIRCLE_BRANCH.svc.f4b20699-b323-4452
RUN yarn run build RUN yarn run build
EXPOSE 5000 EXPOSE 3069
CMD ["/bin/containerpilot", "../../node_modules/.bin/serve", "-s", "build"] CMD ["/bin/containerpilot"]

View File

@ -3,8 +3,8 @@
[![Docker Repository on Quay](https://quay.io/repository/yldio/joyent-cp-frontend/status)](https://quay.io/repository/yldio/joyent-cp-frontend) [![Docker Repository on Quay](https://quay.io/repository/yldio/joyent-cp-frontend/status)](https://quay.io/repository/yldio/joyent-cp-frontend)
[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0) [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg)](https://github.com/RichardLitt/standard-readme) [![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg)](https://github.com/RichardLitt/standard-readme)
[![demo master](https://img.shields.io/badge/demo-master-3B47CC.svg)](http://cp-frontend-master.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:5000) [![demo master](https://img.shields.io/badge/demo-master-3B47CC.svg)](http://cp-frontend-master.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:3069)
[![demo staging](https://img.shields.io/badge/demo-staging-3B47CC.svg)](http://cp-frontend-staging.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:5000) [![demo staging](https://img.shields.io/badge/demo-staging-3B47CC.svg)](http://cp-frontend-staging.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:3069)
## Table of Contents ## Table of Contents

View File

@ -1,46 +1,15 @@
{ {
"consul": "0.0.0.0:8500", "consul": "0.0.0.0:8500",
"services": [ "jobs": [
{ {
"name": "cp-frontend", "name": "cp-frontend",
"port": 3069, "port": 3069,
"health": "/usr/bin/curl -o /dev/null --fail -s http://0.0.0.0:3069/", "exec": "../../node_modules/.bin/serve --single build --port 3069",
"poll": 3, "health": {
"ttl": 10 "exec": "/usr/bin/curl -o /dev/null --fail -s http://0.0.0.0:5000/",
} "interval": 3,
], "ttl": 10
"backends": [],
"telemetry": {
"port": 9090,
"sensors": [
{
"name": "frontend_memory_percent",
"help": "percentage of memory used",
"type": "gauge",
"poll": 5,
"check": ["/bin/sensors", "memory"]
},
{
"name": "frontend_cpu_load",
"help": "cpu load",
"type": "gauge",
"poll": 5,
"check": ["/bin/sensors", "cpu"]
},
{
"name": "frontend_disk_capacity",
"help": "disk capacity",
"type": "gauge",
"poll": 60,
"check": ["/bin/sensors", "diskcapacity"]
},
{
"name": "frontend_disk_usage",
"help": "disk usage",
"type": "gauge",
"poll": 60,
"check": ["/bin/sensors", "diskusage"]
} }
] }
} ]
} }

View File

@ -1,14 +1,13 @@
# todo change to 7
FROM quay.io/yldio/alpine-node-containerpilot:latest FROM quay.io/yldio/alpine-node-containerpilot:latest
RUN yarn add lerna@^2.0.0-rc.5 \ RUN yarn add lerna@^2.0.0-rc.5 serve \
&& ./node_modules/.bin/lerna clean --yes --scope joyent-cp-gql-mock-server --include-filtered-dependencies \ && ./node_modules/.bin/lerna clean --yes --scope joyent-cp-gql-mock-server --include-filtered-dependencies \
&& ./node_modules/.bin/lerna bootstrap --scope joyent-cp-gql-mock-server --include-filtered-dependencies && ./node_modules/.bin/lerna bootstrap --scope joyent-cp-gql-mock-server --include-filtered-dependencies
WORKDIR /home/node/app/packages/cp-gql-mock-server WORKDIR /opt/app/packages/cp-gql-mock-server
COPY packages/cp-gql-mock-server/etc/containerpilot.json /etc/ COPY packages/cp-gql-mock-server/etc/containerpilot.json /etc/
ARG CIRCLE_BRANCH ARG CIRCLE_BRANCH
EXPOSE 3000 EXPOSE 3000
CMD ["/bin/containerpilot", "yarn", "run", "start"] CMD ["/bin/containerpilot"]

View File

@ -1,46 +1,15 @@
{ {
"consul": "0.0.0.0:8500", "consul": "0.0.0.0:8500",
"services": [ "jobs": [
{ {
"name": "cp-gql-mock-server", "name": "cp-gql-mock-server",
"port": 3000, "port": 3000,
"health": "/usr/bin/curl -o /dev/null --fail -s http://0.0.0.0:3000/", "exec": "yarn run start",
"poll": 3, "health": {
"ttl": 10 "exec": "/usr/bin/curl -o /dev/null --fail -s http://0.0.0.0:3000/",
} "interval": 3,
], "ttl": 10
"backends": [],
"telemetry": {
"port": 9090,
"sensors": [
{
"name": "frontend_memory_percent",
"help": "percentage of memory used",
"type": "gauge",
"poll": 5,
"check": ["/bin/sensors", "memory"]
},
{
"name": "frontend_cpu_load",
"help": "cpu load",
"type": "gauge",
"poll": 5,
"check": ["/bin/sensors", "cpu"]
},
{
"name": "frontend_disk_capacity",
"help": "disk capacity",
"type": "gauge",
"poll": 60,
"check": ["/bin/sensors", "diskcapacity"]
},
{
"name": "frontend_disk_usage",
"help": "disk usage",
"type": "gauge",
"poll": 60,
"check": ["/bin/sensors", "diskusage"]
} }
] }
} ]
} }

View File

@ -1,16 +1,15 @@
# todo change to 7
FROM quay.io/yldio/alpine-node-containerpilot:latest FROM quay.io/yldio/alpine-node-containerpilot:latest
RUN yarn add lerna@^2.0.0-rc.5 serve \ RUN yarn add lerna@^2.0.0-rc.5 serve \
&& ./node_modules/.bin/lerna clean --yes --scope joyent-ui-toolkit --include-filtered-dependencies \ && ./node_modules/.bin/lerna clean --yes --scope joyent-ui-toolkit --include-filtered-dependencies \
&& ./node_modules/.bin/lerna bootstrap --scope joyent-ui-toolkit --include-filtered-dependencies && ./node_modules/.bin/lerna bootstrap --scope joyent-ui-toolkit --include-filtered-dependencies
WORKDIR /home/node/app/packages/ui-toolkit WORKDIR /opt/app/packages/ui-toolkit
COPY packages/ui-toolkit/etc/containerpilot.json /etc/
ARG CIRCLE_BRANCH ARG CIRCLE_BRANCH
RUN yarn run styleguide:build RUN yarn run styleguide:build
COPY packages/ui-toolkit/etc/containerpilot.json /etc/
EXPOSE 5000 EXPOSE 6060
CMD ["/bin/containerpilot", "../../node_modules/.bin/serve", "-s", "styleguide"] CMD ["/bin/containerpilot"]

View File

@ -3,8 +3,8 @@
[![Docker Repository on Quay](https://quay.io/repository/yldio/joyent-ui-toolkit/status)](https://quay.io/repository/yldio/joyent-ui-toolkit) [![Docker Repository on Quay](https://quay.io/repository/yldio/joyent-ui-toolkit/status)](https://quay.io/repository/yldio/joyent-ui-toolkit)
[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0) [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg)](https://github.com/RichardLitt/standard-readme) [![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg)](https://github.com/RichardLitt/standard-readme)
[![demo master](https://img.shields.io/badge/demo-master-3B47CC.svg)](http://styleguide-master.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:5000) [![demo master](https://img.shields.io/badge/demo-master-3B47CC.svg)](http://styleguide-master.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:6060)
[![demo staging](https://img.shields.io/badge/demo-staging-3B47CC.svg)](http://styleguide-staging.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:5000) [![demo staging](https://img.shields.io/badge/demo-staging-3B47CC.svg)](http://styleguide-staging.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:6060)
## Table of Contents ## Table of Contents

View File

@ -1,46 +1,15 @@
{ {
"consul": "0.0.0.0:8500", "consul": "0.0.0.0:8500",
"services": [ "jobs": [
{ {
"name": "ui-toolkit", "name": "ui-toolkit",
"port": 6060, "port": 6060,
"health": "/usr/bin/curl -o /dev/null --fail -s http://0.0.0.0:6060/", "exec": "../../node_modules/.bin/serve --single styleguide --port 6060",
"poll": 3, "health": {
"ttl": 10 "exec": "/usr/bin/curl -o /dev/null --fail -s http://0.0.0.0:6060/",
} "interval": 3,
], "ttl": 10
"backends": [],
"telemetry": {
"port": 9090,
"sensors": [
{
"name": "frontend_memory_percent",
"help": "percentage of memory used",
"type": "gauge",
"poll": 5,
"check": ["/bin/sensors", "memory"]
},
{
"name": "frontend_cpu_load",
"help": "cpu load",
"type": "gauge",
"poll": 5,
"check": ["/bin/sensors", "cpu"]
},
{
"name": "frontend_disk_capacity",
"help": "disk capacity",
"type": "gauge",
"poll": 60,
"check": ["/bin/sensors", "diskcapacity"]
},
{
"name": "frontend_disk_usage",
"help": "disk usage",
"type": "gauge",
"poll": 60,
"check": ["/bin/sensors", "diskusage"]
} }
] }
} ]
} }