Skip to content
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

Jump to bottom

Add exiftool dependency for geo-module #725

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Add exiftool dependency for geo-module #725

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
63cfb03
add php-exif dependency
mtiessen1175 Dec 18, 2023
957fd66
add exiftool to docker-container (app and worker)
mtiessen1175 Dec 18, 2023
235befd
add missing composer.lock dependencies
mtiessen1175 Dec 18, 2023
f471c4b
remove unnecessary dependency
mtiessen1175 Dec 18, 2023
9c1e4c5
add PHP geo-projection package proj4
mtiessen1175 Dec 19, 2023
de13189
update proj4php to latest version (critical bugfix)
mtiessen1175 Jan 19, 2024
eba2576
remove proj4php from core
mtiessen1175 Jan 19, 2024
ec042df
update composer.lock hash
mtiessen1175 Jan 19, 2024
885370a
Merge branch 'master' into geo-dependency
mtiessen1175 Jul 18, 2024
3577945
Changed exiftool install from using apk add to apt-get
mtiessen1175 Jul 18, 2024
7c2fc62
Added public storage disk for geo-overlays
mtiessen1175 Jul 26, 2024
2830562
Revert "Added public storage disk for geo-overlays" (needs to be done…
mtiessen1175 Aug 20, 2024
166f828
Merge branch 'master' into geo-dependency
mzur Sep 9, 2024
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
2 changes: 2 additions & 0 deletions .docker/app.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ RUN apk add --no-cache \
soap \
&& apk del --purge .build-deps

RUN apk add --no-cache exiftool

# Configure proxy if there is any. See: https://stackoverflow.com/a/2266500/1796523
RUN [ -z "$HTTP_PROXY" ] || pear config-set http_proxy $HTTP_PROXY
RUN apk add --no-cache yaml \
Expand Down
1 change: 1 addition & 0 deletions .docker/worker.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ LABEL org.opencontainers.image.source https://github.com/biigle/core

RUN LC_ALL=C.UTF-8 apt-get update \
&& apt-get install -y --no-install-recommends \
exiftool \
ffmpeg \
python3 \
python3-numpy \
Expand Down
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"laravel/framework": "^10.0",
"laravel/tinker": "^2.8",
"laravel/ui": "^4.0",
"lychee-org/php-exif": "^1.0",
"msurguy/honeypot": "^1.0",
"pgvector/pgvector": "^0.1.4",
"php-ffmpeg/php-ffmpeg": "^1.0",
Expand Down
271 changes: 269 additions & 2 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions config/filesystems.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@
'driver' => 'local',
'root' => storage_path('ifdos'),
],

'geo-overlays' => [
'driver' => 'local',
'root' => storage_path('app/public/geo-overlays'),
'url' => env('APP_URL').'/storage/geo-overlays',
'visibility' => 'public',
],
],

/*
Expand Down