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.

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

Solr Docker Image Updated #3029

Merged
merged 13 commits into from May 26, 2016
Merged

Solr Docker Image Updated #3029

merged 13 commits into from May 26, 2016

Conversation

deinok
Copy link
Member

@deinok deinok commented May 17, 2016

Updates the Solr Docker Image to 6.0 and CKAN Image requires less space in HD.

@wardi Please, enable Automatic-Build on Docker Hub as we talk. If you need help, please, contact me. This will enable the automatic update of the image every time the Dockerfiles are updated.

@wardi wardi self-assigned this May 19, 2016
Raul Hidalgo Caballero added 2 commits May 20, 2016 10:39
Simplificates the creation of the ckan docker containers required
@deinok
Copy link
Member Author

deinok commented May 25, 2016

@wardi ping

EXPOSE 80

RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
FROM phusion/baseimage:latest
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's pin a version instead. Otherwise our build won't be reproduceable

@wardi
Copy link
Contributor

wardi commented May 25, 2016

I've deleted and recreated the ckan/solr and ckan/postgresql images as automated builds. It seems like the ckan/ckan image isn't building automatically even though it's set to. I might have to delete and recreate it as well.

Please pin the docker images we use for postgresql and solr should be to some specific release version and I'll merge. It's ok with me if our docker dependencies are ahead of the versions listed in the source install, because this is going to be bleeding edge for a while I'm sure.

Raul Hidalgo Caballero added 3 commits May 25, 2016 17:59
Probably we should transfer to ubuntu image. This will be on next PR
@deinok
Copy link
Member Author

deinok commented May 25, 2016

@wardi
Postgres pined to 9.5
Solr pined to 6.0
Base image temporary pined to 0.9.15 (probably we shoud move to ubuntu base images, phusion/baseimage was set when ubuntu images were not very stable for docker)

# Adding Files
ADD ./solrconfig.xml \
https://raw.githubusercontent.com/deinok/ckan/master/ckan/config/solr/schema.xml \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ckan/ckan ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forget do this change before PR

@deinok
Copy link
Member Author

deinok commented May 25, 2016

@wardi Tested images, seems ok to merge, take a look please

VOLUME ["/var/lib/ckan"]
EXPOSE 80
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've switched this whole file to use DOS line endings?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contrib/docker/solr/Dockerfile and contrib/docker/docker-cloud.yml too.

@deinok
Copy link
Member Author

deinok commented May 26, 2016

@wardi yes, i think i was modified, but its an workin version, I will full modify CKAN image in a next PR, it will enable more configuration using ENV and use Debian or Ubuntu images, now that images work better than phusion/baseimage.

Also i see that there is a Docker repo in CKAN, but is dead.

@wardi
Copy link
Contributor

wardi commented May 26, 2016

Would you use unix line endings instead? Changing the line endings makes it look like you changed the whole files

@deinok
Copy link
Member Author

deinok commented May 26, 2016

Okey, will make the changes when i get home

@amercader amercader mentioned this pull request May 26, 2016
All files should be in LF End of Line
@deinok
Copy link
Member Author

deinok commented May 26, 2016

@wardi take a look ;)

@wardi wardi merged commit bdad7d6 into ckan:master May 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants