Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2995 from deinok/master
Fix + enable automatic docker image builds
- Loading branch information
Showing
6 changed files
with
26 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
ckan: | ||
image: 'ckan/ckan:latest' | ||
links: | ||
- db | ||
- solr | ||
ports: | ||
- '80:80' | ||
db: | ||
image: 'ckan/postgresql:latest' | ||
solr: | ||
image: 'ckan/solr:latest' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
FROM orchardup/postgresql | ||
FROM postgres:latest | ||
MAINTAINER Open Knowledge | ||
|
||
# Customize default user/pass/db | ||
ENV POSTGRESQL_USER ckan | ||
ENV POSTGRESQL_PASS ckan | ||
ENV POSTGRESQL_DB ckan | ||
ENV POSTGRES_USER ckan | ||
ENV POSTGRES_PASS ckan | ||
ENV POSTGRES_DB ckan |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.