Commit 5c41d025 authored by Open Science Conservation Fund's avatar Open Science Conservation Fund
Browse files

Merge branch 'feature/timescaledb-video-bboxes' into 'development' 

massive refactor of the media classification module introducing the new...

See merge request !190
parents 33e94d25 8d60c72e

.gitlab-ci.yml

+2 −12
Original line number Diff line number Diff line
@@ -53,16 +53,6 @@ Pip outdated: 
    - echo "Show outdated packages"

    - uv pip list --outdated



# Safety:

#   stage: code checks

#   allow_failure: true

#   before_script:

#     - *check_before_script

#   script:

#     - pip install safety

#     - pip freeze --exclude-editable > requirements.txt

#     - safety check -r requirements.txt



Prebuild image:

  image: docker:latest

  services:
@@ -110,7 +100,7 @@ Test prebuild: 
    MEDIA_ROOT: /tmp/trapper-media

    EXTERNAL_MEDIA_ROOT: /tmp/trapper-external-media

  services:

    - name: registry.gitlab.com/trapper-project/trapper-postgresql:latest

    - name: registry.gitlab.com/trapper-project/trapper-postgresql:timescaledb

      alias: postgres

    - name: memcached

  script:
@@ -141,7 +131,7 @@ Test with S3: 
    DEFAULT_FILE_STORAGE: amazon_s3

    EXTERNAL_MEDIA_ROOT: /tmp/trapper-external-media

  services:

    - name: registry.gitlab.com/trapper-project/trapper-postgresql:latest

    - name: registry.gitlab.com/trapper-project/trapper-postgresql:timescaledb

      alias: postgres

    - name: localstack/localstack

      alias: localstack

Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -56,7 +56,9 @@ RUN echo '{ "version": "'${APP_VERSION}'" }' > /version.json 
RUN groupadd -g ${TRAPPER_USER_GID} trapper && \

    useradd trapper -u ${TRAPPER_USER_UID} -g ${TRAPPER_USER_GID} && \

    chown -R trapper /app/trapper-project && \

    chown -R trapper /app/locale

    chown -R trapper /app/locale && \

    mkdir -p /app/static /app/media /app/external_media && \

    chown trapper:trapper /app/static /app/media /app/external_media



ENTRYPOINT ["/app/entrypoint.sh"]

CMD ["/app/command_prod.sh"]

Dockerfile.dev

+3 −1
Original line number Diff line number Diff line
@@ -56,7 +56,9 @@ RUN echo '{ "version": "'${APP_VERSION}'" }' > /version.json 
RUN groupadd -g ${TRAPPER_USER_GID} trapper && \

    useradd trapper -u ${TRAPPER_USER_UID} -g ${TRAPPER_USER_GID} && \

    chown -R trapper /app/trapper-project && \

    chown -R trapper /app/locale

    chown -R trapper /app/locale && \

    mkdir -p /app/static /app/media /app/external_media && \

    chown trapper:trapper /app/static /app/media /app/external_media



ENTRYPOINT ["/app/entrypoint.sh"]

CMD ["/app/command_dev.sh"]

README.md

+1 −1
Original line number Diff line number Diff line 
<p align="center">

  <img src="https://gitlab.com/trapper-project/trapper/-/raw/master/trapper/trapper-project/trapper/apps/common/static/images/logo/logo_text.png">

  <img src="trapper/trapper-project/trapper/apps/common/static/images/logo/logo_text.png" alt="TRAPPER Logo">

</p>



<div align="center">

docker-compose.prod.yml

+14 −0
Original line number Diff line number Diff line
@@ -9,13 +9,27 @@ services: 
        TRAPPER_USER_UID: ${TRAPPER_USER_UID}

        TRAPPER_USER_GID: ${TRAPPER_USER_GID}

    command: /app/command_prod.sh

    # No ports exposed - accessed only via nginx proxy

    ports: []



  postgres:

    # No ports exposed - accessed only by internal services

    ports: []



  # trapper - main app

  celery:

    <<: *trapper

    ports: []

    command: celery -A trapper worker -l INFO --logfile=logs/celery_main



  # celery beat worker

  celery_beat:

    <<: *trapper

    ports: []

    command: celery -A trapper beat -l INFO --logfile=logs/celery_beat_main



  # uploader - chunked upload FastAPI service

  trapper_uploader:

    <<: *trapper

    ports: []

    command: python manage.py start_uploader_server