removed .env from check-in

Author: PrinsINT

.env

@@ -1,302 +1,6 @@
-# Custom #
-##########
-
-*.cache
-
-scripts/benchmarking/*
-!scripts/benchmarking/run-benchmarks.sh
-!scripts/benchmarking/1doc_100char
-!scripts/benchmarking/1doc_10kchar
-
-server/benchmarks.yml
-server/data/corpora/
-
-.scannerwork/
-**/target
-**/build
-*.iml
-
-.gradle
-/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache
-
-# From DSDD #
-#############
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw*
-
-
-# Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-# *.tar # as the models are tar files we will keep them
-*.zip
-
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Python stuff
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
+.gradle/
+.kotlin/
+.idea/
 build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-# .env <-- we use this for docker-compose, so skip it I guess
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-scripts/tag-matching/*/*
+server/data/corpora/
+.env

.gitignore

@@ -1,31 +1,23 @@
-# Docker compose file for galahad client, server and proxy
+name: galahad
+
 services:
+    
     client:
-        image: instituutnederlandsetaal/galahad-client:${APP_VERSION}
+        image: instituutnederlandsetaal/galahad-client:$VERSION
         build:
             context: client
         restart: unless-stopped
-        networks:
-            - proxy_network
-        deploy:
-            resources:
-                limits:
-                    cpus: '0.50'
-                    memory: 512M
-                reservations:
-                    cpus: '0.25'
-                    memory: 128M
+
     server:
-        image: instituutnederlandsetaal/galahad-server:${APP_VERSION}
+        image: instituutnederlandsetaal/galahad-server:$VERSION
         build:
             context: server
         restart: unless-stopped
         volumes:
             - user-corpora-volume:/data/corpora/custom
             - preset-corpora-volume:/data/corpora/presets
-            - admins-volume:/data/admins
+            - ./server/data/admins:/data/admins
         networks:
-            - proxy_network
             - taggers
         deploy:
             resources:
@@ -37,6 +29,7 @@ services:
                     memory: 2G
         environment: # Otherwise container doesn't restart on OutOfMemory
             - "JAVA_OPTS=-XX:+ExitOnOutOfMemoryError"
+    
     proxy:
         image: nginx:1.27.3-alpine3.20
         volumes:
@@ -45,24 +38,15 @@ services:
             - client
             - server
         ports:
-            - "80:80"
+            - "$PORT:80"
         restart: unless-stopped
-        networks:
-            - proxy_network
 
 
 networks:
-    front:
-        driver: bridge
-    proxy_network:
-        driver: bridge
     taggers:
         external: true
-        name: $taggers_network
+        name: $TAGGERS_NETWORK
+
 volumes:
     user-corpora-volume:
     preset-corpora-volume:
-    formats-volume:
-    taggers-volume:
-    tagsets-volume:
-    admins-volume: