Skip to content

Commit 0830865

Browse files
author
sachin-maheshwari
authored
Merge pull request #22 from topcoder-platform/dev-mssts
STS (MSv1.3) migration
2 parents 161c292 + 891fe69 commit 0830865

File tree

2 files changed

+95
-94
lines changed

2 files changed

+95
-94
lines changed

‎.circleci/config.yml

Lines changed: 66 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,91 @@
11
version: 2
2-
3-
jobs:
4-
# Build & Deploy against development backend rer
5-
"build-dev":
2+
defaults: &defaults
63
docker:
74
- image: docker:17.06.1-ce-git
8-
steps:
9-
# Initialization.
10-
- checkout
11-
- setup_remote_docker
12-
- run:
13-
name: Installation of build dependencies.
14-
command: apk add --no-cache bash
5+
install_dependency: &install_dependency
6+
name: Installation of build and deployment dependencies.
7+
command: |
8+
apk update
9+
apk add --no-cache bash curl
10+
apk upgrade
11+
apk add --no-cache jq py-pip sudo
12+
sudo pip install awscli --upgrade
13+
install_deploysuite: &install_deploysuite
14+
name: Installation of install_deploysuite.
15+
#Git Clone -change back to v1.3 or latest once counter var is generalized.
16+
command: |
17+
git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
18+
cp ./../buildscript/master_deploy.sh .
19+
cp ./../buildscript/buildenv.sh .
20+
cp ./../buildscript/awsconfiguration.sh .
21+
22+
restore_cache_settings_for_build: &restore_cache_settings_for_build
23+
key: docker-tc-email-service-{{ checksum "package-lock.json" }}
1524

16-
# Restoration of node_modules from cache.
17-
- restore_cache:
18-
key: docker-tc-email-service-{{ checksum "package-lock.json" }}
25+
save_cache_settings: &save_cache_settings
26+
key: docker-tc-email-service-{{ checksum "package-lock.json" }}
27+
paths:
28+
- node_modules
1929

20-
# Build of Docker image.
21-
- run:
30+
run_build: &run_build
2231
name: Build of Docker image
23-
command: ./build.sh DEV
32+
command: ./build.sh
2433

25-
# Caching node modules.
26-
- save_cache:
27-
key: docker-tc-email-service-{{ checksum "package-lock.json" }}
28-
paths:
29-
- node_modules
30-
31-
# Deployment.
32-
- run:
33-
name: Installing AWS client
34-
command: |
35-
apk add --no-cache jq py-pip sudo
36-
sudo pip install awscli --upgrade
3734

35+
jobs:
36+
# Build & Deploy against development backend rer
37+
"build-dev":
38+
<<: *defaults
39+
steps:
40+
- checkout
41+
- setup_remote_docker
42+
- run: *install_dependency
43+
- run: *install_deploysuite
44+
- restore_cache: *restore_cache_settings_for_build
45+
- run: *run_build
46+
- save_cache: *save_cache_settings
3847
- deploy:
39-
command: ./deploy.sh DEV $CIRCLE_SHA1
40-
48+
name: Running Masterscript - deploy tc-email-service
49+
command: |
50+
./awsconfiguration.sh DEV
51+
source awsenvconf
52+
./buildenv.sh -e DEV -b dev-tc-email-service-deployvar
53+
source buildenvvar
54+
./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,dev-tc-email-service-appvar -i tc-email-service
55+
56+
4157
"build-prod":
42-
docker:
43-
- image: docker:17.06.1-ce-git
58+
<<: *defaults
4459
steps:
45-
# Initialization.
4660
- checkout
4761
- setup_remote_docker
48-
- run:
49-
name: Installation of build dependencies.
50-
command: apk add --no-cache bash
51-
52-
# Restoration of node_modules from cache.
53-
- restore_cache:
54-
key: docker-tc-email-service-{{ checksum "package-lock.json" }}
55-
56-
# Build of Docker image.
57-
- run:
58-
name: Build of Docker image
59-
command: ./build.sh PROD
60-
61-
# Caching node modules.
62-
- save_cache:
63-
key: docker-tc-email-service-{{ checksum "package-lock.json" }}
64-
paths:
65-
- node_modules
66-
67-
# Deployment.
68-
- run:
69-
name: Installing AWS client
70-
command: |
71-
apk add --no-cache jq py-pip sudo
72-
sudo pip install awscli --upgrade
73-
62+
- run: *install_dependency
63+
- run: *install_deploysuite
64+
- restore_cache: *restore_cache_settings_for_build
65+
- run: *run_build
66+
- save_cache: *save_cache_settings
7467
- deploy:
75-
command: ./deploy.sh PROD $CIRCLE_SHA1
68+
name: Running Masterscript - prod deploy tc-email-service
69+
command: |
70+
./awsconfiguration.sh PROD
71+
source awsenvconf
72+
./buildenv.sh -e PROD -b prod-tc-email-service-deployvar
73+
source buildenvvar
74+
./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,prod-tc-email-service-appvar -i tc-email-service
7675
76+
7777
workflows:
7878
version: 2
7979
build:
8080
jobs:
81-
# Development builds are executed on "dev" branch only.
81+
# Development builds are executed on "develop" branch only.
8282
- "build-dev":
83+
context : org-global
8384
filters:
8485
branches:
85-
only: ["dev"]
86-
# Production builds are executed on "master" branch only.
86+
only: ['dev','dev-mssts']
8787
- "build-prod":
88+
context : org-global
8889
filters:
8990
branches:
90-
only: "master"
91+
only: master

‎build.sh

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,46 @@ set -eo pipefail
55
# This script expects a single argument: NODE_ENV, which must be either
66
# "development" or "production".
77

8-
NODE_ENV=$1
8+
#NODE_ENV=$1
99

10-
ENV=$1
11-
AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
12-
AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
13-
AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
14-
AWS_ACCOUNT_ID=$(eval "echo \$${ENV}_AWS_ACCOUNT_ID")
15-
AWS_REPOSITORY=$(eval "echo \$${ENV}_AWS_REPOSITORY")
10+
#ENV=$1
11+
#AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
12+
#AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
13+
#AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
14+
#AWS_ACCOUNT_ID=$(eval "echo \$${ENV}_AWS_ACCOUNT_ID")
15+
#AWS_REPOSITORY=$(eval "echo \$${ENV}_AWS_REPOSITORY")
1616

1717
#App variables
1818

19-
AUTHDOMAIN=$(eval "echo \$${ENV}_AUTHDOMAIN")
20-
AUTHSECRET=$(eval "echo \$${ENV}_AUTHSECRET")
21-
VALIDISSUERS=$(eval "echo \$${ENV}_VALIDISSUERS")
19+
#AUTHDOMAIN=$(eval "echo \$${ENV}_AUTHDOMAIN")
20+
#AUTHSECRET=$(eval "echo \$${ENV}_AUTHSECRET")
21+
#VALIDISSUERS=$(eval "echo \$${ENV}_VALIDISSUERS")
2222

23-
KAFKA_CLIENT_CERT=$(eval "echo \$${ENV}_KAFKA_CLIENT_CERT")
24-
KAFKA_CLIENT_CERT_KEY=$(eval "echo \$${ENV}_KAFKA_CLIENT_CERT_KEY")
25-
KAFKA_URL=$(eval "echo \$${ENV}_KAFKA_URL")
26-
SENDGRID_API_KEY=$(eval "echo \$${ENV}_SENDGRID_API_KEY")
23+
#KAFKA_CLIENT_CERT=$(eval "echo \$${ENV}_KAFKA_CLIENT_CERT")
24+
#KAFKA_CLIENT_CERT_KEY=$(eval "echo \$${ENV}_KAFKA_CLIENT_CERT_KEY")
25+
#KAFKA_URL=$(eval "echo \$${ENV}_KAFKA_URL")
26+
#SENDGRID_API_KEY=$(eval "echo \$${ENV}_SENDGRID_API_KEY")
2727

2828

29-
DB_DATABASE=$(eval "echo \$${ENV}_DB_DATABASE")
30-
DB_HOST=$(eval "echo \$${ENV}_DB_HOST")
31-
DB_PASSWORD=$(eval "echo \$${ENV}_DB_PASSWORD")
32-
DB_PORT=$(eval "echo \$${ENV}_DB_PORT")
33-
DB_USER=$(eval "echo \$${ENV}_DB_USER")
34-
DATABASE_URL=postgres://$DB_USER:$DB_PASSWORD@$DB_HOST:$DB_PORT/$DB_DATABASE;
29+
#DB_DATABASE=$(eval "echo \$${ENV}_DB_DATABASE")
30+
#DB_HOST=$(eval "echo \$${ENV}_DB_HOST")
31+
#DB_PASSWORD=$(eval "echo \$${ENV}_DB_PASSWORD")
32+
#DB_PORT=$(eval "echo \$${ENV}_DB_PORT")
33+
#DB_USER=$(eval "echo \$${ENV}_DB_USER")
34+
#DATABASE_URL=postgres://$DB_USER:$DB_PASSWORD@$DB_HOST:$DB_PORT/$DB_DATABASE;
3535

3636

37-
KAFKA_GROUP_ID=$(eval "echo \$${ENV}_KAFKA_GROUP_ID")
38-
EMAIL_FROM=$(eval "echo \$${ENV}_EMAIL_FROM")
39-
LOG_LEVEL=$(eval "echo \$${ENV}_LOG_LEVEL")
40-
NODE_ENV=$(eval "echo \$${ENV}_NODE_ENV")
41-
NODE_PORT=$(eval "echo \$${ENV}_NODE_PORT")
42-
JWKSURI=$(eval "echo \$${ENV}_JWKSURI")
43-
TEMPLATE_MAP=$(eval "echo \$${ENV}_TEMPLATE_MAP")
37+
#KAFKA_GROUP_ID=$(eval "echo \$${ENV}_KAFKA_GROUP_ID")
38+
#EMAIL_FROM=$(eval "echo \$${ENV}_EMAIL_FROM")
39+
#LOG_LEVEL=$(eval "echo \$${ENV}_LOG_LEVEL")
40+
#NODE_ENV=$(eval "echo \$${ENV}_NODE_ENV")
41+
#NODE_PORT=$(eval "echo \$${ENV}_NODE_PORT")
42+
#JWKSURI=$(eval "echo \$${ENV}_JWKSURI")
43+
#TEMPLATE_MAP=$(eval "echo \$${ENV}_TEMPLATE_MAP")
4444

4545

46-
TAG=$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/tc-email-service:$CIRCLE_SHA1
47-
46+
#TAG=$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/tc-email-service:$CIRCLE_SHA1
47+
TAG="tc-email-service:latest"
4848
docker build -t $TAG .
4949

5050
# Copies "node_modules" from the created image, if necessary for caching.

0 commit comments

Comments
 (0)