Skip to content

Commit

Permalink
Merge pull request reactioncommerce#4638 from reactioncommerce/releas…
Browse files Browse the repository at this point in the history
…e-2.0.0

Release 2.0.0-rc.1
  • Loading branch information
spencern authored Sep 22, 2018
2 parents 36d0775 + bfc6595 commit 20ae016
Show file tree
Hide file tree
Showing 587 changed files with 10,784 additions and 7,671 deletions.
63 changes: 51 additions & 12 deletions .circleci/bin/ecs-deploy.sh
Original file line number Diff line number Diff line change
@@ -1,25 +1,64 @@
#!/bin/bash

sudo apt-get -y install python3-pip wget
sudo apt-get -y install python3-pip wget jq
sudo pip3 install awscli
wget https://github.com/mikefarah/yq/releases/download/2.0.1/yq_linux_amd64 -O /tmp/yq
sudo mv /tmp/yq /usr/local/bin/yq
sudo chmod +x /usr/local/bin/yq

if [ -z "${AWS_REGION}" ]; then
AWS_REGION=us-west-2
AWS_REGION=us-west-2
fi

if [ "${CLOUDFORMATION_AWS_ACCESS_KEY_ID}" ]; then
AWS_ACCESS_KEY_ID=${CLOUDFORMATION_AWS_ACCESS_KEY_ID}
fi
ENVIRONMENT=staging
SERVICE_DIR_NAME=.reaction/devops/aws/services
SERVICES=$(ls ${SERVICE_DIR_NAME})

if [ "${CLOUDFORMATION_AWS_SECRET_ACCESS_KEY}" ]; then
AWS_SECRET_ACCESS_KEY=${CLOUDFORMATION_AWS_SECRET_ACCESS_KEY}
fi
for SERVICE in $SERVICES; do
DISABLED=$(echo $SERVICE | grep disabled)
if [ "${DISABLED}" == "${SERVICE}" ]; then
continue
fi
echo "START PROCESSING SERVICE ${SERVICE}"

cd ${SERVICE_DIR_NAME}/${SERVICE}

PROPEL_CONFIG_FILE="propel-${ENVIRONMENT}.yaml"
if [ ! -f ${PROPEL_CONFIG_FILE} ]; then
echo "Propel configuration file not found!"
exit 1
fi

ENV_NAME_UPPERCASE=$(echo $ENVIRONMENT | awk '{print toupper($0)}')
AWS_ACCESS_KEY_ID_VAR_NAME=CLOUDFORMATION_${ENV_NAME_UPPERCASE}_AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY_VAR_NAME=CLOUDFORMATION_${ENV_NAME_UPPERCASE}_AWS_SECRET_ACCESS_KEY

if [ "${!AWS_ACCESS_KEY_ID_VAR_NAME}" ]; then
AWS_ACCESS_KEY_ID=${!AWS_ACCESS_KEY_ID_VAR_NAME}
fi

if [ "${!AWS_SECRET_ACCESS_KEY_VAR_NAME}" ]; then
AWS_SECRET_ACCESS_KEY=${!AWS_SECRET_ACCESS_KEY_VAR_NAME}
fi

mkdir -p ~/.aws
echo "[default]" > ~/.aws/credentials
echo "aws_access_key_id = ${AWS_ACCESS_KEY_ID}" >> ~/.aws/credentials
echo "aws_secret_access_key = ${AWS_SECRET_ACCESS_KEY}" >> ~/.aws/credentials

echo "[default]" > ~/.aws/config
echo "region = ${AWS_REGION}" >> ~/.aws/config

echo Running aws s3 cp s3://${S3_PROPEL_ARTIFACTS_BUCKET}/propel-linux-amd64 ./propel
aws s3 cp s3://${S3_PROPEL_ARTIFACTS_BUCKET}/propel-linux-amd64 ./propel

aws s3 cp --recursive s3://${S3_ECS_DEPLOY_BUCKET}/devops .
sudo mv propel /usr/local/bin/propel
sudo chmod +x /usr/local/bin/propel

find aws -name \*sh | xargs chmod +x
cd aws/app
./update-app-stack.sh core-service
RELEASE_DESCRIPTION="CircleCI build URL: ${CIRCLE_BUILD_URL}"
propel release create --deploy --descr "${RELEASE_DESCRIPTION}" -f ${PROPEL_CONFIG_FILE}

echo "END PROCESSING SERVICE ${SERVICE}"

cd -
done
17 changes: 11 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ jobs:
<<: *defaults
steps:
- checkout
- setup_remote_docker
- setup_remote_docker:
docker_layer_caching: true
- restore_cache:
name: Restoring Meteor cache
key: ${GLOBAL_CACHE_VERSION}-meteor
Expand Down Expand Up @@ -89,7 +90,8 @@ jobs:
<<: *defaults
steps:
- checkout
- setup_remote_docker
- setup_remote_docker:
docker_layer_caching: true
- attach_workspace:
at: docker-cache
- run:
Expand Down Expand Up @@ -118,7 +120,8 @@ jobs:
docker-push:
<<: *defaults
steps:
- setup_remote_docker
- setup_remote_docker:
docker_layer_caching: true
- attach_workspace:
at: docker-cache
- run:
Expand Down Expand Up @@ -258,7 +261,8 @@ jobs:
- image: hadolint/hadolint:v1.6.6-6-g254b4ff
steps:
- checkout
- setup_remote_docker
- setup_remote_docker:
docker_layer_caching: true
- run:
name: Dockerfile Lint
command: |
Expand All @@ -268,7 +272,8 @@ jobs:
<<: *defaults
steps:
- checkout
- setup_remote_docker
- setup_remote_docker:
docker_layer_caching: true
- restore_cache:
keys:
- ${GLOBAL_CACHE_VERSION}-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
Expand Down Expand Up @@ -335,7 +340,7 @@ workflows:
- docker-push
filters:
branches:
only: /^release-1\.16\.\d+$/
only: /^release-1\.17.\d+$/
- deploy-docs:
requires:
- test-unit
Expand Down
31 changes: 16 additions & 15 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -11,38 +11,38 @@ meteor-base@1.4.0 # Packages every Meteor app needs to have
mobile-experience@1.0.5 # Packages for a great mobile UX
blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.11.1 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.12.0-rc18.14 # Enable ECMAScript2015+ syntax in app code
audit-argument-checks@1.0.7 # ensure meteor method argument validation
browser-policy@1.1.0 # security-related policies enforced by newer browsers
juliancwirko:postcss@1.3.0 # CSS post-processing plugin (replaces standard-minifier-css)
session@1.1.7 # ReactiveDict whose contents are preserved across Hot Code Push
session@1.1.8 # ReactiveDict whose contents are preserved across Hot Code Push
tracker@1.2.0 # Meteor transparent reactive programming library
mongo@1.5.0
mongo@1.6.0-rc18.14
reactive-var@1.0.11
reactive-dict@1.2.0
reactive-dict@1.2.1
check@1.3.1
http@1.4.1
ddp-rate-limiter@1.0.7
underscore@1.0.10
logging@1.1.20
reload@1.2.0
ejson@1.1.0
less@2.7.12
less@2.8.0-rc18.14
service-configuration@1.0.11
mdg:validated-method
shell-server@0.3.1
dynamic-import@0.4.0
standard-minifier-js@2.3.4
shell-server@0.4.0-rc18.14
dynamic-import@0.5.0-rc18.14
standard-minifier-js@2.4.0-rc18.14

# Meteor Auth Packages
accounts-base@1.4.2
accounts-base@1.4.3-rc18.14
accounts-password@1.5.1
accounts-facebook@1.3.1
accounts-google@1.3.1
accounts-twitter@1.4.1
oauth-encryption@1.3.0
facebook-config-ui@1.0.1
google-config-ui@1.0.0
accounts-facebook@1.3.2-rc18.14
accounts-google@1.3.2-rc18.14
accounts-twitter@1.4.2-rc18.14
oauth-encryption@1.3.1-rc18.14
facebook-config-ui@1.0.2-rc18.14
google-config-ui@1.0.1-rc18.14
twitter-config-ui@1.0.0

# Community Packages
Expand All @@ -59,6 +59,7 @@ ongoworks:security
tmeasday:publish-counts
percolate:migrations
gadicc:blaze-react-component
orionsoft:graphql-compiler

# Testing packages
dburles:factory
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.7.0.3
METEOR@1.8-rc.14
84 changes: 44 additions & 40 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,101 +1,105 @@
accounts-base@1.4.2
accounts-facebook@1.3.1
accounts-google@1.3.1
accounts-oauth@1.1.15
accounts-base@1.4.3-rc18.14
accounts-facebook@1.3.2-rc18.14
accounts-google@1.3.2-rc18.14
accounts-oauth@1.1.16-rc18.14
accounts-password@1.5.1
accounts-twitter@1.4.1
accounts-twitter@1.4.2-rc18.14
alanning:roles@1.2.16
aldeed:autoform@6.3.0
aldeed:collection2@3.0.0
aldeed:schema-index@3.0.0
aldeed:template-extension@4.1.0
allow-deny@1.1.0
audit-argument-checks@1.0.7
autoupdate@1.4.0
babel-compiler@7.1.1
babel-runtime@1.2.2
autoupdate@1.5.0-rc18.14
babel-compiler@7.2.0-rc18.14
babel-runtime@1.3.0-rc18.14
base64@1.0.11
binary-heap@1.0.10
blaze@2.3.2
binary-heap@1.0.11-rc18.14
blaze@2.3.3
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.5.0
boilerplate-generator@1.6.0-rc18.14
bozhao:accounts-instagram@0.2.2
browser-policy@1.1.0
browser-policy-common@1.0.11
browser-policy-content@1.1.0
browser-policy-framing@1.1.0
caching-compiler@1.1.12
caching-compiler@1.2.0-rc18.14
caching-html-compiler@1.1.2
callback-hook@1.1.0
check@1.3.1
coffeescript@1.0.17
dburles:factory@1.1.0
ddp@1.4.0
ddp-client@2.3.2
ddp-client@2.3.3
ddp-common@1.4.0
ddp-rate-limiter@1.0.7
ddp-server@2.2.0
deps@1.0.12
diff-sequence@1.1.0
dispatch:run-as-user@1.1.1
dynamic-import@0.4.1
ecmascript@0.11.1
dynamic-import@0.5.0-rc18.14
ecmascript@0.12.0-rc18.14
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.7.1
ecmascript-runtime-server@0.7.0
ecmascript-runtime-client@0.8.0-rc18.14
ecmascript-runtime-server@0.7.1
ejson@1.1.0
email@1.2.3
es5-shim@4.8.0
facebook-config-ui@1.0.1
facebook-config-ui@1.0.2-rc18.14
facebook-oauth@1.5.0
fetch@0.1.0
gadicc:blaze-react-component@1.4.0
geojson-utils@1.0.10
google-config-ui@1.0.0
google-oauth@1.2.5
google-config-ui@1.0.1-rc18.14
google-oauth@1.2.6-rc18.14
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.4.1
id-map@1.1.0
inter-process-messaging@0.1.0-rc18.14
johanbrook:publication-collector@1.1.0
jquery@1.11.11
juliancwirko:postcss@1.3.0
launch-screen@1.1.1
less@2.7.12
less@2.8.0-rc18.14
livedata@1.0.18
lmieulet:meteor-coverage@1.1.4
localstorage@1.2.0
logging@1.1.20
mdg:validated-method@1.1.0
meteor@1.9.0
meteor@1.9.2
meteor-base@1.4.0
meteorhacks:picker@1.0.3
meteorhacks:ssr@2.2.0
meteorhacks:subs-manager@1.6.4
meteortesting:browser-tests@0.2.0
meteortesting:mocha@0.6.0
minifier-css@1.3.1
minifier-js@2.3.5
minimongo@1.4.4
minifier-css@1.4.0-rc18.14
minifier-js@2.4.0-rc18.14
minimongo@1.4.5
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modern-browsers@0.1.1
modules@0.12.0
modules-runtime@0.10.0
modern-browsers@0.1.2
modules@0.13.0-rc18.14
modules-runtime@0.10.2
momentjs:moment@2.19.4
mongo@1.5.0
mongo@1.6.0-rc18.14
mongo-decimal@0.1.0
mongo-dev-server@1.1.0
mongo-id@1.0.7
npm-bcrypt@0.9.3
npm-mongo@3.0.7
npm-mongo@3.1.1-rc18.14
oauth@1.2.3
oauth-encryption@1.3.0
oauth1@1.2.0
oauth2@1.2.0
oauth-encryption@1.3.1-rc18.14
oauth1@1.2.1-rc18.14
oauth2@1.2.1-rc18.14
observe-sequence@1.0.16
ongoworks:security@2.1.0
ordered-dict@1.1.0
orionsoft:graphql-compiler@0.0.4
percolate:migrations@0.9.8
practicalmeteor:chai@2.1.0_1
practicalmeteor:mocha-core@1.0.1
Expand All @@ -104,20 +108,20 @@ promise@0.11.1
raix:eventemitter@0.1.3
random@1.1.0
rate-limit@1.0.9
reactive-dict@1.2.0
reactive-dict@1.2.1
reactive-var@1.0.11
reload@1.2.0
retry@1.1.0
routepolicy@1.0.13
routepolicy@1.1.0-rc18.14
service-configuration@1.0.11
session@1.1.7
session@1.1.8
sha@1.0.9
shell-server@0.3.1
shell-server@0.4.0-rc18.14
socket-stream-client@0.2.2
spacebars@1.0.15
spacebars-compiler@1.1.3
srp@1.0.10
standard-minifier-js@2.3.4
srp@1.0.12
standard-minifier-js@2.4.0-rc18.14
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
Expand All @@ -130,5 +134,5 @@ twitter-oauth@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.2.0
webapp@1.6.1
webapp@1.7.0-rc18.14
webapp-hashing@1.0.9
Loading

0 comments on commit 20ae016

Please sign in to comment.