mirror of
https://github.com/amir20/dozzle.git
synced 2026-01-01 10:37:26 +01:00
Merge remote-tracking branch 'origin/master' into jump-to-context
This commit is contained in:
Coteh
12
.github/workflows/deploy.yml
vendored
12
.github/workflows/deploy.yml
vendored
@@ -11,9 +11,9 @@ jobs:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2.4.0
|
||||
- name: Install Node
|
||||
uses: actions/setup-node@v2.5.1
|
||||
uses: actions/setup-node@v3
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v2.0.1
|
||||
uses: pnpm/action-setup@v2.2.1
|
||||
with:
|
||||
version: 6.20.1
|
||||
- name: Install dependencies
|
||||
@@ -25,7 +25,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v2.1.5
|
||||
uses: actions/setup-go@v2.2.0
|
||||
with:
|
||||
go-version: 1.17.x
|
||||
- name: Checkout code
|
||||
@@ -57,7 +57,7 @@ jobs:
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1.6.0
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v1.12.0
|
||||
uses: docker/login-action@v1.13.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
@@ -81,9 +81,9 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Node
|
||||
uses: actions/setup-node@v2.5.1
|
||||
uses: actions/setup-node@v3
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v2.0.1
|
||||
uses: pnpm/action-setup@v2.2.1
|
||||
with:
|
||||
version: 6.20.1
|
||||
- name: Install dependencies
|
||||
|
||||
2
.github/workflows/dev.yml
vendored
2
.github/workflows/dev.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1.6.0
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v1.12.0
|
||||
uses: docker/login-action@v1.13.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
|
||||
6
.github/workflows/test.yml
vendored
6
.github/workflows/test.yml
vendored
@@ -14,9 +14,9 @@ jobs:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2.4.0
|
||||
- name: Install Node
|
||||
uses: actions/setup-node@v2.5.1
|
||||
uses: actions/setup-node@v3
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v2.0.1
|
||||
uses: pnpm/action-setup@v2.2.1
|
||||
with:
|
||||
version: 6.20.1
|
||||
- name: Install dependencies
|
||||
@@ -28,7 +28,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v2.1.5
|
||||
uses: actions/setup-go@v2.2.0
|
||||
with:
|
||||
go-version: 1.17.x
|
||||
- name: Checkout code
|
||||
|
||||
@@ -21,7 +21,7 @@ RUN pnpm install -r --offline --prod
|
||||
# Do the build
|
||||
RUN pnpm build
|
||||
|
||||
FROM golang:1.17.6-alpine AS builder
|
||||
FROM golang:1.17.7-alpine AS builder
|
||||
|
||||
RUN apk add --no-cache git ca-certificates && mkdir /dozzle
|
||||
|
||||
|
||||
62
assets/components.d.ts
vendored
62
assets/components.d.ts
vendored
@@ -2,38 +2,38 @@
|
||||
// We suggest you to commit this file into source control
|
||||
// Read more: https://github.com/vuejs/vue-next/pull/3399
|
||||
|
||||
declare module 'vue' {
|
||||
declare module "vue" {
|
||||
export interface GlobalComponents {
|
||||
CarbonCaretDown: typeof import('~icons/carbon/caret-down')['default']
|
||||
CilColumns: typeof import('~icons/cil/columns')['default']
|
||||
CilFindInPage: typeof import('~icons/cil/find-in-page')['default']
|
||||
ContainerStat: typeof import('./components/ContainerStat.vue')['default']
|
||||
ContainerTitle: typeof import('./components/ContainerTitle.vue')['default']
|
||||
DropdownMenu: typeof import('./components/DropdownMenu.vue')['default']
|
||||
FuzzySearchModal: typeof import('./components/FuzzySearchModal.vue')['default']
|
||||
InfiniteLoader: typeof import('./components/InfiniteLoader.vue')['default']
|
||||
LogActionsToolbar: typeof import('./components/LogActionsToolbar.vue')['default']
|
||||
LogContainer: typeof import('./components/LogContainer.vue')['default']
|
||||
LogEventSource: typeof import('./components/LogEventSource.vue')['default']
|
||||
LogViewer: typeof import('./components/LogViewer.vue')['default']
|
||||
LogViewerWithSource: typeof import('./components/LogViewerWithSource.vue')['default']
|
||||
MdiDotsVertical: typeof import('~icons/mdi/dots-vertical')['default']
|
||||
MdiLightChevronDoubleDown: typeof import('~icons/mdi-light/chevron-double-down')['default']
|
||||
MdiLightChevronLeft: typeof import('~icons/mdi-light/chevron-left')['default']
|
||||
MdiLightChevronRight: typeof import('~icons/mdi-light/chevron-right')['default']
|
||||
MdiLightCog: typeof import('~icons/mdi-light/cog')['default']
|
||||
MdiLightMagnify: typeof import('~icons/mdi-light/magnify')['default']
|
||||
MobileMenu: typeof import('./components/MobileMenu.vue')['default']
|
||||
OcticonContainer24: typeof import('~icons/octicon/container24')['default']
|
||||
OcticonDownload24: typeof import('~icons/octicon/download24')['default']
|
||||
OcticonTrash24: typeof import('~icons/octicon/trash24')['default']
|
||||
PastTime: typeof import('./components/PastTime.vue')['default']
|
||||
RelativeTime: typeof import('./components/RelativeTime.vue')['default']
|
||||
ScrollableView: typeof import('./components/ScrollableView.vue')['default']
|
||||
ScrollProgress: typeof import('./components/ScrollProgress.vue')['default']
|
||||
Search: typeof import('./components/Search.vue')['default']
|
||||
SideMenu: typeof import('./components/SideMenu.vue')['default']
|
||||
CarbonCaretDown: typeof import("~icons/carbon/caret-down")["default"];
|
||||
CilColumns: typeof import("~icons/cil/columns")["default"];
|
||||
CilFindInPage: typeof import("~icons/cil/find-in-page")["default"];
|
||||
ContainerStat: typeof import("./components/ContainerStat.vue")["default"];
|
||||
ContainerTitle: typeof import("./components/ContainerTitle.vue")["default"];
|
||||
DropdownMenu: typeof import("./components/DropdownMenu.vue")["default"];
|
||||
FuzzySearchModal: typeof import("./components/FuzzySearchModal.vue")["default"];
|
||||
InfiniteLoader: typeof import("./components/InfiniteLoader.vue")["default"];
|
||||
LogActionsToolbar: typeof import("./components/LogActionsToolbar.vue")["default"];
|
||||
LogContainer: typeof import("./components/LogContainer.vue")["default"];
|
||||
LogEventSource: typeof import("./components/LogEventSource.vue")["default"];
|
||||
LogViewer: typeof import("./components/LogViewer.vue")["default"];
|
||||
LogViewerWithSource: typeof import("./components/LogViewerWithSource.vue")["default"];
|
||||
MdiDotsVertical: typeof import("~icons/mdi/dots-vertical")["default"];
|
||||
MdiLightChevronDoubleDown: typeof import("~icons/mdi-light/chevron-double-down")["default"];
|
||||
MdiLightChevronLeft: typeof import("~icons/mdi-light/chevron-left")["default"];
|
||||
MdiLightChevronRight: typeof import("~icons/mdi-light/chevron-right")["default"];
|
||||
MdiLightCog: typeof import("~icons/mdi-light/cog")["default"];
|
||||
MdiLightMagnify: typeof import("~icons/mdi-light/magnify")["default"];
|
||||
MobileMenu: typeof import("./components/MobileMenu.vue")["default"];
|
||||
OcticonContainer24: typeof import("~icons/octicon/container24")["default"];
|
||||
OcticonDownload24: typeof import("~icons/octicon/download24")["default"];
|
||||
OcticonTrash24: typeof import("~icons/octicon/trash24")["default"];
|
||||
PastTime: typeof import("./components/PastTime.vue")["default"];
|
||||
RelativeTime: typeof import("./components/RelativeTime.vue")["default"];
|
||||
ScrollableView: typeof import("./components/ScrollableView.vue")["default"];
|
||||
ScrollProgress: typeof import("./components/ScrollProgress.vue")["default"];
|
||||
Search: typeof import("./components/Search.vue")["default"];
|
||||
SideMenu: typeof import("./components/SideMenu.vue")["default"];
|
||||
}
|
||||
}
|
||||
|
||||
export { }
|
||||
export {};
|
||||
|
||||
6
go.mod
6
go.mod
@@ -2,7 +2,7 @@ module github.com/amir20/dozzle
|
||||
|
||||
require (
|
||||
github.com/Microsoft/go-winio v0.5.1 // indirect
|
||||
github.com/alexflint/go-arg v1.4.2
|
||||
github.com/alexflint/go-arg v1.4.3
|
||||
github.com/beme/abide v0.0.0-20190723115211-635a09831760
|
||||
github.com/containerd/containerd v1.5.7 // indirect
|
||||
github.com/docker/distribution v2.7.1+incompatible // indirect
|
||||
@@ -13,14 +13,14 @@ require (
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/gorilla/mux v1.8.0
|
||||
github.com/gorilla/sessions v1.2.1
|
||||
github.com/magiconair/properties v1.8.5
|
||||
github.com/magiconair/properties v1.8.6
|
||||
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
|
||||
github.com/morikuni/aec v1.0.0 // indirect
|
||||
github.com/opencontainers/go-digest v1.0.0 // indirect
|
||||
github.com/opencontainers/image-spec v1.0.1 // indirect
|
||||
github.com/sergi/go-diff v1.1.0 // indirect
|
||||
github.com/sirupsen/logrus v1.8.1
|
||||
github.com/spf13/afero v1.8.0
|
||||
github.com/spf13/afero v1.8.1
|
||||
github.com/stretchr/objx v0.3.0 // indirect
|
||||
github.com/stretchr/testify v1.7.0
|
||||
golang.org/x/net v0.0.0-20211104170005-ce137452f963 // indirect
|
||||
|
||||
13
go.sum
13
go.sum
@@ -81,10 +81,9 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/alexflint/go-arg v1.4.2 h1:lDWZAXxpAnZUq4qwb86p/3rIJJ2Li81EoMbTMujhVa0=
|
||||
github.com/alexflint/go-arg v1.4.2/go.mod h1:9iRbDxne7LcR/GSvEr7ma++GLpdIU1zrghf2y2768kM=
|
||||
github.com/alexflint/go-arg v1.4.3 h1:9rwwEBpMXfKQKceuZfYcwuc/7YY7tWJbFsgG5cAU/uo=
|
||||
github.com/alexflint/go-arg v1.4.3/go.mod h1:3PZ/wp/8HuqRZMUUgu7I+e1qcpUbvmS258mRXkFH4IA=
|
||||
github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
|
||||
github.com/alexflint/go-scalar v1.0.0/go.mod h1:GpHzbCOZXEKMEcygYQ5n/aa4Aq84zbxjy3MxYW0gjYw=
|
||||
github.com/alexflint/go-scalar v1.1.0 h1:aaAouLLzI9TChcPXotr6gUhq+Scr8rl0P9P4PnltbhM=
|
||||
github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
|
||||
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
|
||||
@@ -452,8 +451,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
|
||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||
github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
|
||||
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
|
||||
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
|
||||
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
|
||||
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
|
||||
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
|
||||
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
|
||||
@@ -594,8 +593,8 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
|
||||
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
|
||||
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
||||
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
|
||||
github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60=
|
||||
github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
|
||||
github.com/spf13/afero v1.8.1 h1:izYHOT71f9iZ7iq37Uqjael60/vYC6vMtzedudZ0zEk=
|
||||
github.com/spf13/afero v1.8.1/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
|
||||
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||
github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
||||
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
||||
|
||||
48
package.json
48
package.json
@@ -22,39 +22,39 @@
|
||||
"postinstall": "husky install"
|
||||
},
|
||||
"dependencies": {
|
||||
"@iconify-json/carbon": "^1.0.14",
|
||||
"@iconify-json/cil": "^1.0.1",
|
||||
"@iconify-json/mdi": "^1.0.15",
|
||||
"@iconify-json/mdi-light": "^1.0.1",
|
||||
"@iconify-json/octicon": "^1.0.9",
|
||||
"@oruga-ui/oruga-next": "^0.5.3",
|
||||
"@oruga-ui/theme-bulma": "^0.2.1",
|
||||
"@vitejs/plugin-vue": "^2.1.0",
|
||||
"@vue/compiler-sfc": "^3.2.29",
|
||||
"@vueuse/core": "^7.5.5",
|
||||
"@iconify-json/carbon": "^1.1.1",
|
||||
"@iconify-json/cil": "^1.1.0",
|
||||
"@iconify-json/mdi": "^1.1.0",
|
||||
"@iconify-json/mdi-light": "^1.1.0",
|
||||
"@iconify-json/octicon": "^1.1.1",
|
||||
"@oruga-ui/oruga-next": "^0.5.4",
|
||||
"@oruga-ui/theme-bulma": "^0.2.2",
|
||||
"@vitejs/plugin-vue": "^2.2.2",
|
||||
"@vue/compiler-sfc": "^3.2.31",
|
||||
"@vueuse/core": "^7.6.2",
|
||||
"ansi-to-html": "^0.7.2",
|
||||
"bulma": "^0.9.3",
|
||||
"date-fns": "^2.28.0",
|
||||
"fuzzysort": "^1.1.4",
|
||||
"fuzzysort": "^1.2.1",
|
||||
"hotkeys-js": "^3.8.7",
|
||||
"lodash.debounce": "^4.0.8",
|
||||
"pinia": "^2.0.11",
|
||||
"sass": "^1.49.1",
|
||||
"sass": "^1.49.8",
|
||||
"semver": "^7.3.5",
|
||||
"splitpanes": "^3.0.6",
|
||||
"splitpanes": "^3.1.1",
|
||||
"typescript": "^4.5.5",
|
||||
"unplugin-auto-import": "^0.5.11",
|
||||
"unplugin-icons": "^0.13.0",
|
||||
"unplugin-vue-components": "^0.17.15",
|
||||
"vite": "^2.7.13",
|
||||
"vue": "^3.2.26",
|
||||
"unplugin-auto-import": "^0.6.1",
|
||||
"unplugin-icons": "^0.13.2",
|
||||
"unplugin-vue-components": "^0.17.20",
|
||||
"vite": "^2.8.4",
|
||||
"vue": "^3.2.31",
|
||||
"vue-router": "^4.0.12"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@pinia/testing": "^0.0.9",
|
||||
"@types/jest": "^27.4.0",
|
||||
"@types/jest": "^27.4.1",
|
||||
"@types/lodash.debounce": "^4.0.6",
|
||||
"@types/node": "^17.0.13",
|
||||
"@types/node": "^17.0.21",
|
||||
"@types/semver": "^7.3.9",
|
||||
"@vue/test-utils": "^2.0.0-rc.18",
|
||||
"c8": "^7.11.0",
|
||||
@@ -62,12 +62,12 @@
|
||||
"husky": "^7.0.4",
|
||||
"jest-serializer-vue": "^2.0.2",
|
||||
"jsdom": "^19.0.0",
|
||||
"lint-staged": "^12.3.2",
|
||||
"lint-staged": "^12.3.4",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"prettier": "^2.5.1",
|
||||
"release-it": "^14.12.4",
|
||||
"ts-node": "^10.4.0",
|
||||
"vitest": "^0.2.5"
|
||||
"release-it": "^14.12.5",
|
||||
"ts-node": "^10.5.0",
|
||||
"vitest": "^0.5.4"
|
||||
},
|
||||
"lint-staged": {
|
||||
"*.{js,vue,css}": [
|
||||
|
||||
759
pnpm-lock.yaml
generated
759
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user