Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

feat: Add docker config #4

Merged
merged 1 commit into from
May 15, 2018
Merged

feat: Add docker config #4

merged 1 commit into from
May 15, 2018

Conversation

jrconlin
Copy link
Member

  • Adds docker-compose commands
  • Fixes migration to be more "existing db friendly"
  • adds Cargo.lock because binary

@jrconlin jrconlin force-pushed the docker branch 2 times, most recently from ee02fe2 to 6fa34e6 Compare April 27, 2018 18:41
@jrconlin jrconlin changed the title WIP: Add docker config feat: Add docker config Apr 27, 2018
pjenvey
pjenvey suggested changes May 4, 2018
View reviewed changes
.circleci/config.yml Outdated
- image: docker:17.12.1-ce
working_directory: /dockerflow
steps:
- checkout
Copy link
Member

Choose a reason for hiding this comment

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

you'll want to include this to avoid problems on circleci: mozilla-services/megaphone@f81d556

README.md Outdated

Because I'm horribly creative and because this is a WIP, I use "`test:test@localhost/pushbox`".
This is not recommended for production use. You can set your preferred
This is not recommended for production use. You can set your preferred
MySQL access credential information as "database_url" in the `Rocket.toml`
settings file (See [Rocket Config](https://rocket.rs/guide/configuration/#rockettoml)
information.)

3) Run the MySQL migrations `up.sql` file located in `./migrations/*/up.sql`
Copy link
Member

Choose a reason for hiding this comment

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

can kill this step now that the embedded_migrations handles it

src/error.rs Outdated
@@ -100,6 +100,12 @@ impl From<Context<HandlerErrorKind>> for HandlerError {
}
}

impl From<Error> for HandlerError {
Copy link
Member

@pjenvey pjenvey May 4, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

This conversion from any failure Error is maybe too lax for HandlerError, I think

If you return a regular Result instead of HandlerResult from Server::start (it's not a rocket Handler anyway so it doesn't make sense there) this conversion wouldn't be needed

@jrconlin jrconlin force-pushed the docker branch 4 times, most recently from 917c336 to 3fdf021 Compare May 4, 2018 22:52
@jrconlin
feat: Add docker config
10cf2ab 
* Adds docker-compose commands
* Fixes migration to be more "existing db friendly"
* adds Cargo.lock because binary
@jrconlin jrconlin merged commit a9f2a59 into master May 15, 2018
@jrconlin jrconlin deleted the docker branch May 21, 2018 16:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@pjenvey pjenvey pjenvey approved these changes

@bbangert bbangert bbangert approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jrconlin @pjenvey @bbangert