[ckan-changes] [ckan/ckan] a54406: Fix for https://github.com/ckan/ckan/issues/3569

Tue Jun 27 12:48:19 UTC 2017

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: a544068963753d71bad890eba65ded49916c69c7
      https://github.com/ckan/ckan/commit/a544068963753d71bad890eba65ded49916c69c7
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M Dockerfile
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  Fix for https://github.com/ckan/ckan/issues/3569
Apply environment variables, always; no need to use ckan.ini (see https://github.com/ckan/ckan/pull/3572#issuecomment-303596016)
Allow connection to postgres via docker instead of coming via external port mapping
Includes a workaround for https://github.com/ckan/ckan/issues/3594
One remaining problem: the redis URL does not make it into CKAN despite using correct environment variable(?). Hence WIP label; but this will commit will already improve those suffering from completely broken docker-compose functionality.


  Commit: 49512cad3810df6cf5051cef90b397d10fb44885
      https://github.com/ckan/ckan/commit/49512cad3810df6cf5051cef90b397d10fb44885
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M CHANGELOG.rst
    M ckanext/datastore/helpers.py
    A ckanext/datatablesview/__init__.py
    A ckanext/datatablesview/controller.py
    A ckanext/datatablesview/plugin.py
    A ckanext/datatablesview/public/datatablesview.js
    A ckanext/datatablesview/public/resource.config
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/css/bootstrap-theme.css
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/css/bootstrap-theme.css.map
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/css/bootstrap.css
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/css/bootstrap.css.map
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.eot
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.svg
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff2
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/js/bootstrap.js
    A ckanext/datatablesview/public/vendor/Bootstrap-3.3.7/js/npm.js
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/css/buttons.bootstrap.css
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/css/buttons.dataTables.css
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/css/buttons.foundation.css
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/css/buttons.jqueryui.css
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/css/buttons.semanticui.css
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/css/common.scss
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/css/mixins.scss
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/js/buttons.bootstrap.js
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/js/buttons.colVis.js
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/js/buttons.foundation.js
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/js/buttons.jqueryui.js
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/js/buttons.semanticui.js
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/js/dataTables.buttons.js
    A ckanext/datatablesview/public/vendor/Buttons-1.3.1/swf/flashExport.swf
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/css/dataTables.bootstrap.css
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/css/dataTables.foundation.css
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/css/dataTables.jqueryui.css
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/css/dataTables.semanticui.css
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/css/jquery.dataTables.css
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/css/jquery.dataTables_themeroller.css
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/images/sort_asc.png
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/images/sort_asc_disabled.png
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/images/sort_both.png
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/images/sort_desc.png
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/images/sort_desc_disabled.png
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/js/dataTables.bootstrap.js
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/js/dataTables.foundation.js
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/js/dataTables.jqueryui.js
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/js/dataTables.semanticui.js
    A ckanext/datatablesview/public/vendor/DataTables-1.10.15/js/jquery.dataTables.js
    A ckanext/datatablesview/public/vendor/FixedColumns-3.2.2/css/fixedColumns.bootstrap.css
    A ckanext/datatablesview/public/vendor/FixedColumns-3.2.2/css/fixedColumns.dataTables.css
    A ckanext/datatablesview/public/vendor/FixedColumns-3.2.2/css/fixedColumns.foundation.css
    A ckanext/datatablesview/public/vendor/FixedColumns-3.2.2/css/fixedColumns.jqueryui.css
    A ckanext/datatablesview/public/vendor/FixedColumns-3.2.2/js/dataTables.fixedColumns.js
    A ckanext/datatablesview/public/vendor/FixedHeader-3.1.2/css/fixedHeader.bootstrap.css
    A ckanext/datatablesview/public/vendor/FixedHeader-3.1.2/css/fixedHeader.dataTables.css
    A ckanext/datatablesview/public/vendor/FixedHeader-3.1.2/css/fixedHeader.foundation.css
    A ckanext/datatablesview/public/vendor/FixedHeader-3.1.2/css/fixedHeader.jqueryui.css
    A ckanext/datatablesview/public/vendor/FixedHeader-3.1.2/js/dataTables.fixedHeader.js
    A ckanext/datatablesview/public/vendor/KeyTable-2.2.1/css/keyTable.bootstrap.css
    A ckanext/datatablesview/public/vendor/KeyTable-2.2.1/css/keyTable.dataTables.css
    A ckanext/datatablesview/public/vendor/KeyTable-2.2.1/css/keyTable.foundation.css
    A ckanext/datatablesview/public/vendor/KeyTable-2.2.1/css/keyTable.jqueryui.css
    A ckanext/datatablesview/public/vendor/KeyTable-2.2.1/css/keyTable.semanticui.css
    A ckanext/datatablesview/public/vendor/KeyTable-2.2.1/js/dataTables.keyTable.js
    A ckanext/datatablesview/public/vendor/Responsive-2.1.1/css/responsive.bootstrap.css
    A ckanext/datatablesview/public/vendor/Responsive-2.1.1/css/responsive.dataTables.css
    A ckanext/datatablesview/public/vendor/Responsive-2.1.1/css/responsive.foundation.css
    A ckanext/datatablesview/public/vendor/Responsive-2.1.1/css/responsive.jqueryui.css
    A ckanext/datatablesview/public/vendor/Responsive-2.1.1/js/dataTables.responsive.js
    A ckanext/datatablesview/public/vendor/Responsive-2.1.1/js/responsive.bootstrap.js
    A ckanext/datatablesview/public/vendor/Responsive-2.1.1/js/responsive.foundation.js
    A ckanext/datatablesview/public/vendor/Responsive-2.1.1/js/responsive.jqueryui.js
    A ckanext/datatablesview/public/vendor/Select-1.2.2/css/select.bootstrap.css
    A ckanext/datatablesview/public/vendor/Select-1.2.2/css/select.dataTables.css
    A ckanext/datatablesview/public/vendor/Select-1.2.2/css/select.foundation.css
    A ckanext/datatablesview/public/vendor/Select-1.2.2/css/select.jqueryui.css
    A ckanext/datatablesview/public/vendor/Select-1.2.2/css/select.semanticui.css
    A ckanext/datatablesview/public/vendor/Select-1.2.2/js/dataTables.select.js
    A ckanext/datatablesview/public/vendor/datatables.css
    A ckanext/datatablesview/public/vendor/datatables.js
    A ckanext/datatablesview/templates/datatables/datatables_form.html
    A ckanext/datatablesview/templates/datatables/datatables_view.html
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/ckan/ckan


  Commit: 3c721a7ce94faaff498c00a3dde1a2a616c316c7
      https://github.com/ckan/ckan/commit/3c721a7ce94faaff498c00a3dde1a2a616c316c7
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Test for Redis AFTER we've loaded config from environment variables


  Commit: 466fe093e891f672516cc30714f6a363e3364526
      https://github.com/ckan/ckan/commit/466fe093e891f672516cc30714f6a363e3364526
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Reduce environment variables to those needed
I finally understood what's going on here: linked containers really do lead to environment variables as implied by the entrypoint script. However there is a difference in behaviour betweenstandard linking of containers and docker-compose networking. With docker, we get the IP addresses, but to access accompanying containers in docker-compose we have to use the container names. Therefore in principle we don't need to set all these variables, but we do need to override the host name ones.


  Commit: 8a91622ed52905c957fb5e1bee0b4f93fb6313c4
      https://github.com/ckan/ckan/commit/8a91622ed52905c957fb5e1bee0b4f93fb6313c4
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Add a comment to advise on start-order problem


  Commit: 7f61a49d3002c1d5c80d27d920d92910f6bf44b1
      https://github.com/ckan/ckan/commit/7f61a49d3002c1d5c80d27d920d92910f6bf44b1
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M contrib/docker/ckan-entrypoint.sh

  Log Message:
  -----------
  Attempt to resolve "postgres not ready yet" issue


  Commit: 8890ebee92719a36ff5e7fd0ca4893c6806a1ac1
      https://github.com/ckan/ckan/commit/8890ebee92719a36ff5e7fd0ca4893c6806a1ac1
  Author: Ian Ward <ian at excess.org>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M Dockerfile
    M ckan/config/environment.py
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  Merge pull request #3596 from mattfullerton/master

docker-compose without exposing ports - working version


Compare: https://github.com/ckan/ckan/compare/f22687761880...8890ebee9271