diff --git a/build-docker.sh b/build-docker.sh new file mode 100755 index 0000000..4a8a917 --- /dev/null +++ b/build-docker.sh @@ -0,0 +1,27 @@ +# only allow to run this script as root +if [ "$EUID" -ne 0 ] + then echo "Please run as root" + exit +fi + +echo "Starting go build of admin-dashboard-backend" +go build main.go +echo "Go build finished" + +echo "Starting swagger build" +./swagger-gen.sh +echo "Finished swagger build" + +# rm images +docker image rm jnx-admin-dashboard-server + +# build images +docker compose build jnx-admin-dashboard-server + +# tag images +docker image tag jnx-admin-dashboard-server:latest dockreg.ex.umbach.dev/jnx-admin-dashboard-server:latest + +# push to self-hosted docker registry +docker push dockreg.ex.umbach.dev/jnx-admin-dashboard-server + +echo "Uploaded admin-dashboard-backend as jnx-admin-dashboard-server" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..8abc5b5 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,37 @@ +version: "3" + +services: + jnx-admin-dashboard-server: + container_name: jnx-admin-dashboard-server + image: jnx-admin-dashboard-server:latest + build: + context: . + dockerfile: admin-dashboard-backend/Dockerfile + depends_on: + - mariadb + restart: always + volumes: + - admin_dashboard_server_data:/app + # CHANGE HERE - ONLY THE PATH ON YOUR SYSTEM: path_on_your_system:path_on_container + - ./admin-dashboard-data:/admin-dashboard-data + networks: + - jnx-admin-dashboard-network + environment: + - DOCKER=true + - DEBUG=true + - COLORIZED_OUTPUT=true + - HOST=0.0.0.0 + - PORT=8080 + - LOG_MANAGER_SERVER_URL=http://localhost:3000 + - FOLDER_GROUPTASKS_GROUPS=/admin-dashboard-data/groupTasks/groups/ + - FOLDER_GROUPTASKS_RUNNINGTASKS=/admin-dashboard-data/groupTasks/runningTasks/ + - FOLDER_PUBLIC_STATIC=/admin-dashboard-data/public/ + - LOG_LANGUAGE_GROUPTASKS=./grouptasks_lang_log_messages.json + - LOG_LANGUAGE_SYSTEM=./system_lang_log_messages.json + - MARIADB_HOSTNAME=mariadb + - MARIADB_PORT=3306 + - MARIADB_USERNAME=admindashboard + - MARIADB_PASSWORD=QHXNcxuRRyAdxCxVCmPkEuCsPfCdfLz2 + - MARIADB_DATABASE_NAME=jnxadmindashboard + - INVEX_API_BASE=https://XXXXXX # CHANGE HERE + - INVEX_API_TOKEN=XXXXXXXXXXX # CHANGE HERE diff --git a/groupTasks/groups/roese/index.json b/groupTasks/groups/roese/index.json index b43ba78..d9f8d92 100644 --- a/groupTasks/groups/roese/index.json +++ b/groupTasks/groups/roese/index.json @@ -90,7 +90,8 @@ "location": 5, "whitelistParts": [], "blacklistParts": [] - } + }, + "global": true }, { "parameterName": "select_format", diff --git a/main b/main index 26b2a59..67ac56c 100755 Binary files a/main and b/main differ