Skip to content
This repository was archived by the owner on Feb 5, 2024. It is now read-only.

Commit 4adcbde

Browse files
authored
Merge pull request #109 from ProgrammingLab/gedorinku/transfer_to_programming_lab
ProgrammingLabに移行する
2 parents fe69d71 + cd78e67 commit 4adcbde

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+79
-79
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
install: skip
2323
script:
2424
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
25-
- docker build -t gedorinku/koneko-online-judge .
26-
- docker push gedorinku/koneko-online-judge
25+
- docker build -t programminglab/koneko-online-judge .
26+
- docker push programminglab/koneko-online-judge
2727

2828
notifications:
2929
email:

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ ENV DOCKER_VERSION 1.35
1414
RUN apk --no-cache add bash git mercurial
1515
RUN go get github.com/golang/dep/cmd/dep
1616
COPY . /go/src/github.com/gedorinku/koneko-online-judge
17-
RUN cd /go/src/github.com/gedorinku/koneko-online-judge/server/ \
17+
RUN cd /go/src/github.com/ProgrammingLab/koneko-online-judge/server/ \
1818
&& dep ensure -vendor-only \
1919
&& go build main.go
20-
RUN cd /go/src/github.com/gedorinku/koneko-online-judge/runner/ \
20+
RUN cd /go/src/github.com/ProgrammingLab/koneko-online-judge/runner/ \
2121
&& dep ensure -vendor-only \
2222
&& go build -ldflags '-extldflags "-static"' . \
2323
&& chmod 700 runner
2424

25-
WORKDIR /go/src/github.com/gedorinku/koneko-online-judge/server/
25+
WORKDIR /go/src/github.com/ProgrammingLab/koneko-online-judge/server/
2626
# dockerdを起動させないようにする
2727
ENTRYPOINT []

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- Docker
88

99
## Documents
10-
[GitHub Wiki](https://github.com/gedorinku/koneko-online-judge/wiki)
10+
[GitHub Wiki](https://github.com/ProgrammingLab/koneko-online-judge/wiki)
1111

1212
## Config
1313
こねこの設定ファイルは、`./server/koneko.toml`です。
@@ -22,17 +22,17 @@ export KOJ_DB_PASSWORD="password"
2222

2323
### Start the backend server
2424
```
25-
go get github.com/gedorinku/koneko-online-judge/...
26-
cd $GOPATH/src/github.com/gedorinku/koneko-online-judge/
25+
go get github.com/ProgrammingLab/koneko-online-judge/...
26+
cd $GOPATH/src/github.com/ProgrammingLab/koneko-online-judge/
2727
docker-compose up
2828
```
2929

3030
## Debug
3131

3232
### Setup
3333
```
34-
go get github.com/gedorinku/koneko-online-judge/...
35-
cd $GOPATH/src/github.com/gedorinku/koneko-online-judge/server/
34+
go get github.com/ProgrammingLab/koneko-online-judge/...
35+
cd $GOPATH/src/github.com/ProgrammingLab/koneko-online-judge/server/
3636
docker build -t koneko-online-judge-image-cpp container/cpp/
3737
dep ensure
3838
```

docker-compose.mailhog.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
koneko:
5-
image: gedorinku/koneko-online-judge:latest
5+
image: programminglab/koneko-online-judge:latest
66
command: ["./wait-for-it.sh", "mysql:3306", "--", "./run.sh"]
77
environment:
88
KOJ_DB_DRIVER: "mysql"
@@ -15,7 +15,7 @@ services:
1515
restart: always
1616
volumes:
1717
- /var/run/docker.sock:/var/run/docker.sock
18-
- ./server/koneko.toml:/go/src/github.com/gedorinku/koneko-online-judge/server/koneko.toml
18+
- ./server/koneko.toml:/go/src/github.com/ProgrammingLab/koneko-online-judge/server/koneko.toml
1919
- /tmp/koj-workspace:/tmp/koj-workspace
2020
- /tmp/judge_data:/tmp/judge_data
2121
logging:

docker-compose.production.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
koneko:
5-
image: gedorinku/koneko-online-judge:latest
5+
image: programminglab/koneko-online-judge:latest
66
command: ["./run.sh"]
77
environment:
88
DOCKER_API_VERSION: "1.35"
@@ -14,7 +14,7 @@ services:
1414
restart: always
1515
volumes:
1616
- /var/run/docker.sock:/var/run/docker.sock
17-
- ./server/koneko.toml:/go/src/github.com/gedorinku/koneko-online-judge/server/koneko.toml
17+
- ./server/koneko.toml:/go/src/github.com/ProgrammingLab/koneko-online-judge/server/koneko.toml
1818
- /tmp/koj-workspace:/tmp/koj-workspace
1919
- /tmp/judge_data:/tmp/judge_data
2020
network_mode: "host"

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
koneko:
5-
image: gedorinku/koneko-online-judge:latest
5+
image: programminglab/koneko-online-judge:latest
66
command: ["./wait-for-it.sh", "mysql:3306", "--", "./run.sh"]
77
environment:
88
KOJ_DB_DRIVER: "mysql"
@@ -15,7 +15,7 @@ services:
1515
restart: always
1616
volumes:
1717
- /var/run/docker.sock:/var/run/docker.sock
18-
- ./server/koneko.toml:/go/src/github.com/gedorinku/koneko-online-judge/server/koneko.toml
18+
- ./server/koneko.toml:/go/src/github.com/ProgrammingLab/koneko-online-judge/server/koneko.toml
1919
- /tmp/koj-workspace:/tmp/koj-workspace
2020
- /tmp/judge_data:/tmp/judge_data
2121
logging:

nekonote/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import (
44
"crypto/rand"
55
"flag"
66
"fmt"
7+
"math/big"
78
"os"
89
"syscall"
910

10-
"math/big"
11-
1211
"github.com/labstack/gommon/log"
1312
"golang.org/x/crypto/bcrypt"
1413
"golang.org/x/crypto/ssh/terminal"

runner/Gopkg.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ignored = [
22
"github.com/user/project/pkgX",
33
"bitbucket.org/user/project/pkgA/pkgY",
4-
"github.com/gedorinku/koneko-online-judge/server*"
4+
"github.com/ProgrammingLab/koneko-online-judge/server*"
55
]
66

77
[prune]

runner/executor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"syscall"
1212
"time"
1313

14-
"github.com/gedorinku/koneko-online-judge/server/modules/workers"
14+
"github.com/ProgrammingLab/koneko-online-judge/server/modules/workers"
1515
"github.com/labstack/gommon/log"
1616
)
1717

server/conf/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package conf
22

33
import (
44
"github.com/BurntSushi/toml"
5-
"github.com/gedorinku/koneko-online-judge/server/logger"
5+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
66
)
77

88
type Config struct {

server/controllers/check_login.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/http"
55
"strings"
66

7-
"github.com/gedorinku/koneko-online-judge/server/models"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
88
"github.com/labstack/echo"
99
)
1010

server/controllers/contest_problems.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package controllers
33
import (
44
"net/http"
55

6-
"github.com/gedorinku/koneko-online-judge/server/logger"
7-
"github.com/gedorinku/koneko-online-judge/server/models"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
88
"github.com/labstack/echo"
99
)
1010

server/controllers/contests.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strconv"
66
"time"
77

8-
"github.com/gedorinku/koneko-online-judge/server/logger"
9-
"github.com/gedorinku/koneko-online-judge/server/models"
8+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
9+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
1010
"github.com/labstack/echo"
1111
)
1212

server/controllers/job_status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package controllers
33
import (
44
"net/http"
55

6-
"github.com/gedorinku/koneko-online-judge/server/models"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
77
"github.com/gocraft/work"
88
"github.com/labstack/echo"
99
)

server/controllers/languages.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package controllers
33
import (
44
"net/http"
55

6-
"github.com/gedorinku/koneko-online-judge/server/models"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
77
"github.com/labstack/echo"
88
)
99

server/controllers/password_reset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package controllers
33
import (
44
"net/http"
55

6-
"github.com/gedorinku/koneko-online-judge/server/models"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
77
"github.com/labstack/echo"
88
)
99

server/controllers/problems.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/http"
66
"strconv"
77

8-
"github.com/gedorinku/koneko-online-judge/server/models"
8+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
99
"github.com/labstack/echo"
1010
)
1111

server/controllers/registrations.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strings"
77
"unicode"
88

9-
"github.com/gedorinku/koneko-online-judge/server/logger"
10-
"github.com/gedorinku/koneko-online-judge/server/models"
9+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
10+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
1111
"github.com/labstack/echo"
1212
)
1313

server/controllers/sessions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package controllers
33
import (
44
"net/http"
55

6-
"github.com/gedorinku/koneko-online-judge/server/models"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
77
"github.com/labstack/echo"
88
)
99

server/controllers/submissions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/http"
55
"strconv"
66

7-
"github.com/gedorinku/koneko-online-judge/server/models"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
88
"github.com/labstack/echo"
99
)
1010

server/controllers/users.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package controllers
33
import (
44
"net/http"
55

6-
"github.com/gedorinku/koneko-online-judge/server/models"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
77
"github.com/labstack/echo"
88
)
99

server/controllers/white_emails.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"net/http"
55
"strconv"
66

7-
"github.com/gedorinku/koneko-online-judge/server/logger"
8-
"github.com/gedorinku/koneko-online-judge/server/models"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
8+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
99
"github.com/jinzhu/gorm"
1010
"github.com/labstack/echo"
1111
)

server/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package main
33
import (
44
"os"
55

6-
"github.com/gedorinku/koneko-online-judge/server/conf"
7-
"github.com/gedorinku/koneko-online-judge/server/controllers"
8-
"github.com/gedorinku/koneko-online-judge/server/logger"
9-
"github.com/gedorinku/koneko-online-judge/server/models"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/conf"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/controllers"
8+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
9+
"github.com/ProgrammingLab/koneko-online-judge/server/models"
1010
"github.com/labstack/echo"
1111
"github.com/labstack/echo/middleware"
1212
"github.com/labstack/gommon/log"

server/models/case_set.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/gedorinku/koneko-online-judge/server/logger"
11+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
1212
"github.com/pkg/errors"
1313
)
1414

server/models/contest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"sort"
55
"time"
66

7-
"github.com/gedorinku/koneko-online-judge/server/logger"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
88
"github.com/jinzhu/gorm"
99
"github.com/pkg/errors"
1010
)

server/models/contest_judgement_status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package models
33
import (
44
"time"
55

6-
"github.com/gedorinku/koneko-online-judge/server/logger"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
77
)
88

99
type ContestJudgementStatus struct {

server/models/db.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package models
33
import (
44
"fmt"
55

6-
"github.com/gedorinku/koneko-online-judge/server/conf"
7-
"github.com/gedorinku/koneko-online-judge/server/logger"
8-
"github.com/gedorinku/koneko-online-judge/server/modules/unique"
96
"github.com/jinzhu/gorm"
107
_ "github.com/jinzhu/gorm/dialects/mysql"
118
"golang.org/x/crypto/bcrypt"
9+
10+
"github.com/ProgrammingLab/koneko-online-judge/server/conf"
11+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
12+
"github.com/ProgrammingLab/koneko-online-judge/server/modules/unique"
1213
)
1314

1415
var db *gorm.DB

server/models/email_confirmation.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/gedorinku/koneko-online-judge/server/logger"
8-
"github.com/gedorinku/koneko-online-judge/server/modules/nekomail"
9-
"github.com/gedorinku/koneko-online-judge/server/modules/unique"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
8+
"github.com/ProgrammingLab/koneko-online-judge/server/modules/nekomail"
9+
"github.com/ProgrammingLab/koneko-online-judge/server/modules/unique"
1010
)
1111

1212
type EmailConfirmation struct {

server/models/job.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package models
22

33
import (
4-
"github.com/gedorinku/koneko-online-judge/server/conf"
5-
"github.com/gedorinku/koneko-online-judge/server/logger"
4+
"github.com/ProgrammingLab/koneko-online-judge/server/conf"
5+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
66
"github.com/gocraft/work"
77
"github.com/gomodule/redigo/redis"
88
)

server/models/judge_set_result.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"sort"
55
"time"
66

7-
"github.com/gedorinku/koneko-online-judge/server/logger"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
88
)
99

1010
type JudgeSetResult struct {

server/models/judgement_evaluator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package models
33
import (
44
"sort"
55

6-
"github.com/gedorinku/koneko-online-judge/server/modules/workers"
6+
"github.com/ProgrammingLab/koneko-online-judge/server/modules/workers"
77
)
88

99
type evaluator interface {

server/models/judgement_job.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"strconv"
1111
"time"
1212

13-
"github.com/gedorinku/koneko-online-judge/server/logger"
14-
"github.com/gedorinku/koneko-online-judge/server/modules/workers"
13+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
14+
"github.com/ProgrammingLab/koneko-online-judge/server/modules/workers"
1515
"github.com/gocraft/work"
1616
"github.com/pkg/errors"
1717
)

server/models/password_reset.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/gedorinku/koneko-online-judge/server/logger"
8-
"github.com/gedorinku/koneko-online-judge/server/modules/nekomail"
9-
"github.com/gedorinku/koneko-online-judge/server/modules/unique"
7+
"github.com/ProgrammingLab/koneko-online-judge/server/logger"
8+
"github.com/ProgrammingLab/koneko-online-judge/server/modules/nekomail"
9+
"github.com/ProgrammingLab/koneko-online-judge/server/modules/unique"
1010
"github.com/pkg/errors"
1111
)
1212

0 commit comments

Comments
 (0)