Skip to content

make test pass for ckan 2.11 #160

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.

Sign up for GitHub

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

Draft
FuhuXia wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

make test pass for ckan 2.11 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG CKAN_VERSION=2.10
FROM openknowledge/ckan-dev:${CKAN_VERSION}
ARG CKAN_VERSION=2.11
FROM ckan/ckan-dev:${CKAN_VERSION}

RUN apk add tzdata
USER root

COPY . $APP_DIR/

Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
CKAN_VERSION ?= 2.10
CKAN_VERSION ?= 2.11
COMPOSE_FILE ?= docker-compose.yml

build: ## Build the docker containers
CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) build

lint: ## Lint the code
SERVICES_VERSION=$(CKAN_VERSION:%.5=%) CKAN_VERSION=$(CKAN_VERSION) docker compose -f docker-compose.yml run --rm app flake8 ckanext --count --show-source --statistics --exclude ckan
SERVICES_VERSION=$(shell echo $(CKAN_VERSION) | cut -d. -f1,2) CKAN_VERSION=$(CKAN_VERSION) docker compose -f docker-compose.yml run --rm app flake8 ckanext --count --show-source --statistics --exclude ckan

clean: ## Clean workspace and containers
find . -name *.pyc -delete
SERVICES_VERSION=$(CKAN_VERSION:%.5=%) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) down -v
SERVICES_VERSION=$(shell echo $(CKAN_VERSION) | cut -d. -f1,2) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) down -v

test: ## Run tests in a new container
SERVICES_VERSION=$(CKAN_VERSION:%.5=%) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) run --rm app ./test.sh
SERVICES_VERSION=$(shell echo $(CKAN_VERSION) | cut -d. -f1,2) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) run --rm app ./test.sh

up: ## Start the containers
SERVICES_VERSION=$(CKAN_VERSION:%.5=%) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) up app
SERVICES_VERSION=$(shell echo $(CKAN_VERSION) | cut -d. -f1,2) CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) up app


.DEFAULT_GOAL := help
Expand Down