Merge pull request #163 from kanisterio/sync

Docs Update, Kando add endpoint to Provider Config, Postgres Docker install curl
kanisterio · Mar 12, 2019 · 697868c · 697868c
2 parents 65c32f5 + 77797a7
commit 697868c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 10 deletions.
diff --git a/docker/postgres-kanister-tools/Dockerfile b/docker/postgres-kanister-tools/Dockerfile
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 USER root
 
-RUN apk -v --update add --no-cache python py-pip groff less && \
+RUN apk -v --update add --no-cache curl python py-pip groff less && \
     pip install --upgrade pip && \
     pip install --upgrade awscli && \
     apk -v --purge del py-pip && \

diff --git a/docs/_static/custom_new.css b/docs/_static/custom_new.css
@@ -0,0 +1,33 @@
+.wy-nav-content {
+    max-width: 1200px !important;
+}
+
+.wy-side-nav-search {
+    background-color: #daebf1;
+}
+
+.wy-side-nav-search>div.version,
+.wy-side-nav-search>a,
+.wy-side-nav-search .wy-dropdown>a {
+    color: #555;
+}
+
+.wy-table-responsive table {
+    width: 100%;
+}
+
+.wy-table-responsive table td,.wy-table-responsive table th {
+    white-space: normal;
+}
+
+.wy-table-responsive table colgroup col {
+    width: auto;
+}
+
+.highlight-yaml span.l.l-Scalar.l-Scalar-Plain {
+    color: #E74C3C;
+}
+
+.highlight-yaml span.p.p-Indicator + span.l.l-Scalar.l-Scalar-Plain {
+    color: inherit;
+}
diff --git a/docs/_static/kanister-logo.png b/docs/_static/kanister-logo.png
diff --git a/docs/conf.py b/docs/conf.py
@@ -85,7 +85,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'alabaster'
+html_theme = 'sphinx_rtd_theme'
 
 html_sidebars = {
     '**': [
@@ -100,12 +100,11 @@
 # documentation.
 #
 html_theme_options = {
-    'show_powered_by': 'false',
-    'description': '',
-    'logo': 'kanister.svg',
-    'logo_name': 'Kanister Logo'
+    'canonical_url': 'https://docs.kanister.io',
 }
 
+html_logo = '_static/kanister-logo.png'
+
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
@@ -118,7 +117,7 @@
 html_favicon = "_static/favicon.ico"
 
 html_context = {
-    'css_files': ['_static/custom.css'],
+    'css_files': ['_static/custom_new.css'],
 }
 
 # -- Options for HTMLHelp output ------------------------------------------

diff --git a/docs/index.rst b/docs/index.rst
@@ -6,15 +6,19 @@
 Kanister: Application-Specific Data Management
 **********************************************
 
+.. image:: https://goreportcard.com/badge/github.com/kanisterio/kanister
+   :target: https://goreportcard.com/report/github.com/kanisterio/kanister
+.. image:: https://travis-ci.org/kanisterio/kanister.svg?branch=master
+   :target: https://travis-ci.org/kanisterio/kanister
+
 Kanister allows domain experts to capture application-specific data management
 tasks in Blueprints which can be easily shared and extended. The framework takes
 care of the tedious details around execution on Kubernetes and presents a
 homogeneous operational experience across applications at scale.
 
 .. toctree::
-   :hidden:
+   :maxdepth: 2
 
-   self
    overview
    usage
    architecture

diff --git a/pkg/location/location.go b/pkg/location/location.go
@@ -105,7 +105,9 @@ func getProviderType(lType crv1alpha1.LocationType) (objectstore.ProviderType, e
 
 func getBucket(ctx context.Context, pType objectstore.ProviderType, profile param.Profile) (objectstore.Bucket, error) {
 	pc := objectstore.ProviderConfig{
-		Type: pType,
+		Type:          pType,
+		Endpoint:      profile.Location.Endpoint,
+		SkipSSLVerify: profile.SkipSSLVerify,
 	}
 	secret, err := getOSSecret(pType, profile.Credential)
 	if err != nil {