Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
xpub-faraday
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
xpub
xpub-faraday
Commits
d1f5294a
Commit
d1f5294a
authored
6 years ago
by
Bogdan Cochior
Browse files
Options
Downloads
Patches
Plain Diff
ci: add push to review production
parent
04130a2c
No related branches found
No related tags found
1 merge request
!43
Sprint #19
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+35
-15
35 additions, 15 deletions
.gitlab-ci.yml
packages/components-faraday/src/components/Dashboard/Dashboard.js
+10
-11
10 additions, 11 deletions
.../components-faraday/src/components/Dashboard/Dashboard.js
with
45 additions
and
26 deletions
.gitlab-ci.yml
+
35
−
15
View file @
d1f5294a
variables
:
CONFIGURATION_REPOSITORY
:
https://gitlab.coko.foundation/bogdan/xpub-faraday-deployment-config.git
DOCKER_REPO
:
$CI_ECR_URL
DOCKER_REPO_REVIEW
:
$REVIEW_ECR
stages
:
-
build
...
...
@@ -50,10 +51,9 @@ test:
push:qa
:
image
:
docker:latest
stage
:
push
when
:
manual
variables
:
NODE_ENV
:
test
only
:
-
develop
script
:
# Setup
-
export AWS_REGION="eu-west-1"
...
...
@@ -115,22 +115,27 @@ push:staging:
-
docker tag $DOCKER_REPO:$CI_COMMIT_SHA $DOCKER_REPO:staging
-
docker push $DOCKER_REPO:staging
deploy:aws-qa
:
stage
:
deploy
push:prod-review
:
image
:
docker:latest
stage
:
push
when
:
manual
only
:
-
develop
variables
:
NODE_ENV
:
production
script
:
# Setup
-
export AWS_REGION="eu-west-1"
-
export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
-
export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
-
apk --no-cache add --update python python-dev py-pip
-
pip install ecs-deploy
# Deploy
-
ecs deploy ${CI_CLUSTER_NAME} ${CI_SERVICE_NAME} --region ${AWS_REGION} --timeout 1200 -e ${CI_CONTAINER_NAME} AWS_S3_ACCESS_KEY $AWS_S3_ACCESS_KEY -e ${CI_CONTAINER_NAME} AWS_S3_SECRET_KEY $AWS_S3_SECRET_KEY -e ${CI_CONTAINER_NAME} AWS_S3_REGION $AWS_S3_REGION -e ${CI_CONTAINER_NAME} AWS_S3_BUCKET $AWS_S3_BUCKET -e ${CI_CONTAINER_NAME} AWS_SES_SECRET_KEY $AWS_SES_SECRET_KEY -e ${CI_CONTAINER_NAME} AWS_SES_ACCESS_KEY $AWS_SES_ACCESS_KEY -e ${CI_CONTAINER_NAME} AWS_SES_REGION $AWS_SES_REGION -e ${CI_CONTAINER_NAME} EMAIL_SENDER $EMAIL_SENDER -e ${CI_CONTAINER_NAME} secret $SECRET -e ${CI_CONTAINER_NAME} DATABASE $DATABASE -e ${CI_CONTAINER_NAME} DB_USER $DB_USER -e ${CI_CONTAINER_NAME} DB_PASS $DB_PASS -e ${CI_CONTAINER_NAME} DB_HOST $DB_HOST -e ${CI_CONTAINER_NAME} ORCID_CLIENT_ID $ORCID_CLIENT_ID -e ${CI_CONTAINER_NAME} ORCID_CLIENT_SECRET $ORCID_CLIENT_SECRET -e ${CI_CONTAINER_NAME} CLIENT_BASE_URL $CLIENT_BASE_URL -e ${CI_CONTAINER_NAME} FTP_USERNAME $FTP_USERNAME -e ${CI_CONTAINER_NAME} FTP_PASSWORD $FTP_PASSWORD -e ${CI_CONTAINER_NAME} FTP_HOST $FTP_HOST
environment
:
name
:
qa
url
:
$CI_ALB_URL
-
export AWS_ACCESS_KEY_ID=$REVIEW_AWS_ACCESS
-
export AWS_SECRET_ACCESS_KEY=$REVIEW_AWS_SECRET
-
apk update
-
apk --no-cache add --update curl python python-dev py-pip
-
pip install awscli --upgrade --user
-
export PATH=~/.local/bin:/usr/bin/:$PATH
# AUTH
-
CERT=`aws ecr get-login --no-include-email --region ${AWS_REGION}`
-
${CERT}
# Tag
-
docker tag $DOCKER_REPO:$CI_COMMIT_SHA $DOCKER_REPO_REVIEW:production
-
docker push $DOCKER_REPO_REVIEW:production
deploy:qa
:
image
:
pubsweet/deployer:latest
...
...
@@ -165,3 +170,18 @@ deploy:staging:
script
:
-
source deploy.sh
-
create_deployment
deploy:prod-review
:
image
:
pubsweet/deployer:latest
stage
:
deploy
when
:
manual
variables
:
PACKAGE_NAME
:
xpub-faraday
IMAGE_TAG
:
production
NODE_ENV
:
production
environment
:
name
:
production
url
:
http://review.hindawi.com
script
:
-
source deploy.sh
-
create_deployment
This diff is collapsed.
Click to expand it.
packages/components-faraday/src/components/Dashboard/Dashboard.js
+
10
−
11
View file @
d1f5294a
...
...
@@ -10,17 +10,16 @@ const Dashboard = ({
changeFilterValue
,
getDefaultFilterValue
,
journal
,
})
=>
console
.
log
(
journal
)
||
(
<
Fragment
>
<
DashboardFilters
changeFilterValue
=
{
changeFilterValue
}
getDefaultFilterValue
=
{
getDefaultFilterValue
}
getFilterOptions
=
{
getFilterOptions
}
/
>
<
DashboardItems
deleteProject
=
{
deleteProject
}
list
=
{
dashboardItems
}
/
>
<
/Fragment
>
)
})
=>
(
<
Fragment
>
<
DashboardFilters
changeFilterValue
=
{
changeFilterValue
}
getDefaultFilterValue
=
{
getDefaultFilterValue
}
getFilterOptions
=
{
getFilterOptions
}
/
>
<
DashboardItems
deleteProject
=
{
deleteProject
}
list
=
{
dashboardItems
}
/
>
<
/Fragment
>
)
export
default
compose
(
withProps
(({
dashboard
,
filterItems
})
=>
({
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment