Skip to content

Commit f7516f9

Browse files
Add next gen API alongside old one
1 parent bb5855d commit f7516f9

File tree

659 files changed

+4217
-487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

659 files changed

+4217
-487
lines changed

Makefile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,12 @@ ifndef GIT_BRANCH_NAME
1919
GIT_BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD)
2020
endif
2121

22-
define composer_install
22+
define composer_install
2323
echo
2424
echo Running composer install on $(1)
2525
docker compose run --rm --user reconmapper -w $(1) --entrypoint composer api install
2626
endef
2727

28-
.PHONY: prepare-config
29-
prepare-config:
30-
[ -f config.json ] || cp config-template.json config.json
31-
32-
.PHONY: prepare-dirs
33-
prepare-dirs:
34-
mkdir -p vendor logs
35-
3628
.SILENT: install-deps
3729
.PHONY: install-deps
3830
install-deps:
@@ -60,7 +52,7 @@ security-tests:
6052
docker compose run --rm -w /var/www/webapp --entrypoint bash api -c "wget https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.5/local-php-security-checker_2.0.5_linux_amd64 -O security-checker && chmod +x security-checker && ./security-checker"
6153

6254
.PHONY: start
63-
start: prepare-config prepare-dirs
55+
start:
6456
docker compose up -d
6557

6658
.PHONY: validate

compose.yaml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
dockerfile: docker/mysql/Dockerfile
2121
volumes:
2222
- mysql_varlib:/var/lib/mysql
23-
- ./database:/docker-entrypoint-initdb.d:ro
23+
- ./docker/mysql/initdb:/docker-entrypoint-initdb.d:ro
2424
- ./docker/mysql/overrides.cnf:/etc/mysql/conf.d/overrides.cnf:ro
2525
ports:
2626
- "3306:3306"
@@ -55,29 +55,3 @@ services:
5555
mysql:
5656
condition: service_healthy
5757

58-
api:
59-
container_name: rmap-api
60-
image: ghcr.io/reconmap/rest-api:latest
61-
build:
62-
context: ./
63-
dockerfile: docker/api/Dockerfile
64-
volumes:
65-
- "./config.json:/var/www/webapp/config.json"
66-
- "./logs:/var/www/webapp/logs"
67-
- "./data:/var/www/webapp/data"
68-
- "./composer.json:/var/www/webapp/composer.json"
69-
- "./composer.lock:/var/www/webapp/composer.lock"
70-
- "./vendor:/var/www/webapp/vendor"
71-
- "./public:/var/www/webapp/public"
72-
- "./src:/var/www/webapp/src"
73-
- "./packages:/var/www/webapp/packages"
74-
- "./resources:/var/www/webapp/resources"
75-
- "./tests:/var/www/webapp/tests"
76-
- "./phpunit.xml.dist:/var/www/webapp/phpunit.xml.dist"
77-
- "./run-tests.sh:/var/www/webapp/run-tests.sh"
78-
- "./database:/var/www/webapp/database"
79-
ports:
80-
- "5510:5510"
81-
depends_on:
82-
mysql:
83-
condition: service_healthy
-15.9 KB
Binary file not shown.

data/attachments/default-report-template.html

Lines changed: 0 additions & 185 deletions
This file was deleted.

data/attachments/default-report-template.md

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)