Commit Graph

200 Commits

Author SHA1 Message Date
Blagoja Stojkoski af186761bd
Merge pull request #58 from Locutus66/patch-1
check_solr_connection bug fix
2022-01-20 16:18:41 +01:00
Blagoja Stojkoski aaba1d739b
Merge branch 'master' into patch-1 2022-01-20 16:12:46 +01:00
Blagoja Stojkoski 1b961243c8
Merge pull request #63 from keitaroinc/issue-57-datapusher-fix
Pins alpine 3.13 as the datapusher base image
2022-01-20 16:00:43 +01:00
Blagoja Stojkoski 1281d67d21
Merge branch 'master' into patch-1 2022-01-20 15:54:03 +01:00
blagoja.stojkoski 07919aad77 * base image is now alpine:3.13 which uses python 3.8 by default 2022-01-20 15:44:54 +01:00
Blagoja Stojkoski a54276646b
Merge pull request #61 from keitaroinc/patch-releases
CKAN patch releases 2.8.10 2.9.5
2022-01-20 15:38:50 +01:00
blagoja.stojkoski a9abd4b36b * reverts to alpine 3.13 and native python 3.8 package
* downgrades setuptools to 44.1.0 to fix ckan install issues on Ubuntu
* fixes solrconfig xml for CKAN 2.7
2022-01-20 15:21:59 +01:00
blagoja.stojkoski bf3a029937 CKAN patch releases 2.8.10 2.9.5 2022-01-17 19:31:00 +01:00
Sam Mueller 46ab021d9d
check_solr_connection bug fix
If the ResponseHeader contains "zkConnected": false, your deployment will throw a "NameError: name 'false' is not defined" without this proposed line I added.
2021-12-05 19:09:00 -05:00
Blagoja Stojkoski 2957733f9d
Merge pull request #56 from keitaroinc/fix-examples
Pin python version to python 3.8 in examples and readme
2021-09-22 18:23:13 +02:00
Marko Bocevski 02870cdb99
Pin python version to python 3.8 in examples and readme 2021-09-22 18:16:30 +02:00
Blagoja Stojkoski dbc534ac72
Merge pull request #54 from keitaroinc/patch-releases
New CKAN patch releases 2.9.4, 2.8.9, 2.7.12
2021-09-22 17:55:15 +02:00
Marko Bocevski 4ebef5c6d9
Pin python version to python 3.8 2021-09-22 17:11:27 +02:00
Marko Bocevski 6b9c96ceb9
New CKAN patch releases 2.9.4, 2.8.9, 2.7.12 2021-09-16 15:19:37 +02:00
Blagoja Stojkoski 5fe9bff738
Merge pull request #51 from keitaroinc/uwsgi-update
Update greenlet and gevent versions
2021-05-27 16:51:30 +02:00
blagoja.stojkoski c8d7c4af2f Merge branch 'master' into uwsgi-update 2021-05-27 15:21:27 +02:00
Blagoja Stojkoski fa62c30b11
updating s3filestore example to use CKAN 2.9 (#52) 2021-05-20 11:34:55 +02:00
Marko Bocevski 165419d767
Update greenlet and gevent versions, pin alpine version to specific minor revision 2021-05-19 13:31:52 +02:00
Marko Bocevski a9090c9793
CKAN patch releases 2.7.11 2.8.8 2.9.3 (#50)
* CKAN patch releases 2.7.11 2.8.8 2.9.3

* Update solrconfig filenames

* Update harvest example default CKAN version to 2.9.3

* Fix symbolic link
2021-05-19 13:01:46 +02:00
Blagoja Stojkoski 7a40f4ad8b
Merge pull request #49 from keitaroinc/pgdata
Add PGDATA env var to db service in compose
2021-05-10 15:38:12 +02:00
Marko Bocevski 896de5a40f
Move PGDATA env var to environment section 2021-05-07 06:03:06 +02:00
Marko Bocevski c51d5eb6bf
Add PGDATA env var to db service in compose 2021-05-06 05:52:29 +02:00
Dushko Bogdanovski 48e67ad82a
Merge pull request #47 from keitaroinc/license_copyright_notices
add license and copyright notices
2021-04-09 12:46:39 +02:00
gregoxx 3d957c35d7 add license and copyright noticesa 2021-04-01 09:45:24 +01:00
Blagoja Stojkoski 64d4d5f1fb
Merge pull request #46 from keitaroinc/fix-pip
Fix pip url for python 2.7
2021-03-24 18:40:36 +01:00
Marko Bocevski 302448080e
Pin pip to 20.3.3 and bump focal image version 2021-03-24 17:56:32 +01:00
Marko Bocevski 42f95f2f50
Merge branch 'master' of github.com:keitaroinc/docker-ckan into fix-pip 2021-03-24 17:44:41 +01:00
Stefanie Taepke 85e838038f
Install rust as cryptography-requirement (#44)
* install rust as cryptography-requirement

Installing cryptography fails with “This package requires Rust >=1.41.0.” if rust is not installed

* install rust with cargo as cryptography-requirement
2021-03-24 17:42:50 +01:00
Marko Bocevski 5b2c0b95a6
Fix pip url for python 2.7 2021-03-24 17:40:15 +01:00
Marko Bocevski af4a5353a4
Fix ckan config-tool command in README 2021-03-12 17:36:12 +01:00
Blagoja Stojkoski 21c891865d
Patches for connecting to Azure PSQL (#42)
* * patches in code to handle user@host format in the Azure PSQL connection string
* adds code for handling new connection string format in prerun.py

* * fixes path in the postgres username patch
* cleans up prerun.py imports
2021-02-18 15:02:23 +01:00
Blagoja Stojkoski 08c10f2dc6
fixes resource replace upload (#41)
* fixes resource replace upload

* Add rust and cargo in order to build cryptography

Co-authored-by: Marko Bocevski <marko.bocevski@keitaro.com>
2021-02-18 14:36:39 +01:00
Dushko Bogdanovski e4ab5814d2
Merge pull request #39 from keitaroinc/new-ckan-patches
New CKAN patches 2.7.10, 2.8.7 and 2.9.2
2021-02-10 12:55:56 +01:00
Marko Bocevski 69ec6e65b6 New CKAN patches 2.7.10, 2.8.7 and 2.9.2 2021-02-03 19:03:54 +01:00
Blagoja Stojkoski c1e3181446
Merge pull request #38 from keitaroinc/pip-pin
Pin the version of pip since pip dropped python2 support in 21.0
2021-01-25 14:47:24 +01:00
Marko Bocevski ec778aba87 Pin pip to 20.3.3 due to issue with 20.3.4 2021-01-25 14:22:34 +01:00
Marko Bocevski 2f9500cda7 Pin the version of pip since pip dropped python2 support in 21.0 2021-01-25 14:10:23 +01:00
Blagoja Stojkoski a5416fb71f
Workflow rename and badge (#37)
* fixes workflow typos

* badge test

* renamed build action and added badge
2021-01-20 15:44:37 +01:00
Blagoja Stojkoski d21c15d387
Merge pull request #36 from keitaroinc/alpine-upgrade
Upgrade alpine to 3.13, lint Dockerfiles and github actions
2021-01-20 12:34:03 +01:00
Marko Bocevski d4a86326d8 Fix caching of docker layers 2021-01-16 02:57:15 +01:00
Marko Bocevski 8940703616 Add automatic push to GHCR and dockerhub on push to master and set GHCR default 2021-01-16 02:20:01 +01:00
Marko Bocevski 73063ff233 Use IMAGE_TAG to set the docker image tag 2021-01-16 01:48:30 +01:00
Marko Bocevski b33fd5ebe2 Add workflow for pull requests on master 2021-01-16 01:01:40 +01:00
Marko Bocevski 8e92ed04db Lint Dockerfiles 2021-01-15 22:52:56 +01:00
Marko Bocevski fe1c05a350 Uprade to alpine 3.13 2021-01-15 20:19:11 +01:00
Marko Bocevski 4a12991bc7
Merge pull request #35 from keitaroinc/exit-condition
Exit CKAN startup if prerun exits
2020-12-22 11:34:31 +01:00
Marko Bocevski 7aaa02a87e Exit CKAN startup if prerun exits 2020-12-22 00:15:16 +01:00
Blagoja Stojkoski 8cc21c3b66
Merge pull request #34 from keitaroinc/alias-ckan
CKAN alias command for 2.7 and 2.8 so it can be forward-compatible with 2.9
2020-12-17 16:39:23 +01:00
Marko Bocevski b593510f53 mend
Reorder the argument list for the ckan alias command
2020-12-16 20:48:57 +01:00
Marko Bocevski 9247cb4acb Reorder the argument list for the ckan alias command 2020-12-16 20:43:36 +01:00