Skip to content

Commit

Permalink
Migrate the modules and image tags to org (#85)
Browse files Browse the repository at this point in the history
  • Loading branch information
robertjndw authored May 7, 2024
1 parent 2bbdf82 commit 43143ed
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 19 deletions.
6 changes: 3 additions & 3 deletions HadesAPI/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion HadesAPI/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion HadesAPI/monitoring.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions HadesAPI/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion HadesCloneContainer/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Mtze/HadesCI/hadesCloneContainer
module github.com/ls1intum/hades/hadesCloneContainer

go 1.21.0

Expand Down
4 changes: 2 additions & 2 deletions HadesScheduler/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions HadesScheduler/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions HadesScheduler/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand All @@ -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=
Expand All @@ -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=
2 changes: 1 addition & 1 deletion shared/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Mtze/HadesCI/shared
module github.com/ls1intum/hades/shared

go 1.21.0

Expand Down

0 comments on commit 43143ed

Please sign in to comment.