Skip to content

Port v1.0 update#38

Merged
ouranos merged 10 commits intomaestrano:2.3-v2.0from
ouranos:feature/port-1.0-update
Jun 3, 2019
Merged

Port v1.0 update#38
ouranos merged 10 commits intomaestrano:2.3-v2.0from
ouranos:feature/port-1.0-update

Conversation

@ouranos
Copy link
Copy Markdown
Contributor

@ouranos ouranos commented May 23, 2019

The 2.0 branch is only used by the reconciliation engine and needed to be updated to support KMS encrypted S3 buckets (see #37).
I took the opportunity to also port some updates done in the 1.0 branch (mainly to fix the docker build)

Main changes:

Since we're now using stretch, I was able to make the following changes:

  • Remove external MySQL repository
  • Use packaged python3.5 and install pip3

ouranos and others added 10 commits November 8, 2018 12:56
Use 2.3-stretch as the base image to be consistent with the other ruby
versions.
We're also using stretch to run our tests on CirleCI.
Requests specifying Server Side Encryption with AWS KMS managed keys
require AWS Signature Version 4.
As we're now using stretch as base image, Python 3.5 is already
installed so we only need to install pip3 and python3-dev
Comment thread .travis.yml
script:
# Build docker image
- cd 2.3/
- docker build -t maestrano/web-ruby:travis . > /dev/null 2>&1
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

can you plz explain why this isn't required any more?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

@cesar-tonnoir looks like this was removed so we can see the docker build logs, also the 2>&1 was masking the exit code 🤔- see 43f2e36

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes exactly. I removed it to be able to see the docker logs when debugging and decided to keep it.

  • > /dev/null redirects stdout to `/dev/null/
  • 2>&1 redirects stderr to where we're redirecting stdout

@ouranos ouranos merged commit 3f114d2 into maestrano:2.3-v2.0 Jun 3, 2019
@ouranos ouranos deleted the feature/port-1.0-update branch June 3, 2019 23:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants