Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: update versions

Browse Source
This commit is contained in:
Sérgio Ramos 2017-09-08 18:07:54 +01:00
parent ff23179bfd
commit 71ff59cb55
6 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
docker/api/bootstrap-data.js vendored
View File

@ -63,56 +63,68 @@ const bootstrap = function ({ docker, rethink }) {
return;
}
data.createDatacenter({ region, name: region }, (err, datacenter) => {
data.getDatacenters((err, datacenters) => {
if (err) {
console.error(err);
return;
}
Triton.createClient(
{
profile: settings.triton
},
(err, { cloudapi }) => {
if (err) {
console.error(err);
return;
}
if (datacenters && datacenters.length) {
process.exit(0);
return;
}
cloudapi.getAccount((err, { firstName, lastName, email, login }) => {
data.createDatacenter({ region, name: region }, (err, datacenter) => {
if (err) {
console.error(err);
return;
}
Triton.createClient(
{
profile: settings.triton
},
(err, { cloudapi }) => {
if (err) {
console.error(err);
return;
}
data.createUser(
{ firstName, lastName, email, login },
(err, user) => {
if (err) {
console.error(err);
return;
}
data.createPortal(
{
user,
datacenter
},
(err, portal) => {
if (err) {
console.error(err);
return;
}
console.log('data bootstrapped');
process.exit(0);
}
);
cloudapi.getAccount((err, { firstName, lastName, email, login }) => {
if (err) {
console.error(err);
return;
}
);
});
}
);
data.createUser(
{ firstName, lastName, email, login },
(err, user) => {
if (err) {
console.error(err);
return;
}
data.createPortal(
{
user,
datacenter
},
(err, portal) => {
if (err) {
console.error(err);
return;
}
console.log('data bootstrapped');
process.exit(0);
}
);
}
);
});
}
);
});
});
});
};

2
docker/api/package.json
View File

@ -21,7 +21,7 @@
"joi": "^10.6.0",
"joyent-cp-gql-schema": "^1.7.0",
"piloted": "^3.1.1",
"portal-api": "^1.7.0",
"portal-api": "^1.8.2",
"toppsy": "^1.1.0",
"triton": "^5.2.0"
}

2
docker/compose-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM quay.io/yldio/docker-compose-api
FROM ramitos/docker-compose-api:1.0.0
RUN apk add --update bash

2
packages/docker-compose-client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "docker-compose-client",
"version": "1.0.9",
"version": "1.1.0",
"license": "MPL-2.0",
"repository": "github:yldio/joyent-portal",
"main": "lib",

4
packages/portal-api/package.json
View File

@ -1,6 +1,6 @@
{
"name": "portal-api",
"version": "1.8.0",
"version": "1.8.2",
"description": "",
"main": "./lib/index.js",
"scripts": {
@ -34,7 +34,7 @@
"dependencies": {
"boom": "^5.2.0",
"cidr-matcher": "^1.0.5",
"docker-compose-client": "^1.0.9",
"docker-compose-client": "^1.1.0",
"dockerode": "^2.5.0",
"force-array": "^3.1.0",
"graphi": "^3.0.0",

6
triton-compose.yml
View File

@ -63,7 +63,7 @@ rethinkdb:
# FRONTEND
#############################################################################
frontend:
image: joyent/copilot-frontend:1.0.0
image: joyent/copilot-frontend:1.3.4
mem_limit: 512m
labels:
- triton.cns.services=copilot
@ -81,7 +81,7 @@ frontend:
# BACKEND
#############################################################################
api:
image: joyent/copilot-api:1.1.0
image: joyent/copilot-api:1.8.2
mem_limit: 1g
expose:
- 3000
@ -94,7 +94,7 @@ api:
# Docker-compose wrapper
# Create _env file from running ./setup.sh
compose-api:
image: joyent/copilot-compose:1.0.0
image: joyent/copilot-compose:1.1.0
expose:
- 4242
env_file: