Skip to content

Commit f6fc7a9

Browse files
author
Ryan Sandor Richards
committed
Merge branch 'master' into new-charon
2 parents 8ee8f74 + 0f9ff09 commit f6fc7a9

4 files changed

Lines changed: 53 additions & 5 deletions

File tree

‎ansible/group_vars/alpha-workers.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
name: "api"
1+
name: "api-worker"
22

33
# for rollbar deploy info
44
rollbar_token: a90d9c262c7c48cfabbd32fd0a1bc61c
55

6-
container_image: registry.runnable.com/runnable/{{ name }}-worker
6+
container_image: registry.runnable.com/runnable/{{ name }}
77
container_tag: "{{ git_branch }}"
8-
repo: "git@github.com:CodeNow/{{ name }}.git"
8+
repo: "git@github.com:CodeNow/api.git"
9+
910
node_version: "0.10.38"
1011
npm_version: "2.8.3"
1112

@@ -17,7 +18,7 @@ redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address']
1718

1819
# for container settings
1920
container_envs: >
20-
-h api-worker
21+
-h {{ name }}
2122
-e AWS_ACCESS_KEY_ID={{ api_aws_access_key_id }}
2223
-e AWS_SECRET_ACCESS_KEY={{ api_aws_secret_access_key }}
2324
-e DATADOG_HOST={{ datadog_host }}

‎ansible/roles/builder/templates/basic_node/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ENV {{ env }}
1616
RUN n {{ node_version }} && npm install -g npm@{{ npm_version }}
1717

1818
# Download Repo
19-
RUN git clone -b {{ git_branch }} --single-branch {{ repo }}
19+
RUN git clone -b {{ git_branch }} --single-branch {{ repo }} /{{ name }}
2020

2121
WORKDIR /{{ name }}
2222
{% if dockerfile_pre_install_commands is defined %}

‎ansible/roles/docker_client/files/certs/api-worker/cert.pem‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDPDCCAiSgAwIBAgIJAJmEbazS8ZFHMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
3+
VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
4+
aXNjbzERMA8GA1UEChMIUnVubmFibGUxDDAKBgNVBAsTA09wczESMBAGA1UEAxMJ
5+
bG9jYWxob3N0MR8wHQYJKoZIhvcNAQkBFhBvcHNAcnVubmFibGUuY29tMB4XDTE1
6+
MDUyODIxMzE0NloXDTE2MDUyNzIxMzE0NlowETEPMA0GA1UEAxMGY2xpZW50MIIB
7+
IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwFN3Nebc3LcktF2z0ZFJ3sj
8+
u49FEGul7FtEhVFDkojaRAx7Hc786xQxAjujpYp7kjkyPrb8dkdj80QprASmeow8
9+
wbe+c+QGChBKqLQNUhGeyqD0ztyH2qxCknH81CZ/1azc7uzJ/tykkStyWFzoyVg4
10+
XtI4XNF7mBiaqyBziYvFHi2CoNxIBlB+91yTA9dlrlH1/mRFqhCdx5Hp+NdFlJS0
11+
JvIAbKaChljNh+wWnaJJzMRjeH9DpUp4z2oq7/o009mNcDJ2xHVTO7mcnhaS2Fh/
12+
rJd3DgTOn1WTRrQELJoMra4vz2Tz1nhmXr7cjCLXEEEHIxVTZ2ouKlG4jPJWawID
13+
AQABoxcwFTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOCAQEA
14+
Zh2VqXJ4UqgyNg6GvZSeLWiPQWWYdIyNQDc9J53cKNgiCzEF5rP1LUKQHIxhw7Cs
15+
elnq9PG8vEnA66BxmaWfpju7xRSpTFCUQoIhvkPY8ohvZjwqh/LZ7LbQcFBMHfiZ
16+
H6s+d6bNa7RlLw5Egry2REDofDrlfDeh5VKVL425LvkRrEM7J0aK7HtFc6INNl78
17+
gLjWeRdA8l/99PmRxcJ47YIJkG4cBeb7rhVIqNmpcwhZnCF9kIz8tcQJjxR4HWD9
18+
Vq30l+NFoonvafqqUT2A/EM0JYNW5dqiCFGpFitAuRFLBWMNH9dYhOkoPXTnOgwD
19+
VDQyCk1m8xDjKxC1HkaB9Q==
20+
-----END CERTIFICATE-----

‎ansible/roles/docker_client/files/certs/api-worker/key.pem‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEogIBAAKCAQEAvwFN3Nebc3LcktF2z0ZFJ3sju49FEGul7FtEhVFDkojaRAx7
3+
Hc786xQxAjujpYp7kjkyPrb8dkdj80QprASmeow8wbe+c+QGChBKqLQNUhGeyqD0
4+
ztyH2qxCknH81CZ/1azc7uzJ/tykkStyWFzoyVg4XtI4XNF7mBiaqyBziYvFHi2C
5+
oNxIBlB+91yTA9dlrlH1/mRFqhCdx5Hp+NdFlJS0JvIAbKaChljNh+wWnaJJzMRj
6+
eH9DpUp4z2oq7/o009mNcDJ2xHVTO7mcnhaS2Fh/rJd3DgTOn1WTRrQELJoMra4v
7+
z2Tz1nhmXr7cjCLXEEEHIxVTZ2ouKlG4jPJWawIDAQABAoIBADfdScitxumdTqYi
8+
XX2CL/e8LFdPMAP9eCoJB6F2gyz4md4NSHUPdSnMXgkpKFPijQHXeLqfCngNqU4d
9+
QZLuSULOgXanJyz+JEYNPcjZ4IuAW9EoAnH+Tj3G5DGw5SGnoPv98yBuYSYJophS
10+
/L6bbfp1swcItTNwkZWKnLIwa5pupTxMTJPSJl276wkGgbiH3RW/5aXo/fMlzJjc
11+
2vmRhMH9h1fupWxGpv7ZpoXnF6sXFPiElJhvUHvdeaS/J7V3zBd8cLRi9m4J8Sfd
12+
nehfxcQlKnyarWazU3nCC1+hjJgilRmed+gG80Zt6Wkymx1yWWrKcLeZ+gRWrvAW
13+
l1AwIgECgYEA65XiyzIiCgkBiD/hloDCG3PN8MBygs1nxlQ729wA/mx3iEpj6CYS
14+
sIr0Y17oyrVrn+gepYM+CUEJALmhWv7TrPYrgc8QkDi1BmSruHjh2Er4/hhGBZFf
15+
pSDaJ+1/vYYGr3uXi1oTNW3BImpgqutdEvMFjA4BOyO/vIMi8Vj857kCgYEAz453
16+
5nFPDDOOGUS1ZM4sgdHZIV8VnAWjSgGG8FLygd/bOvXnc813yIGUowHwhjcU5l9k
17+
LYs2bKxL3cWIigD4WlwR8VWmq8SWbYKpzrJFopESz1a045QkK+IzjRbJsgHVAO66
18+
hZmpa1GfHuQuRRKz8Cwjm4kuyMtZaXFCVrY1uUMCgYBeUyT7NpdqbTCv3OP13pfZ
19+
ZgSO4H744EUso41T+kJrnAJAD4jw6k2RYhF3uAh9ISZ2X/nlSycLjX6NS8XPKTiX
20+
h/jjgIShOhNA/A3FTqEeeOY41n8yu4IQG5c9ZVpAB+mlWVbT9Ly8J7WskesihBo/
21+
/A28hd74Ttf2IotbFsYsAQKBgGcEP16RPrq/m/fOsnmmG1ET5sE5gHBAHBvPRjph
22+
8RulEBrjkk1X3ewW5L9DZy42iJkPH5m7TvgBTGZ2dJ6KfLncmMs/x8nZeRBBmiaN
23+
NSLK/psKXh3WmV1umEee190SK7aaxtkou34YtPGQL6b48XZzcfjwzde7llVPca24
24+
IlIhAoGAZcAZTxHDIP4fhP65njbGrRPmWEcxrJboAacbiQj4wc3gTu8qAA9EshGY
25+
eINtHNbYBLVVkWavfz2FKr44tBbcpM4bNceHoyn34qHgIok+xpUBmx1cPFnLVtYN
26+
ei7cmttdrLJ5/s35psfug3/T9FHmGDtZSIzYeChIwnOJErABrHU=
27+
-----END RSA PRIVATE KEY-----

0 commit comments

Comments
 (0)