Commit Graph

274 Commits

Author SHA1 Message Date
Brett Jones b48be9783f
Merge pull request #97 from ckan/datapusher-init
Add init script for configuring datapusher
2023-10-19 10:01:29 +02:00
Brett Jones f42b80d27e
Merge pull request #96 from ckan/init-improvements
Init stage improvements
2023-10-19 10:00:22 +02:00
amercader e439eda620 Add init script for configuring datapusher
As discussed in ckan/ckan-docker#95, depends on this one to be
merged/pushed first:

https://github.com/ckan/ckan-docker-base/pull/32
2023-10-17 13:08:03 +02:00
amercader c5b3981b39 Review extensions installation guidance 2023-10-17 12:47:08 +02:00
amercader 2e46f06280 Apply patches in prod images as well 2023-10-17 12:46:45 +02:00
amercader f653b0324d Remove timezone commands
They have been moved to ckan-docker-base

https://github.com/ckan/ckan-docker-base/pull/30
2023-10-17 12:39:03 +02:00
amercader f9ebc0c41c Add step to copy init files
Always copy the files in /docker-entrypoint.d automatically, otherwise
users need to explicitly add a `COPY` step in the `ckan/Dockerfile`,
which is confusing
2023-10-17 12:21:50 +02:00
Brett Jones 8cf41a2ee2
Merge pull request #85 from helt/fix-docker-on-windows
Fix docker compose build on windows
2023-10-08 11:15:58 +02:00
Brett Jones 4d1922a4b7
Merge pull request #92 from ckan/allow-https-in-dev-mode
Document how to run the dev server with HTTPS
2023-10-07 16:17:28 +02:00
Brett Jones 21c794b9b4
Merge branch 'master' into allow-https-in-dev-mode 2023-10-07 16:15:49 +02:00
Brett Jones 2753e5ffb1
Merge pull request #91 from ckan/fix-dev-image-tag
Fix image tag in the Dev Dockerfile
2023-10-06 16:11:13 +02:00
Brett Jones 44690796db
Merge pull request #88 from ckan/wardi-patch-1
remove container_name?
2023-10-05 14:39:38 +02:00
Brett ae0a02b107 update README 2023-10-05 14:28:54 +02:00
amercader f8a3696db9 Document how to run the dev server with HTTPS
This requires https://github.com/ckan/ckan-docker-base/pull/29 and the
images to be rebuilt and pushed before merging
2023-10-05 13:59:27 +02:00
amercader 5fc1efce33 Fix image tag in the Dev Dockerfile
As per https://github.com/ckan/ckan-docker-base/pull/28
2023-10-05 13:34:29 +02:00
Ian Ward 2a8f844ecf
remove container_name?
For discussion: Removing the `container_name` lines lets us run many ckan-docker sites at the same time (assuming you use different ports)

What is the benefit in forcing a container name in the docker compose config?
2023-09-26 17:10:23 -04:00
Hendrik Lücke-Tieke 53bacd83f5 docker COPY is more reproducible than ADD 2023-09-18 16:43:55 +02:00
Hendrik Lücke-Tieke bb936fab7a fixed line endings for windows 2023-09-18 16:35:16 +02:00
Brett Jones 6bbc482e0d
Merge pull request #81 from avdata99/fix_script_extension
Fix script extension
2023-09-03 06:58:59 +02:00
avdata99 43ca2b6a4e Fix script extension 2023-09-01 11:55:20 -03:00
Brett Jones d020c1905e
Merge pull request #79 from Gauravp-NEC/Fix-for-issue-#-77
Added Copying and License in README.md
2023-08-25 09:54:21 +02:00
GauravPandey-NECI c0e6217057
Added Copying and License in README.md
This PR fixes issue: https://github.com/ckan/ckan-docker/issues/77
2023-08-24 12:19:08 +05:30
Brett Jones 8964f174fd
Merge pull request #75 from ckan/update-db-service-in-dev-mode
Update docker-compose.dev.yml with env entries
2023-08-04 11:56:59 +01:00
Brett aef081200d Update docker-compose.dev.yml
db service needed env entries
2023-08-04 11:53:16 +01:00
Brett aed99166ce remove .env file 2023-07-31 16:48:44 +01:00
Brett Jones 1928074f01
Merge pull request #59 from ckan/Potential-Security-Updates
Potential security updates
2023-07-31 16:23:22 +01:00
Brett 5564c85d5e Update to Solr 9 2023-07-31 16:12:55 +01:00
Brett bec42c3974 Update .gitignore
Remove .env from the GitHub repo
2023-07-31 13:44:47 +01:00
Brett 98cefbd3a7 Update docker-compose.yml 2023-07-31 12:14:50 +01:00
Brett Jones f1fc48daa4
Merge pull request #71 from ckan/Update-to-Solr-9
Update .env and .env.example files to use Solr 9
2023-07-31 12:04:45 +01:00
Brett d29d4c69af Update .env and .env.example files to use Solr 9 2023-07-31 12:03:15 +01:00
Brett Jones 7fb7ce3a1a
Update README.md 2023-07-25 08:49:17 +02:00
Brett Jones da7caf0020
Merge pull request #68 from Gauravp-NEC/Fix-for-issue-61
Added steps for user creation
2023-07-25 08:45:15 +02:00
GauravPandey-NECI 6e92deebfa
Added steps for user creation 2023-07-23 23:22:33 +05:30
Brett Jones 5793f85cb6
Update README.md 2023-07-07 14:00:47 +02:00
Brett Jones 3a21eb438f
Update README.md
Update for wiki article link
2023-07-07 13:59:39 +02:00
Brett Jones 27968512c9
Merge pull request #63 from AlasdairGray/patch-1
Using envvar variables that don't start with CKAN
2023-06-30 14:08:23 +02:00
Alasdair Gray 426cd23f25
Using envvar variables that don't start with CKAN 2023-06-20 17:09:38 +01:00
Brett 60abbedd21 get rid of the PGDATE env variable and overriding the pg_hba.conf file 2023-06-15 10:07:14 +02:00
Brett 40ffdcdbb7 More .env and compose updates 2023-06-13 14:24:18 +02:00
Brett 969494b9aa Updates to environment variables 2023-06-10 08:11:18 +02:00
Brett 5a13a9f484 Update README 2023-06-08 14:08:56 +02:00
Brett d06847dd24 Take out all non-SSL ports for NGINX 2023-06-03 10:22:55 +02:00
Brett a702914f20 harden NGINX config 2023-06-02 10:34:36 +02:00
Brett 4b5dbeacdd Update docker-compose.dev.yml 2023-05-31 14:36:49 +02:00
Brett d621fb62df Initial Security updates
- Update database user names and passwords
- The CKAN database is created with a new SQL script in the docker-entrypoint-initdb.d/ directory
- Remove host port for CKAN container
- now has a front-end network for NGINX and a back-end network for the rest of the containers, plus NGINX
2023-05-31 14:26:56 +02:00
Brett Jones aeda97cfe2
Merge pull request #56 from ckan/Changing-base-images
Base image updates for new versions
2023-05-25 14:10:03 +02:00
Brett 5a9c23eb7f Updates to Dockerfiles and doco 2023-05-25 14:06:50 +02:00
Brett Jones d3152d3f7c
Update README.md
Added CKAN_SITE_URL
2023-05-15 03:23:32 +12:00
Brett Jones cf4eef6111
Merge pull request #52 from ckan/ckan-cleanup
Update setup/ directory files in CKAN container
2023-04-05 14:03:46 +12:00