Commit Graph

60 Commits

Author SHA1 Message Date
blagoja.stojkoski 27af03db6f adds logging arguments to uwsgi options 2020-09-04 14:15:14 +02:00
Marko Bocevski 7513f23900
Merge pull request #20 from keitaroinc/s3filestore-update
changes okfn s3filestore extension for the keitaro one
2020-08-24 08:04:05 +02:00
Marko Bocevski d802214fb4
Merge pull request #18 from keitaroinc/fix-startckan
IF condition was always true, so failed prerun.py was not handled properly
2020-08-24 08:03:52 +02:00
Marko Bocevski 841cbadc0b
Merge pull request #19 from keitaroinc/docker-entrypoint-fix
fixes wrong location check and call for the docker entrypoint
2020-08-24 08:03:04 +02:00
blagoja.stojkoski a1d25d05a5 changes okfn s3filestore extension for the keitaro one 2020-08-21 14:59:40 +02:00
blagoja.stojkoski ae70de6fdd fixes wrong location check and call for the docker entrypoint 2020-08-21 12:18:23 +02:00
Dragan Bocevski e865d2c89d The if condition was always true, so failed prerun.py was not handled properly 2020-06-17 15:01:29 +02:00
Marko Bocevski 5b2f5cef9a Use gevent early monkey patch due to upstream issues 2020-06-11 10:30:11 +02:00
Marko Bocevski 73cb0d0ce2
Merge pull request #17 from keitaroinc/prerun-fixes
urllib2 and s3filestore fixes
2020-06-11 09:35:11 +02:00
blagoja.stojkoski 9829cafc86 Fixes urllib2 issues
Adds s3filestore requirements in Dockerfile
2020-06-09 13:33:39 +02:00
Marko Bocevski ee215d0db5 First run docker entrypoint scripts before running prerun 2020-06-08 11:45:16 +02:00
Marko Bocevski 51d6dde825 Modular CKAN build and default extensions 2020-06-03 09:53:14 +02:00
Marko Bocevski 1bf976578b Upgrade to python3 to support up and coming CKAN 2.9 version 2020-02-17 15:30:52 +01:00
Marko Bocevski b037fe0199
Merge pull request #16 from shevron/patch-1
Fix check for `docker-entrypoint.d`
2019-10-03 11:31:53 +02:00
Shahar Evron f80c60f835
Fix check for `docker-entrypoint.d`
The entrypoint script checks for the existence of `docker-entrypoint.d` in the CWD, but then run the scripts in `/docker-entrypoint.d`. 

This causes the scripts to either not run at all or fail if an inheriting image changes the `WORKDIR`. 

This fix makes sure the directory is always expected in the filesystem root.
2019-10-03 12:00:34 +03:00
Ilche Bedelovski b726c3a1c6
Merge pull request #12 from keitaroinc/add-initial-docs
Create Readme.md
2019-03-08 14:30:25 +01:00
Zoran Pandovski d76095408b
Create Readme.md 2019-03-08 14:27:11 +01:00
Ilche Bedelovski e33f49843b
Merge pull request #10 from keitaroinc/datastore-set-permissions
Datastore creating at prerun with set permissions
2019-02-20 10:19:03 +01:00
Konstantin Sivakov 79c28db2dc Access denied bug fix 2019-02-19 11:02:17 +01:00
Konstantin Sivakov 1d5700b842 Datastore creating at prerun with set permissions 2019-02-18 22:51:35 +01:00
DraganBocevski 6f45059c03
Merge pull request #9 from keitaroinc/nofilestore
filestore is core plugin, no need to include it as external plugin
2019-02-09 14:51:14 +01:00
Dragan Bocevski 613ce58dfa filestore is core plugin, no need to include it as external plugin 2019-02-09 14:48:56 +01:00
DraganBocevski 0c3ea651a3
added filestore plugin
Needed for upload functionality
2019-02-08 18:30:53 +01:00
Vladimir Vojneski 6aee14e1a4
Merge pull request #8 from keitaroinc/2.8.2
CKAN docker image for 2.8.2
2019-02-06 19:34:10 +01:00
Dragan Bocevski b84427ec83 Add pcre to main stage and change order of default CKAN plugins 2019-01-10 23:25:29 +01:00
Dragan Bocevski e47474de97 Update SOLR check in prerun 2019-01-10 23:25:02 +01:00
Dragan Bocevski 754f201942 ckan v2.8.2 2019-01-04 13:46:03 +01:00
Marko Bocevski ffe0eae03c
Merge pull request #3 from amercader/bash-2.8
Install bash in base image as it's required by the start_ckan.sh script
2018-08-23 17:56:39 +02:00
Marko Bocevski 26f80c9e2c
Merge pull request #4 from amercader/better-extra-scripts
Provide a better way to run extra scripts from children images
2018-08-23 17:56:10 +02:00
Marko Bocevski 22b024fed5
Merge branch 'master' into better-extra-scripts 2018-08-23 17:56:02 +02:00
Marko Bocevski 374a347be2
Merge pull request #5 from amercader/sysadmin-create
Fix sysadmin creation on 2.8
2018-08-23 17:52:34 +02:00
Marko Bocevski c625e47e89
Merge pull request #6 from amercader/uwsgi-options
Remove uWSGI --plugins option
2018-08-23 17:50:24 +02:00
amercader 6bc2cae8d2 Remove uWSGI --plugins options
As we are now installing uwsgi via pip these plugins are shipped as part
of the code and there's no need to load the plugin, otherwise you get
these alarming (but harmless) messages:

open("./http_plugin.so"): No such file or directory [core/utils.c line
3721]
 !!! UNABLE to
load uWSGI plugin: Error loading shared library ./http_plugin.so: No
such file or directory !!!

open("./python_plugin.so"): No such file or directory [core/utils.c line
3721]
 !!! UNABLE to
load uWSGI plugin: Error loading shared library ./python_plugin.so: No
such file or directory !!!

open("./gevent_plugin.so"): No such file or directory [core/utils.c line
3721]
 !!! UNABLE to
load uWSGI plugin: Error loading shared library ./gevent_plugin.so: No
such file or directory !!!
2018-08-13 15:23:47 +02:00
Pance Ribarski 2e24eeae19 fix calling extra-scripts.sh 2018-08-10 11:10:50 +02:00
amercader d643d6eb59 Fix sysadmin creation on 2.8
Whitespace changes meant that the check to see if the sysadmin exists no
longer works on CKAN 2.8.
2018-08-08 15:10:21 +02:00
amercader c0e229197e Provide a better way to run extra scripts from children images
The current way requires an `extra_scripts.sh` file to be present in on
children images.

With this approach a new folder `/docker-entrypoint.d` is created when
an image extends this one. The children image can then copy any shell or
python file that they want executed at the start of container in that
directory.

For instance consider the following setup:

```
cloud-mysite
├── .env
├── docker-entrypoint.d
│   └── 00_setup_validation.sh
│   └── 01_check_users.py
└── Dockerfile
```

The `Dockerfile` will look like:

```
FROM keitaro/ckan:2.8.1

[...]

COPY docker-entrypoint.d/* /docker-entrypoint.d/
```

The files will be executed in alphabetical order.
2018-08-07 11:58:04 +02:00
amercader 3f43bca349 Install bash in base image as it's required by the start_ckan.sh script 2018-08-02 10:34:55 +02:00
Atanas Kostovski 59e403a760 Update to ckan 2.8.1 and alpine 3.8 2018-07-30 14:20:13 +02:00
Pance Ribarski 1d4d2759a1 added extra_scripts.sh before ckan starts 2018-06-29 18:53:51 +02:00
Marko Bocevski 42d17a659d Docker for ckan 2.8.0 2018-05-22 14:53:09 +02:00
Marko Bocevski 5f8d060fc3 Move to a multi-stage docker setup 2017-10-18 22:10:19 +02:00
Marko Bocevski 237ea992f2 Migrate from gunicorn to uwsgi and remove nginx dependency for http basicauth 2017-05-09 23:45:54 +02:00
Marko Bocevski fa5a3603ba Add health check to docker image 2017-04-07 09:34:40 +02:00
Marko Bocevski 353c88d473 Pass host and x-forwarded-for headers when using nginx reverse proxy 2017-04-07 09:10:07 +02:00
Marko Bocevski db0b33437d Change docker layout and setup install for CKAN 2.6.2 with password protect option 2017-04-06 12:57:37 +02:00
Jovanka Gulicoska 0ebeaad076 Remove py-gevent from apk add 2017-04-04 11:07:13 +02:00
Petar Efnushev 4cdecebe6e Start CKAN using gevent for concurrency 2017-04-04 09:05:13 +02:00
Petar Efnushev 12f574bc18 Add dependency for gevent 2017-04-04 09:04:18 +02:00
Marko Bocevski c83b8bebf3 Upgrade to CKAN 2.6.0 2017-01-27 10:51:02 +01:00
Marko Bocevski 87226ae754 Update to 2.5.3 2016-11-07 12:15:50 +01:00