Skip to content
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.

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

Docker base and CircleCI updates #3045

Merged
merged 3 commits into from
Oct 6, 2017
Merged

Conversation

jshimko
Copy link
Contributor

@jshimko jshimko commented Oct 5, 2017

  • update Docker base to v2.2.0
  • clean up CI build steps for deprecated branches
  • add TOOL_NODE_FLAGS to CI test env to fix memory issue

The last item appears to fix #3023 when building on CircleCI without our build cache.

@jshimko jshimko requested review from aaronjudd and spencern October 5, 2017 22:15
if [[ "$CIRCLE_BRANCH" != "master" && \
"$CIRCLE_BRANCH" != "development" && \
"$CIRCLE_BRANCH" != *"docker"* && \
"$CIRCLE_BRANCH" != "marketplace" ]]; # TODO: remove this once marketplace is merged
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I wait to merge this until after we've released 1.5.0?

Copy link
Contributor Author

@jshimko jshimko Oct 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was under the impression the release-1.5.0 branch is marketplace. No?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either way, this will have no effect on whether marketplace continues to build in CI unless you merge release-1.5.0 back into marketplace.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And we definitely want this to be part of the 1.5.0 release. The current Docker base isn't using the current 4.x version of Node that we should be (4.8.4).

@aaronjudd
Copy link
Contributor

I am merging into release-1.5.0 -> it's time to kill marketplace. That's now just serving as development and deserves it's fate for doing so.

@aaronjudd aaronjudd merged commit 1e45116 into release-1.5.0 Oct 6, 2017
@aaronjudd aaronjudd deleted the docker-ci-updates branch October 6, 2017 15:31
@spencern spencern mentioned this pull request Oct 11, 2017
@@ -11,6 +11,7 @@ jobs:
- DOCKER_VERSION: 17.05.0-ce
- DOCKER_COMPOSE_VERSION: 1.15.0
- METEOR_ALLOW_SUPERUSER: true
- TOOL_NODE_FLAGS: "--max-old-space-size=4096"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any further reference on the memory issue / fix here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no update on the memory usage of the Meteor build tool. I think the real solution is just building a smaller app. And that's one of the focuses of our upcoming performance work on Reaction.

docker push $DOCKER_NAMESPACE_DEV:latest
fi


# Master branch deployment (only runs when a version git tag exists - syntax: "v1.2.3")
if [[ "$CIRCLE_BRANCH" == "master" ]]; then
VERSION=$(git describe --tags | grep "^v[0-9]\+\.[0-9]\+\.[0-9]\+$")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm.. how do you guys handle tagging releases such as patch, hotfix, & the like?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We tag release versions in the format v1.2.3. Doing so triggers a tagged release to Docker Hub.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants