Skip to content

Fix small bugs #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olafveerman merged 1 commit into from
Jun 14, 2018
Merged

Fix small bugs #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
else
# Push tag to Github
git push origin ${VERSION}
fi

- run:
name: Build base Docker image ram-tools
Expand All @@ -86,7 +87,7 @@ jobs:
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWD

echo Pushing image to Docker Hub with ${VERSION} tag
docker tag ram-vt ${DOCKER_ORG}/${DOCKER_IMAGE}:${VERSION}
docker tag ${DOCKER_IMAGE} ${DOCKER_ORG}/${DOCKER_IMAGE}:${VERSION}
docker push ${DOCKER_ORG}/${DOCKER_IMAGE}:${VERSION}

deploy-analysis-prod:
Expand All @@ -112,7 +113,7 @@ jobs:
# Grab version from package.json and prepend with ram-analysis-v (ram-analysis-v0.5.0)
# Prepending it with the container is hacky, but needed because this
# repo holds and versions two containers.
VERSION=${DOCKER_IMAGE}-v$(grep -m1 version ram-vt/package.json | awk -F: '{ print $2 }' | sed 's/[", ]//g')
VERSION=${DOCKER_IMAGE}-v$(grep -m1 version ram-analysis/package.json | awk -F: '{ print $2 }' | sed 's/[", ]//g')

# Attempt to add a git tag based on version in package.json. If
# the tag already exists, git will fail and stop the build.
Expand All @@ -123,6 +124,7 @@ jobs:
else
# Push tag to Github
git push origin ${VERSION}
fi

- run:
name: Build base Docker image ram-tools
Expand All @@ -138,7 +140,7 @@ jobs:
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWD

echo Pushing image to Docker Hub with ${VERSION} tag
docker tag ram-vt ${DOCKER_ORG}/${DOCKER_IMAGE}:${VERSION}
docker tag ${DOCKER_IMAGE} ${DOCKER_ORG}/${DOCKER_IMAGE}:${VERSION}
docker push ${DOCKER_ORG}/${DOCKER_IMAGE}:${VERSION}

workflows:
Expand Down