Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9cc2225
Initial plan
Copilot Dec 8, 2025
37a5f41
Update Python version to 3.10 in Pipfile and Dockerfile
Copilot Dec 8, 2025
4173c3a
Update Dockerfile for Python 3.10 compatibility and add local build c…
Copilot Dec 8, 2025
93be52a
Add documentation comments for SSL workarounds in Dockerfile
Copilot Dec 8, 2025
9654350
Remove SSL workaround flags as they are not needed in production systems
Copilot Dec 8, 2025
c31442f
Upgrade to Python 3.10 and CKAN 2.11.4
A-Souhei Dec 12, 2025
6a6785c
Update submodule commits for CKAN 2.11.4 compatibility
A-Souhei Dec 12, 2025
5bb15d6
Update Pipfile.lock after adding frictionless dependency
A-Souhei Dec 12, 2025
4aa888d
Fix ckanext-pages installation
A-Souhei Dec 12, 2025
a63c79b
Remove sentry plugin from configuration
A-Souhei Dec 12, 2025
5f23078
Fix ckanext-versions SQLAlchemy 1.4 compatibility
A-Souhei Dec 12, 2025
5a1cb50
Update ckanext-versions: use Inspector for SQLAlchemy 1.4
A-Souhei Dec 12, 2025
5a75ce7
Fix SQLAlchemy 1.4 compatibility across all extensions
A-Souhei Dec 12, 2025
264d2d2
Add DataPusher API token configuration for CKAN 2.11.4 compatibility
A-Souhei Dec 12, 2025
55d7f65
Update ckanext-blob-storage submodule: fix setup.py version import
A-Souhei Dec 12, 2025
9b0f2bb
Add ckanext-pages as submodule and fix SQLAlchemy 1.4 compatibility i…
A-Souhei Dec 12, 2025
6c5dbef
Fix pipenv dependency installation and add missing packages
A-Souhei Dec 13, 2025
a49d38b
Add verbose output and error checking to pipenv install
A-Souhei Dec 13, 2025
a9edc90
Fix infinite recursion in ckanext-unaids user identification
A-Souhei Dec 13, 2025
236eabe
Add activity plugin to fix package_activity_list chained action
A-Souhei Dec 13, 2025
e164761
Fix ckanext-restricted AnonymousUser handling for CKAN 2.11.4
A-Souhei Dec 13, 2025
5943813
Fix ckanext-emailasusername for CKAN 2.11.4 User.by_email() change
A-Souhei Dec 13, 2025
291acb2
Add Flask 3.x compatibility patch for ckanext-saml2auth
A-Souhei Dec 13, 2025
3d15a74
Enhance SAML2 auth patching for Flask 3.x session serialization
A-Souhei Dec 13, 2025
c50dee6
Update migration docs with activity plugin troubleshooting notes
A-Souhei Dec 13, 2025
f867795
Update submodule URLs to use adx-tmp forks
A-Souhei Dec 13, 2025
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: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,9 @@
[submodule "ckan-extensions/ckanext-validation"]
path = submodules/ckanext-validation
url = git@github.com:fjelltopp/ckanext-validation.git
[submodule "submodules/ckanext-authz-service"]
path = submodules/ckanext-authz-service
url = git@github.com:adx-tmp/ckanext-authz-service.git
[submodule "submodules/ckanext-pages"]
path = submodules/ckanext-pages
url = git@github.com:adx-tmp/ckanext-pages.git
85 changes: 85 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
.PHONY: help up dc stop down restart build logs bash setup init dbsetup demodata testsetup test deploy clean

# Default target
help:
@echo "ADX Development Environment Makefile"
@echo ""
@echo "Available targets:"
@echo " up - Start docker containers (docker-compose up -d)"
@echo " dc - Run any docker-compose command (use DC_ARGS for arguments)"
@echo " stop - Stop docker containers"
@echo " down - Stop and destroy docker containers"
@echo " restart - Restart docker containers"
@echo " build - Build docker containers"
@echo " logs - Open the logs for a service (use SERVICE for service name)"
@echo " bash - Open a bash prompt in a container (use CONTAINER for container name)"
@echo " setup - Set up the ADX codebase locally"
@echo " init - Initialize ADX project (configure submodules)"
@echo " dbsetup - Run initial configuration for CKAN plugins"
@echo " demodata - Load demo example data to local CKAN"
@echo " testsetup - Set up the database for CKAN tests"
@echo " test - Test a CKAN extension (use EXT for extension name)"
@echo " deploy - Deploy master branch (if deploy script exists)"
@echo " clean - Clean up Python cache files"
@echo ""
@echo "Examples:"
@echo " make up"
@echo " make logs SERVICE=ckan"
@echo " make bash CONTAINER=ckan"
@echo " make test EXT=validation"
@echo " make dc DC_ARGS='ps'"

# Docker compose commands
up:
./adx up

dc:
./adx dc $(DC_ARGS)

stop:
./adx stop

down:
./adx down

restart:
./adx restart

build:
./adx build

logs:
./adx logs $(SERVICE)

bash:
./adx bash $(CONTAINER)

# Setup and initialization commands
setup:
./adx setup

init:
./adx init

dbsetup:
./adx dbsetup

demodata:
./adx demodata

testsetup:
./adx testsetup

# Testing
test:
./adx test $(EXT)

# Deployment (if available)
deploy:
./adx deploy

# Utility targets
clean:
find . -type f -name '*.pyc' -delete
find . -type d -name '__pycache__' -delete
find . -type d -name '*.egg-info' -exec rm -rf {} +
Loading