From 2bbdf82fc0fa24153357d31030aa60f1b83aa0d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 11:28:01 +0200 Subject: [PATCH 1/4] Bump github.com/docker/docker in /HadesScheduler (#83) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 26.1.0+incompatible to 26.1.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v26.1.0...v26.1.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- HadesScheduler/go.mod | 2 +- HadesScheduler/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HadesScheduler/go.mod b/HadesScheduler/go.mod index f1ed798..2f34085 100644 --- a/HadesScheduler/go.mod +++ b/HadesScheduler/go.mod @@ -6,7 +6,7 @@ replace github.com/Mtze/HadesCI/shared => ../shared require ( github.com/Mtze/HadesCI/shared v0.0.0-00010101000000-000000000000 - github.com/docker/docker v26.1.0+incompatible + github.com/docker/docker v26.1.1+incompatible github.com/hibiken/asynq v0.24.1 github.com/sirupsen/logrus v1.9.3 ) diff --git a/HadesScheduler/go.sum b/HadesScheduler/go.sum index 3748f06..42504cd 100644 --- a/HadesScheduler/go.sum +++ b/HadesScheduler/go.sum @@ -23,8 +23,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v26.1.0+incompatible h1:W1G9MPNbskA6VZWL7b3ZljTh0pXI68FpINx0GKaOdaM= -github.com/docker/docker v26.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.1.1+incompatible h1:oI+4kkAgIwwb54b9OC7Xc3hSgu1RlJA/Lln/DF72djQ= +github.com/docker/docker v26.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= From 43143eddd24fb4d7001716ed04fa16eaaecfa0a0 Mon Sep 17 00:00:00 2001 From: Robert Jandow <38583713+robertjndw@users.noreply.github.com> Date: Tue, 7 May 2024 16:26:55 +0200 Subject: [PATCH 2/4] Migrate the modules and image tags to org (#85) --- HadesAPI/go.mod | 6 +++--- HadesAPI/main.go | 2 +- HadesAPI/monitoring.go | 2 +- HadesAPI/router.go | 4 ++-- HadesCloneContainer/go.mod | 2 +- HadesScheduler/docker/docker.go | 4 ++-- HadesScheduler/go.mod | 6 +++--- HadesScheduler/main.go | 6 +++--- docker-compose.yml | 4 ++-- go.work.sum | 3 +++ shared/go.mod | 2 +- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/HadesAPI/go.mod b/HadesAPI/go.mod index eb06a53..c18e3c4 100644 --- a/HadesAPI/go.mod +++ b/HadesAPI/go.mod @@ -1,16 +1,16 @@ -module github.com/Mtze/HadesCI/hadesAPI +module github.com/ls1intum/hades/hadesAPI go 1.21.0 require ( - github.com/Mtze/HadesCI/shared v0.0.0 + github.com/ls1intum/hades/shared v0.0.0 github.com/gin-gonic/gin v1.9.1 github.com/hibiken/asynq v0.24.1 github.com/hibiken/asynqmon v0.7.2 github.com/sirupsen/logrus v1.9.3 ) -replace github.com/Mtze/HadesCI/shared => ../shared +replace github.com/ls1intum/hades/shared => ../shared require ( github.com/bytedance/sonic v1.9.1 // indirect diff --git a/HadesAPI/main.go b/HadesAPI/main.go index fce6680..b070bb8 100644 --- a/HadesAPI/main.go +++ b/HadesAPI/main.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/Mtze/HadesCI/shared/utils" "github.com/gin-gonic/gin" "github.com/hibiken/asynq" "github.com/hibiken/asynqmon" + "github.com/ls1intum/hades/shared/utils" log "github.com/sirupsen/logrus" ) diff --git a/HadesAPI/monitoring.go b/HadesAPI/monitoring.go index 2d6173d..4bef4ef 100644 --- a/HadesAPI/monitoring.go +++ b/HadesAPI/monitoring.go @@ -3,8 +3,8 @@ package main import ( "encoding/json" - "github.com/Mtze/HadesCI/shared/payload" "github.com/hibiken/asynqmon" + "github.com/ls1intum/hades/shared/payload" log "github.com/sirupsen/logrus" ) diff --git a/HadesAPI/router.go b/HadesAPI/router.go index 1969bcd..dcd72dc 100644 --- a/HadesAPI/router.go +++ b/HadesAPI/router.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "github.com/Mtze/HadesCI/shared/payload" - "github.com/Mtze/HadesCI/shared/utils" "github.com/gin-gonic/gin" "github.com/hibiken/asynq" + "github.com/ls1intum/hades/shared/payload" + "github.com/ls1intum/hades/shared/utils" log "github.com/sirupsen/logrus" ) diff --git a/HadesCloneContainer/go.mod b/HadesCloneContainer/go.mod index 6e05b39..112bce5 100644 --- a/HadesCloneContainer/go.mod +++ b/HadesCloneContainer/go.mod @@ -1,4 +1,4 @@ -module github.com/Mtze/HadesCI/hadesCloneContainer +module github.com/ls1intum/hades/hadesCloneContainer go 1.21.0 diff --git a/HadesScheduler/docker/docker.go b/HadesScheduler/docker/docker.go index 516d883..d27347e 100644 --- a/HadesScheduler/docker/docker.go +++ b/HadesScheduler/docker/docker.go @@ -6,12 +6,12 @@ import ( "strings" "time" - "github.com/Mtze/HadesCI/shared/payload" - "github.com/Mtze/HadesCI/shared/utils" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/mount" "github.com/docker/docker/client" _ "github.com/docker/docker/client" + "github.com/ls1intum/hades/shared/payload" + "github.com/ls1intum/hades/shared/utils" log "github.com/sirupsen/logrus" ) diff --git a/HadesScheduler/go.mod b/HadesScheduler/go.mod index 2f34085..5f38ebe 100644 --- a/HadesScheduler/go.mod +++ b/HadesScheduler/go.mod @@ -1,11 +1,11 @@ -module github.com/Mtze/HadesCI/hadesScheduler +module github.com/ls1intum/hades/hadesScheduler go 1.21.0 -replace github.com/Mtze/HadesCI/shared => ../shared +replace github.com/ls1intum/hades/shared => ../shared require ( - github.com/Mtze/HadesCI/shared v0.0.0-00010101000000-000000000000 + github.com/ls1intum/hades/shared v0.0.0-00010101000000-000000000000 github.com/docker/docker v26.1.1+incompatible github.com/hibiken/asynq v0.24.1 github.com/sirupsen/logrus v1.9.3 diff --git a/HadesScheduler/main.go b/HadesScheduler/main.go index 252a863..6442813 100644 --- a/HadesScheduler/main.go +++ b/HadesScheduler/main.go @@ -6,10 +6,10 @@ import ( "encoding/json" "os" - "github.com/Mtze/HadesCI/hadesScheduler/docker" - "github.com/Mtze/HadesCI/shared/payload" - "github.com/Mtze/HadesCI/shared/utils" "github.com/hibiken/asynq" + "github.com/ls1intum/hades/hadesScheduler/docker" + "github.com/ls1intum/hades/shared/payload" + "github.com/ls1intum/hades/shared/utils" log "github.com/sirupsen/logrus" ) diff --git a/docker-compose.yml b/docker-compose.yml index 6904e6c..cc3e94e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: hadesAPI: - image: ghcr.io/mtze/hades/hades-api + image: ghcr.io/ls1intum/hades/hades-api build: context: . dockerfile: ./HadesAPI/Dockerfile @@ -20,7 +20,7 @@ services: - REDIS_PASSWORD hadesScheduler: - image: ghcr.io/mtze/hades/hades-scheduler + image: ghcr.io/ls1intum/hades/hades-scheduler build: context: . dockerfile: ./HadesScheduler/Dockerfile diff --git a/go.work.sum b/go.work.sum index 5c11d40..d6d56cf 100644 --- a/go.work.sum +++ b/go.work.sum @@ -6,6 +6,7 @@ github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBb github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= +github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= @@ -22,6 +23,7 @@ golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= @@ -30,6 +32,7 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= diff --git a/shared/go.mod b/shared/go.mod index 4c34128..43583aa 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -1,4 +1,4 @@ -module github.com/Mtze/HadesCI/shared +module github.com/ls1intum/hades/shared go 1.21.0 From a2613cf89287d3b9ca30e83b2d9c49c020c05ce0 Mon Sep 17 00:00:00 2001 From: Robert Jandow <38583713+robertjndw@users.noreply.github.com> Date: Wed, 8 May 2024 17:31:16 +0200 Subject: [PATCH 3/4] Remove unused RabbitMQ environment variables (#86) --- .env | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index e52448c..0000000 --- a/.env +++ /dev/null @@ -1,3 +0,0 @@ -RABBITMQ_URL=localhost:5672 -RABBITMQ_DEFAULT_USER=admin -RABBITMQ_DEFAULT_PASS=admin \ No newline at end of file From 15c152ea10323843b088b98fc2ef0a9de67c5ce7 Mon Sep 17 00:00:00 2001 From: Robert Jandow <38583713+robertjndw@users.noreply.github.com> Date: Tue, 14 May 2024 11:06:23 +0200 Subject: [PATCH 4/4] Add missing example env (#87) * Add .env.example * Update env dependencies to latest versions * Update compose files to reflect env changes --- .env.example | 22 ++++++++++++++++++++++ HadesAPI/go.mod | 4 ++-- HadesAPI/go.sum | 4 ++-- HadesScheduler/docker/docker.go | 2 +- HadesScheduler/go.mod | 4 ++-- HadesScheduler/go.sum | 4 ++-- docker-compose.dev.yml | 6 +++--- docker-compose.yml | 6 +++--- shared/go.mod | 2 +- shared/go.sum | 4 ++-- shared/utils/config.go | 2 +- 11 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..184d3d8 --- /dev/null +++ b/.env.example @@ -0,0 +1,22 @@ +### Redis Options ### +REDIS_ADDR=localhost:6379 # Address of the Redis server +REDIS_PWD=notverysecret # Password for the Redis server +REDIS_TLS_ENABLED=false # Whether to use TLS for the Redis connection + +### HadesAPI Options ### +API_PORT=8080 # Port for the API to listen on (default: 8080) +AUTH_KEY="" # Key used for Basic Auth with the API (default: "" for no auth) +PROMETHEUS_ADDRESS="" # Address for Prometheus metrics to be exposed (default: "" for no metrics) +RETENTION_IN_MIN=30 # Time in minutes to keep completed jobs for monitoring (default: 30) +MAX_RETRIES=3 # Number of times to retry a job before marking it as failed (default: 3) +TIMEOUT_IN_MIN=0 # How long a task can run before being killed (default: 0 for no limit) + +### HadesScheduler Options ### +CONCURRENCY=1 # Number of jobs to run concurrently (default: 1) + +### DockerScheduler Options ### +DOCKER_HOST="unix:///var/run/docker.sock" # Docker host to connect to (default: unix:///var/run/docker.sock) +DOCKER_SCRIPT_EXECUTOR="/bin/bash -c" # Path to the script executor to use (default: /bin/sh) +DOCKER_CPU_LIMIT=2 # Number of CPUs to limit the container to (see Docker documentation for more info) +DOCKER_MEMORY_LIMIT=2g # Memory limit for the container (see Docker documentation for more info) +DOCKER_CONTAINER_AUTOREMOVE=true # Automatically remove containers after they finish running (default: true) \ No newline at end of file diff --git a/HadesAPI/go.mod b/HadesAPI/go.mod index c18e3c4..a5c7a32 100644 --- a/HadesAPI/go.mod +++ b/HadesAPI/go.mod @@ -3,10 +3,10 @@ module github.com/ls1intum/hades/hadesAPI go 1.21.0 require ( - github.com/ls1intum/hades/shared v0.0.0 github.com/gin-gonic/gin v1.9.1 github.com/hibiken/asynq v0.24.1 github.com/hibiken/asynqmon v0.7.2 + github.com/ls1intum/hades/shared v0.0.0 github.com/sirupsen/logrus v1.9.3 ) @@ -14,7 +14,7 @@ replace github.com/ls1intum/hades/shared => ../shared require ( github.com/bytedance/sonic v1.9.1 // indirect - github.com/caarlos0/env/v9 v9.0.0 // indirect + github.com/caarlos0/env/v11 v11.0.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect diff --git a/HadesAPI/go.sum b/HadesAPI/go.sum index e71697a..80a4f6b 100644 --- a/HadesAPI/go.sum +++ b/HadesAPI/go.sum @@ -18,8 +18,8 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= -github.com/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc= -github.com/caarlos0/env/v9 v9.0.0/go.mod h1:ye5mlCVMYh6tZ+vCgrs/B95sj88cg5Tlnc0XIzgZ020= +github.com/caarlos0/env/v11 v11.0.0 h1:ZIlkOjuL3xoZS0kmUJlF74j2Qj8GMOq3CDLX/Viak8Q= +github.com/caarlos0/env/v11 v11.0.0/go.mod h1:2RC3HQu8BQqtEK3V4iHPxj0jOdWdbPpWJ6pOueeU1xM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= diff --git a/HadesScheduler/docker/docker.go b/HadesScheduler/docker/docker.go index d27347e..a2d33fb 100644 --- a/HadesScheduler/docker/docker.go +++ b/HadesScheduler/docker/docker.go @@ -25,7 +25,7 @@ type Scheduler struct { type DockerConfig struct { DockerHost string `env:"DOCKER_HOST" envDefault:"unix:///var/run/docker.sock"` - ContainerAutoremove bool `env:"CONTAINER_AUTOREMOVE" envDefault:"true"` + ContainerAutoremove bool `env:"DOCKER_CONTAINER_AUTOREMOVE" envDefault:"true"` DockerScriptExecutor string `env:"DOCKER_SCRIPT_EXECUTOR" envDefault:"/bin/bash -c"` CPU_limit uint `env:"DOCKER_CPU_LIMIT"` // Number of CPUs - e.g. '6' MEMORY_limit string `env:"DOCKER_MEMORY_LIMIT"` // RAM usage in g or m - e.g. '4g' diff --git a/HadesScheduler/go.mod b/HadesScheduler/go.mod index 5f38ebe..8a71dfd 100644 --- a/HadesScheduler/go.mod +++ b/HadesScheduler/go.mod @@ -5,15 +5,15 @@ go 1.21.0 replace github.com/ls1intum/hades/shared => ../shared require ( - github.com/ls1intum/hades/shared v0.0.0-00010101000000-000000000000 github.com/docker/docker v26.1.1+incompatible github.com/hibiken/asynq v0.24.1 + github.com/ls1intum/hades/shared v0.0.0-00010101000000-000000000000 github.com/sirupsen/logrus v1.9.3 ) require ( github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/caarlos0/env/v9 v9.0.0 // indirect + github.com/caarlos0/env/v11 v11.0.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect diff --git a/HadesScheduler/go.sum b/HadesScheduler/go.sum index 42504cd..d35e7c9 100644 --- a/HadesScheduler/go.sum +++ b/HadesScheduler/go.sum @@ -8,8 +8,8 @@ github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdb github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= -github.com/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc= -github.com/caarlos0/env/v9 v9.0.0/go.mod h1:ye5mlCVMYh6tZ+vCgrs/B95sj88cg5Tlnc0XIzgZ020= +github.com/caarlos0/env/v11 v11.0.0 h1:ZIlkOjuL3xoZS0kmUJlF74j2Qj8GMOq3CDLX/Viak8Q= +github.com/caarlos0/env/v11 v11.0.0/go.mod h1:2RC3HQu8BQqtEK3V4iHPxj0jOdWdbPpWJ6pOueeU1xM= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 62be39e..7c656e5 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -5,14 +5,14 @@ services: hadesAPI: environment: - REDIS_ADDR=redis:6379 - - REDIS_PASSWORD + - REDIS_PWD - DEBUG=true hadesScheduler: environment: - REDIS_ADDR=redis:6379 - - REDIS_PASSWORD + - REDIS_PWD - HADES_EXECUTOR=docker - - CONTAINER_AUTOREMOVE=false + - DOCKER_CONTAINER_AUTOREMOVE=false - DEBUG=true volumes: - /var/run/docker.sock:/var/run/docker.sock \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index cc3e94e..c565a64 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: condition: service_healthy environment: - REDIS_ADDR=redis:6379 - - REDIS_PASSWORD + - REDIS_PWD hadesScheduler: image: ghcr.io/ls1intum/hades/hades-scheduler @@ -35,7 +35,7 @@ services: condition: service_healthy environment: - REDIS_ADDR=redis:6379 - - REDIS_PASSWORD + - REDIS_PWD - HADES_EXECUTOR=docker redis: @@ -45,7 +45,7 @@ services: networks: - hades environment: - - REDIS_PASSWORD + - REDIS_PWD healthcheck: test: [ "CMD", "redis-cli", "ping" ] interval: 10s diff --git a/shared/go.mod b/shared/go.mod index 43583aa..7cda6df 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -3,7 +3,7 @@ module github.com/ls1intum/hades/shared go 1.21.0 require ( - github.com/caarlos0/env/v9 v9.0.0 + github.com/caarlos0/env/v11 v11.0.0 github.com/joho/godotenv v1.5.1 github.com/sirupsen/logrus v1.9.3 ) diff --git a/shared/go.sum b/shared/go.sum index d49e4af..17e9c2b 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -1,5 +1,5 @@ -github.com/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc= -github.com/caarlos0/env/v9 v9.0.0/go.mod h1:ye5mlCVMYh6tZ+vCgrs/B95sj88cg5Tlnc0XIzgZ020= +github.com/caarlos0/env/v11 v11.0.0 h1:ZIlkOjuL3xoZS0kmUJlF74j2Qj8GMOq3CDLX/Viak8Q= +github.com/caarlos0/env/v11 v11.0.0/go.mod h1:2RC3HQu8BQqtEK3V4iHPxj0jOdWdbPpWJ6pOueeU1xM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/shared/utils/config.go b/shared/utils/config.go index 1cc1cba..b3a6b8e 100644 --- a/shared/utils/config.go +++ b/shared/utils/config.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/caarlos0/env/v9" + "github.com/caarlos0/env/v11" "github.com/joho/godotenv" log "github.com/sirupsen/logrus" )