Release 3.2.3

Go 1.16 update (#1010 )
Merge pull request #1009 from amir20/dependabot/go_modules/github.com/sirupsen/logrus-1.7.1
2026-08-07 14:04:44 +00:00 · 2021-02-17 09:53:43 -08:00 · 2021-02-17 07:28:00 -08:00 · 2021-02-16 13:23:49 +00:00 · 2021-02-16 13:17:50 +00:00 · 2021-02-15 14:24:28 +00:00
16 changed files with 675 additions and 679 deletions
@@ -23,7 +23,7 @@ jobs:
      - name: Install Go
        uses: actions/setup-go@v1
        with:
-          go-version: 1.15.x
+          go-version: 1.16.x
      - name: Checkout code
        uses: actions/checkout@v2
      - name: Run Go Tests with Coverage
@@ -20,7 +20,7 @@ jobs:
      - name: Install Go
        uses: actions/setup-go@v1
        with:
-          go-version: 1.15.x
+          go-version: 1.16.x
      - name: Checkout code
        uses: actions/checkout@v2
      - name: Run Go Tests with Coverage
@@ -32,6 +32,6 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v2
      - name: Build images
-        run: docker-compose -f integration/docker-compose.test.yml build  
+        run: docker-compose -f integration/docker-compose.test.yml build
      - name: Run tests
        run: docker-compose -f integration/docker-compose.test.yml run integration
@@ -1 +1 @@
-_
+_
@@ -18,7 +18,7 @@ COPY assets ./assets
 # Do the build
 RUN yarn build

-FROM golang:1.15-alpine AS builder
+FROM golang:1.16-alpine AS builder

 RUN apk add --no-cache git ca-certificates
 RUN mkdir /dozzle
@@ -148,11 +148,15 @@ func (d *dockerClient) ContainerStats(ctx context.Context, id string, stats chan
 			)

 			if cpuPercent > 0 || memUsage > 0 {
-				stats <- ContainerStat{
+				select {
+				case <-ctx.Done():
+					return
+				case stats <- ContainerStat{
 					ID:            id,
 					CPUPercent:    cpuPercent,
 					MemoryPercent: memPercent,
 					MemoryUsage:   memUsage,
+				}:
 				}
 			}
 		}
@@ -5,7 +5,7 @@ require (
 	github.com/beme/abide v0.0.0-20190723115211-635a09831760
 	github.com/containerd/containerd v1.4.3 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/docker/docker v20.10.2+incompatible
+	github.com/docker/docker v20.10.3+incompatible
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/dustin/go-humanize v1.0.0
@@ -25,14 +25,14 @@ require (
 	github.com/pelletier/go-toml v1.8.1 // indirect
 	github.com/rogpeppe/go-internal v1.6.2 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/sirupsen/logrus v1.7.0
+	github.com/sirupsen/logrus v1.7.1
 	github.com/spf13/afero v1.5.1 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/objx v0.3.0 // indirect
-	github.com/stretchr/testify v1.6.1
+	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20201216054612-986b41b23924 // indirect
 	golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e // indirect
 	golang.org/x/text v0.3.4 // indirect
@@ -55,8 +55,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v20.10.2+incompatible h1:vFgEHPqWBTp4pTjdLwjAA4bSo3gvIGOYwuJTlEjVBCw=
-github.com/docker/docker v20.10.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.3+incompatible h1:+HS4XO73J41FpA260ztGujJ+0WibrA2TPJEnWNSyGNE=
+github.com/docker/docker v20.10.3+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.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
@@ -186,6 +186,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 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/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g=
+github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -260,8 +262,8 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.7.1 h1:rsizeFmZP+GYwyb4V6t6qpG7ZNWzA2bvgW/yC2xHCcg=
+github.com/sirupsen/logrus v1.7.1/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
@@ -299,8 +301,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
@@ -10,7 +10,7 @@
 "dependencies": {
  "jest": "^26.0.1",
  "jest-image-snapshot": "^4.0.0",
-  "puppeteer": "^5.0.0"
+  "puppeteer": "^7.0.1"
 },
 "jest": {
  "preset": "jest-puppeteer",
@@ -674,10 +674,12 @@ acorn@^7.1.1:
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==

-agent-base@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"

 ajv@^6.5.5:
  version "6.12.0"
@@ -1318,10 +1320,10 @@ detect-newline@^3.0.0:
  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==

-devtools-protocol@0.0.818844:
-  version "0.0.818844"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.818844.tgz#d1947278ec85b53e4c8ca598f607a28fa785ba9e"
-  integrity sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==
+devtools-protocol@0.0.847576:
+  version "0.0.847576"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.847576.tgz#2f201bfb68aa9ef4497199fbd7f5d5dfde3b200b"
+  integrity sha512-0M8kobnSQE0Jmly7Mhbeq0W/PpZfnuK+WjN2ZRVPbGqYwCHCioAVp84H0TcLimgECcN5H976y5QiXMGBC9JKmg==

 diff-sequences@^26.6.2:
  version "26.6.2"
@@ -1867,12 +1869,12 @@ http-signature@~1.2.0:
    jsprim "^1.2.2"
    sshpk "^1.7.0"

-https-proxy-agent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
  dependencies:
-    agent-base "5"
+    agent-base "6"
    debug "4"

 human-signals@^1.1.1:
@@ -3202,7 +3204,7 @@ prompts@^2.0.1, prompts@^2.3.0:
    kleur "^3.0.3"
    sisteransi "^1.0.4"

-proxy-from-env@^1.0.0:
+proxy-from-env@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
@@ -3225,19 +3227,19 @@ punycode@^2.1.0, punycode@^2.1.1:
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==

-puppeteer@^5.0.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-5.5.0.tgz#331a7edd212ca06b4a556156435f58cbae08af00"
-  integrity sha512-OM8ZvTXAhfgFA7wBIIGlPQzvyEETzDjeRa4mZRCRHxYL+GNH5WAuYUQdja3rpWZvkX/JKqmuVgbsxDNsDFjMEg==
+puppeteer@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-7.1.0.tgz#ae37f48ee13f157c5b9255d580ffe4c5c1298679"
+  integrity sha512-lqOLzqCKdh7yUAHvK6LxgOpQrL8Bv1/jvS8MLDXxcNms2rlM3E8p/Wlwc7efbRZ0twxTzUeqjN5EqrTwxOwc9g==
  dependencies:
    debug "^4.1.0"
-    devtools-protocol "0.0.818844"
+    devtools-protocol "0.0.847576"
    extract-zip "^2.0.0"
-    https-proxy-agent "^4.0.0"
+    https-proxy-agent "^5.0.0"
    node-fetch "^2.6.1"
    pkg-dir "^4.2.0"
    progress "^2.0.1"
-    proxy-from-env "^1.0.0"
+    proxy-from-env "^1.1.0"
    rimraf "^3.0.2"
    tar-fs "^2.0.0"
    unbzip2-stream "^1.3.3"
@@ -1,6 +1,6 @@
 {
 "name": "dozzle",
- "version": "3.2.1",
+ "version": "3.2.3",
 "description": "Realtime log viewer for docker containers. ",
 "scripts": {
  "prestart": "yarn clean",
@@ -30,10 +30,10 @@
 "dependencies": {
  "ansi-to-html": "^0.6.14",
  "buefy": "^0.9.4",
-  "bulma": "^0.9.1",
-  "date-fns": "^2.16.1",
+  "bulma": "^0.9.2",
+  "date-fns": "^2.17.0",
  "dompurify": "^2.2.6",
-  "hotkeys-js": "^3.8.1",
+  "hotkeys-js": "^3.8.2",
  "lodash.debounce": "^4.0.8",
  "lodash.throttle": "^4.1.1",
  "semver": "^7.3.4",
@@ -41,42 +41,42 @@
  "store": "^2.0.12",
  "vue": "^2.6.12",
  "vue-meta": "^2.4.0",
-  "vue-router": "^3.4.9",
-  "vuex": "^3.6.0"
+  "vue-router": "^3.5.1",
+  "vuex": "^3.6.2"
 },
 "devDependencies": {
-  "@babel/core": "^7.12.10",
-  "@babel/plugin-transform-runtime": "^7.12.10",
+  "@babel/core": "^7.12.16",
+  "@babel/plugin-transform-runtime": "^7.12.15",
  "@vue/component-compiler-utils": "^3.2.0",
-  "@vue/test-utils": "^1.1.2",
-  "autoprefixer": "^10.2.0",
+  "@vue/test-utils": "^1.1.3",
+  "autoprefixer": "^10.2.4",
  "babel-core": "^7.0.0-bridge.0",
  "babel-jest": "^26.6.3",
  "babel-preset-env": "^1.7.0",
-  "caniuse-lite": "^1.0.30001173",
-  "css-loader": "^5.0.1",
+  "caniuse-lite": "^1.0.30001187",
+  "css-loader": "^5.0.2",
  "eventsourcemock": "^2.0.0",
-  "html-webpack-plugin": "^4.5.1",
-  "husky": "^5.0.6",
+  "html-webpack-plugin": "^5.1.0",
+  "husky": "^5.0.9",
  "jest": "^26.6.3",
  "jest-serializer-vue": "^2.0.2",
-  "lint-staged": "^10.5.3",
-  "mini-css-extract-plugin": "^1.3.3",
+  "lint-staged": "^10.5.4",
+  "mini-css-extract-plugin": "^1.3.7",
  "npm-run-all": "^4.1.5",
-  "postcss": "^8.2.2",
-  "postcss-loader": "^4.1.0",
+  "postcss": "^8.2.6",
+  "postcss-loader": "^5.0.0",
  "prettier": "^2.2.1",
-  "release-it": "^14.2.2",
-  "sass": "^1.32.0",
-  "sass-loader": "^10.1.0",
+  "release-it": "^14.4.0",
+  "sass": "^1.32.7",
+  "sass-loader": "^11.0.1",
  "vue-hot-reload-api": "^2.3.4",
  "vue-jest": "^3.0.7",
  "vue-loader": "^15.9.6",
  "vue-style-loader": "^4.1.2",
  "vue-template-compiler": "^2.6.12",
-  "webpack": "^5.11.1",
-  "webpack-cli": "^4.3.1",
-  "webpack-dev-server": "^3.11.1",
+  "webpack": "^5.22.0",
+  "webpack-cli": "^4.5.0",
+  "webpack-dev-server": "^3.11.2",
  "webpack-pwa-manifest": "^4.3.0"
 },
 "lint-staged": {
@@ -29,7 +29,7 @@ Connection: close
 Content-Security-Policy: default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline' fonts.googleapis.com; img-src 'self'; manifest-src 'self'; font-src fonts.gstatic.com; connect-src 'self' api.github.com; require-trusted-types-for 'script'
 Content-Type: text/plain; charset=utf-8

-dev compiled with go1.15.6
+dev

 /* snapshot: Test_handler_streamEvents_error */
 HTTP/1.1 200 OK
@@ -9,6 +9,7 @@ import (
 	"html/template"
 	"io"
 	"net/http"
+	_ "net/http/pprof"
 	"runtime"
 	"strings"

@@ -60,7 +61,13 @@ func createRouter(h *handler) *mux.Router {
 	s.HandleFunc("/api/logs", h.fetchLogsBetweenDates)
 	s.HandleFunc("/api/events/stream", h.streamEvents)
 	s.HandleFunc("/version", h.version)
+
+	if log.IsLevelEnabled(log.DebugLevel) {
+		s.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
+	}
+
 	s.PathPrefix("/").Handler(http.StripPrefix(base, http.HandlerFunc(h.index)))
+
 	return r
 }

@@ -299,7 +306,7 @@ func (h *handler) streamEvents(w http.ResponseWriter, r *http.Request) {
 }

 func (h *handler) version(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintf(w, "%v compiled with %v", h.config.Version, runtime.Version())
+	fmt.Fprintf(w, "%v", h.config.Version)
 }

 func sendContainersJSON(client docker.Client, w http.ResponseWriter) error {