Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,7 @@ CKAN_DATASTORE_WRITE_URL=postgresql://datastore:pass@datastore/datastore
CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:pass@datastore/datastore

## Search Settings
CKAN_SITE_ID=inventory
CKAN_SOLR_URL=http://solr:8983/solr/ckan
CKAN_SOLR_BASE_URL=http://solr:8983
CKAN_SOLR_USER=catalog
CKAN_SOLR_PASSWORD='Bleeding-Edge'
CKAN_SOLR_URL=http://placeholder-value.local

## Redis settings
CKAN_REDIS_URL=redis://redis:6379/0
Expand Down
8 changes: 4 additions & 4 deletions .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ ignore:
- '*':
reason: >-
Ticket created https://github.com/GSA/data.gov/issues/5941
expires: 2026-06-04T05:30:00.000Z
expires: 2026-06-10T05:30:00.000Z
SNYK-PYTHON-CKAN-16322864:
- '*':
reason: >-
Ticket created https://github.com/GSA/data.gov/issues/5941
expires: 2026-06-04T05:30:00.000Z
expires: 2026-06-10T05:30:00.000Z
SNYK-PYTHON-CKAN-16322872:
- '*':
reason: >-
Ticket created https://github.com/GSA/data.gov/issues/5941
expires: 2026-06-04T05:30:00.000Z
expires: 2026-06-10T05:30:00.000Z
SNYK-PYTHON-CKAN-16427188:
- '*':
reason: >-
Ticket created https://github.com/GSA/data.gov/issues/5941
expires: 2026-06-04T05:30:00.000Z
expires: 2026-06-10T05:30:00.000Z
SNYK-PYTHON-PIP-16964647:
- '*':
reason: >-
Expand Down
13 changes: 0 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ services:
depends_on:
- datastore
- db
- solr
- redis
- localstack-container
ports:
Expand Down Expand Up @@ -37,17 +36,6 @@ services:
DB_CKAN_PASSWORD: pass
DB_CKAN_DB: ckan

solr:
image: ghcr.io/gsa/catalog.data.gov.solr:8-stunnel-root
command: /app/solr/local_setup.sh
ports:
- "8983:8983"
deploy:
replicas: 1
volumes:
- solr_data:/var/solr
- .:/app

redis:
image: redis:alpine

Expand All @@ -70,4 +58,3 @@ services:
- "./tmp/localstack:/var/lib/localstack"
volumes:
ckan:
solr_data:
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ckan @ git+https://github.com/GSA/ckan.git@1af1607e4f74fe4855b4ae4814c60fff1b2d1
ckanext-datajson==0.1.28
ckanext-dcat-usmetadata==0.6.3
ckanext-envvars==0.0.6
ckanext-pgsearch @ git+https://github.com/GSA/ckanext-pgsearch.git@2d5fe7023cc9caf7192da67e648b7fd9e484ca87
ckanext-pgsearch @ git+https://github.com/GSA/ckanext-pgsearch.git@48492c63fbaed8bcd892194b22192ffb404f2902
ckanext-s3filestore @ git+https://github.com/keitaroinc/ckanext-s3filestore.git@e972ae3c36489dcfc716f75063ac64c13cde1146
ckanext-saml2auth @ git+https://github.com/GSA/ckanext-saml2auth.git@062f26b19a525139bd613ef3654ca9dc64e0a096
ckanext-usmetadata==0.3.3
Expand Down
5 changes: 1 addition & 4 deletions start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@ set -e
function wait_for () {
local host=$1
local port=$2

while ! nc -z -w 5 "$host" "$port"; do
sleep 1
done
}

echo -n "Waiting for Solr..."
wait_for solr 8983
echo "ok"
echo -n "Waiting for DB..."
wait_for db 5432
echo "ok"
Expand Down