Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.2.3 #5

Merged
merged 4 commits into from
Dec 18, 2023
Merged

1.2.3 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3942e2
Bumped version to 1.2.3
salilponde Dec 18, 2023
9ca7e89
Username match should be case insensitive
salilponde Dec 18, 2023
95dbee6
Updated module name with github URL
salilponde Dec 18, 2023
9481703
Minor CSS fixes
salilponde Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
branches: ["main"]

env:
VERSION: "1.2.2"
VERSION: "1.2.3"

jobs:
docker:
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "dokemon/pkg/agent"
import "github.com/productiveops/dokemon/pkg/agent"

func main() {
agent.Main()
Expand Down
3 changes: 2 additions & 1 deletion cmd/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package main

import (
"dokemon/pkg/server"
"os"

"github.com/productiveops/dokemon/pkg/server"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module dokemon
module github.com/productiveops/dokemon

go 1.21

Expand Down
5 changes: 3 additions & 2 deletions pkg/agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package agent

import (
"dokemon/pkg/common"
"dokemon/pkg/messages"
"fmt"
"os"
"os/signal"
"strings"
"sync"
"time"

"github.com/productiveops/dokemon/pkg/common"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/gorilla/websocket"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package agent

import (
"dokemon/pkg/messages"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/gorilla/websocket"
)
Expand Down
3 changes: 2 additions & 1 deletion pkg/agent/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package agent

import (
"dokemon/pkg/messages"
"slices"
"strings"
"time"

"github.com/productiveops/dokemon/pkg/messages"

"github.com/rs/zerolog/log"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/tasks_compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package agent

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/gorilla/websocket"
"github.com/rs/zerolog/log"
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/tasks_container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package agent

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/gorilla/websocket"
"github.com/rs/zerolog/log"
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/tasks_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package agent

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/gorilla/websocket"
"github.com/rs/zerolog/log"
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/tasks_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package agent

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/gorilla/websocket"
"github.com/rs/zerolog/log"
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/tasks_volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package agent

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/gorilla/websocket"
"github.com/rs/zerolog/log"
Expand Down
2 changes: 1 addition & 1 deletion pkg/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package common

const Version = "1.2.2"
const Version = "1.2.3"
3 changes: 2 additions & 1 deletion pkg/dockerapi/compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package dockerapi
import (
"bufio"
"bytes"
"dokemon/pkg/server/store"
"encoding/json"
"fmt"
"io"
Expand All @@ -13,6 +12,8 @@ import (
"slices"
"sort"

"github.com/productiveops/dokemon/pkg/server/store"

"github.com/gabemarshall/pty"
"github.com/gorilla/websocket"
"github.com/rs/zerolog/log"
Expand Down
2 changes: 1 addition & 1 deletion pkg/dockerapi/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dockerapi

import "dokemon/pkg/server/store"
import "github.com/productiveops/dokemon/pkg/server/store"

// Containers

Expand Down
3 changes: 2 additions & 1 deletion pkg/server/handler/compose_library.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package handler

import (
"dokemon/pkg/server/model"
"strconv"

"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)

Expand Down
5 changes: 3 additions & 2 deletions pkg/server/handler/containers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package handler

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"errors"
"net/http"
"strconv"

"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/gorilla/websocket"
"github.com/labstack/echo/v4"
"github.com/rs/zerolog/log"
Expand Down
3 changes: 2 additions & 1 deletion pkg/server/handler/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package handler

import (
"dokemon/pkg/server/model"
"errors"
"strconv"

"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)

Expand Down
6 changes: 4 additions & 2 deletions pkg/server/handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package handler

import (
"dokemon/pkg/server/store"
"dokemon/web"
"net/http"
"time"

"github.com/productiveops/dokemon/web"

"github.com/productiveops/dokemon/pkg/server/store"

"github.com/labstack/echo/v4"
)

Expand Down
5 changes: 3 additions & 2 deletions pkg/server/handler/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package handler

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"errors"
"strconv"

"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/labstack/echo/v4"
)

Expand Down
5 changes: 3 additions & 2 deletions pkg/server/handler/networks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package handler

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"errors"
"strconv"

"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"

"github.com/labstack/echo/v4"
)

Expand Down
7 changes: 4 additions & 3 deletions pkg/server/handler/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package handler

import (
"dokemon/pkg/crypto"
"dokemon/pkg/crypto/ske"
"dokemon/pkg/server/model"
"encoding/json"
"errors"
"slices"
"strconv"
"time"

"github.com/productiveops/dokemon/pkg/crypto"
"github.com/productiveops/dokemon/pkg/crypto/ske"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)

Expand Down
9 changes: 5 additions & 4 deletions pkg/server/handler/node_compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package handler

import (
"dokemon/pkg/dockerapi"
"dokemon/pkg/messages"
"dokemon/pkg/server/model"
"dokemon/pkg/server/store"
"errors"
"strconv"

"github.com/productiveops/dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/messages"
"github.com/productiveops/dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/store"

"github.com/labstack/echo/v4"
"github.com/rs/zerolog/log"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/request_compose_library.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/request_docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/dockerapi"
"github.com/productiveops/dokemon/pkg/dockerapi"

"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/request_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/request_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/request_node_compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/request_setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/request_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/request_variable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/handler/request_variable_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package handler

import (
"dokemon/pkg/crypto/ske"
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/crypto/ske"
"github.com/productiveops/dokemon/pkg/server/model"

"github.com/labstack/echo/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/response_compose_library.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package handler

import "dokemon/pkg/server/model"
import "github.com/productiveops/dokemon/pkg/server/model"

type composeLibraryItemHead struct {
ProjectName string `json:"projectName"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/handler/response_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package handler

import (
"dokemon/pkg/server/model"
"github.com/productiveops/dokemon/pkg/server/model"
)

type environmentResponse struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/server/handler/response_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package handler

import (
"dokemon/pkg/server/model"
"time"

"github.com/productiveops/dokemon/pkg/server/model"
)

type nodeResponse struct {
Expand Down
Loading
Loading