Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.11 xloader and solr fix #148

Merged
merged 3 commits into from
Dec 23, 2024
Merged

2.11 xloader and solr fix #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a015da2
Change README
KirilPoposki98 Dec 23, 2024
b39966b
Change dockerfile of xloader and solr
KirilPoposki98 Dec 23, 2024
3613a5a
Fix duplicate in readme
KirilPoposki98 Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@ Directory layout:
## Running CKAN using docker-compose
To start CKAN using docker-compose, simply change into the *compose* directory and run
```sh
cd compose/2.9
docker-compose build
docker-compose up
make start
```
This will build the docker images and start the necesaary containers and with
```sh
make prune
```
the containers are deleted along with the volume
Check if CKAN was succesfuly started on http://localhost:5000.

### Configuration
Expand Down
4 changes: 3 additions & 1 deletion compose/solr/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ FROM solr:${SOLR_VERSION:-9}
EXPOSE 8983

ARG CKAN_BRANCH
RUN echo ${CKAN_BRANCH} | sed 's/\-xloader//g' > /tmp/version

ENV SOLR_CONFIG_DIR="/opt/solr/server/solr/configsets"
ENV SOLR_SCHEMA_FILE="$SOLR_CONFIG_DIR/ckan/conf/managed-schema"
Expand All @@ -15,7 +16,8 @@ USER root
RUN cp -R $SOLR_CONFIG_DIR/_default $SOLR_CONFIG_DIR/ckan

# Update the schema
ADD https://raw.githubusercontent.com/ckan/ckan/$CKAN_BRANCH/ckan/config/solr/schema.xml $SOLR_SCHEMA_FILE
RUN apt install curl -y
RUN curl https://raw.githubusercontent.com/ckan/ckan/`cat /tmp/version`/ckan/config/solr/schema.xml -o $SOLR_SCHEMA_FILE
RUN chmod 644 $SOLR_SCHEMA_FILE

USER solr
Expand Down
2 changes: 1 addition & 1 deletion images/ckan/2.11/Dockerfile.xloader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ENV CKAN_DIR=${SRC_DIR}/ckan
ENV DATA_DIR=/srv/app/data
ENV PIP_SRC=${SRC_DIR}
ENV CKAN_SITE_URL=http://localhost:5000
ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore xloader
ENV CKAN__PLUGINS envvars datastore xloader

# Install necessary packages to run CKAN
RUN apk add --no-cache \
Expand Down
Loading