Spotter-Cluster/Spotter-VM
2
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Make CKAN SPOC-compatible, cont'd.

Browse Source
This commit is contained in:
Disassembler 2020-03-13 20:19:26 +01:00
parent 923b794cc6
commit 368a060a5e
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lxc-apps/ckan/app
View File

@ -21,27 +21,27 @@
} }
}, },
"ckan-datapusher": { "ckan-datapusher": {
"image": "ckan-datapusher_0.0.13-190620", "image": "ckan-datapusher_0.0.15-200313",
"mounts": { "mounts": {
"ckan/datapusher_conf": "etc/ckan-datapusher", "ckan/datapusher_conf": "etc/ckan-datapusher",
"ckan/datapusher_data": "srv/ckan-datapusher/data" "ckan/datapusher_data": "srv/ckan-datapusher/data"
} }
}, },
"ckan-redis": { "ckan-redis": {
"image": "redis_4.0.12-190620", "image": "redis_5.0.7-200313",
"mounts": { "mounts": {
"ckan/redis_conf/redis.conf": "etc/redis.conf:file", "ckan/redis_conf/redis.conf": "etc/redis.conf:file",
"ckan/redis_data": "var/lib/redis" "ckan/redis_data": "var/lib/redis"
} }
}, },
"ckan-solr": { "ckan-solr": {
"image": "solr6_6.5.1-190620", "image": "solr6_6.5.1-200313",
"mounts": { "mounts": {
"ckan/solr_data": "var/lib/solr" "ckan/solr_data": "var/lib/solr"
} }
}, },
"ckan-postgres": { "ckan-postgres": {
"image": "postgis_2.5.1-190620", "image": "postgis_3.0.0-200313",
"mounts": { "mounts": {
"ckan/postgres_data": "var/lib/postgresql" "ckan/postgres_data": "var/lib/postgresql"
} }

4
lxc-apps/ckan/ckan-datapusher.image
View File

@ -1,4 +1,4 @@
IMAGE ckan-datapusher_0.0.13-190620 IMAGE ckan-datapusher_0.0.15-200313
FROM alpine3.11-python2.7_2.7.16-200313 FROM alpine3.11-python2.7_2.7.16-200313
RUN EOF RUN EOF
@ -12,7 +12,7 @@ RUN EOF
mkdir -p /srv/ckan-datapusher mkdir -p /srv/ckan-datapusher
cd /srv/ckan-datapusher cd /srv/ckan-datapusher
pip install -U setuptools pip install -U setuptools
pip install -e 'git+https://github.com/ckan/datapusher.git#egg=datapusher' pip install -e 'git+https://github.com/ckan/datapusher.git@3926f14a5fd2143cfa005eede6588b35c4a07513#egg=datapusher'
# Create OS user # Create OS user
addgroup -S -g 8080 ckandp addgroup -S -g 8080 ckandp

2
lxc-apps/ckan/ckan.image
View File

@ -14,7 +14,7 @@ RUN EOF
pip install -U setuptools pip install -U setuptools
pip install flask-debugtoolbar pip install flask-debugtoolbar
pip install -e 'git+https://github.com/ckan/ckan.git@8e1cc60b2fa11da6843051678b7ee2cc08c2a7a9#egg=ckan' pip install -e 'git+https://github.com/ckan/ckan.git@8e1cc60b2fa11da6843051678b7ee2cc08c2a7a9#egg=ckan'
pip install -r /srv/ckan/src/ckan/requirements-py2.txt pip install -r /srv/ckan/src/ckan/requirements.txt
# Install CKAN extensions # Install CKAN extensions
pip install -e 'git+https://github.com/ckan/ckanext-basiccharts#egg=ckanext_basiccharts' pip install -e 'git+https://github.com/ckan/ckanext-basiccharts#egg=ckanext_basiccharts'