Skip to content

Commit

Permalink
feat: geodata of an IP range (#40)
Browse files Browse the repository at this point in the history
* feat: update version

* feat: add location overrides

* test: add unit tests

* feat: update schema
  • Loading branch information
alexey-yarmosh committed Apr 15, 2024
1 parent d60280a commit f4879ca
Show file tree
Hide file tree
Showing 13 changed files with 7,118 additions and 19 deletions.
11 changes: 10 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,15 @@ RUN npm ci
COPY ./src/extensions/hooks/directus-users .
RUN npm run build

FROM directus/directus:10.9.0
# Build hooks/gp-tokens
FROM node:18-alpine AS builder-19
WORKDIR /builder/src/extensions/hooks/location-overrides
ADD ./src/extensions/hooks/location-overrides/package.json ./src/extensions/hooks/location-overrides/package-lock.json ./
RUN npm ci
COPY ./src/extensions/hooks/location-overrides .
RUN npm run build

FROM directus/directus:10.9.3

COPY --from=builder-01 /builder/src/extensions/hooks/jsd-purge-tokens/dist/* /directus/extensions/hooks/jsd-purge-tokens/
COPY --from=builder-02 /builder/src/extensions/hooks/sign-up/dist/* /directus/extensions/hooks/sign-up/
Expand All @@ -163,3 +171,4 @@ COPY --from=builder-15 /builder/src/extensions/interfaces/gp-tags/dist/* /direct
COPY --from=builder-16 /builder/src/extensions/operations/remove-banned-users-cron-handler/dist/* /directus/extensions/operations/remove-banned-users-cron-handler/
COPY --from=builder-17 /builder/src/extensions/hooks/gp-tokens/dist/* /directus/extensions/hooks/gp-tokens/
COPY --from=builder-18 /builder/src/extensions/hooks/directus-users/dist/* /directus/extensions/hooks/directus-users/
COPY --from=builder-19 /builder/src/extensions/hooks/location-overrides/dist/* /directus/extensions/hooks/location-overrides/
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"lint:fix": "npm run lint -- --fix",
"init": "./scripts/init.sh",
"init:dev": "./scripts/init.sh --dev",
"migrate": "rm -rf ./extensions/migrations/* && mkdir -p ./extensions/migrations/ && cp -rp ./src/extensions/migrations/* ./extensions/migrations/ && dotenv -- npx --yes directus@10.9.0 database migrate:latest",
"migrate": "rm -rf ./extensions/migrations/* && mkdir -p ./extensions/migrations/ && cp -rp ./src/extensions/migrations/* ./extensions/migrations/ && dotenv -- npx --yes directus@10.9.3 database migrate:latest",
"seed": "NODE_ENV=development knex seed:run",
"schema:apply": "npx --yes directus@10.9.0 schema apply --yes snapshots/collections-schema.yml",
"schema:snapshot": "npx --yes directus@10.9.0 schema snapshot --yes snapshots/collections-schema.yml",
"schema:apply": "npx --yes directus@10.9.3 schema apply --yes snapshots/collections-schema.yml",
"schema:snapshot": "npx --yes directus@10.9.3 schema snapshot --yes snapshots/collections-schema.yml",
"prepare": "husky install || echo 'Failed to install husky'",
"build:in-sequence": "grep -E 'AS builder-[0-9]+' Dockerfile | awk -F 'AS ' '{print $2}' | xargs -r -P 1 -I STAGE docker build --target STAGE .",
"test": "./scripts/test.sh"
Expand Down
Loading

0 comments on commit f4879ca

Please sign in to comment.