Update readme for memory consumption on ARM devices (#1967 )

Update dependency unplugin-auto-import to ^0.12.0 (#1966 )
Update cypress/included Docker tag to v11.2.0 (#1961 )
2022-11-25 20:19:39 -08:00 · 2022-11-25 09:56:19 -08:00 · 2022-11-23 06:34:10 -08:00 · 2022-11-23 06:33:56 -08:00 · 2022-11-15 15:40:58 -08:00 · 2022-11-15 13:05:01 -08:00
15 changed files with 367 additions and 307 deletions
--- a/.github/.kodiak.toml
+++ b/.github/.kodiak.toml
@@ -1,2 +0,0 @@
-version = 1
-merge.notify_on_conflict = false
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,47 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    labels:
-      - "dependencies"
-      - "automerge"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "docker"
-    directory: "/"
-    labels:
-      - "dependencies"
-      - "automerge"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: gomod
-    directory: "/"
-    labels:
-      - "gomod"
-      - "dependencies"
-      - "automerge"
-    schedule:
-      interval: daily
-  - package-ecosystem: npm
-    directory: "/"
-    labels:
-      - "npm"
-      - "dependencies"
-      - "automerge"
-    schedule:
-      interval: daily
-  - package-ecosystem: npm
-    directory: "/e2e"
-    labels:
-      - "npm"
-      - "dependencies"
-      - "automerge"
-    schedule:
-      interval: daily
-  - package-ecosystem: "docker"
-    directory: "/e2e"
-    labels:
-      - "dependencies"
-      - "automerge"
-    schedule:
-      interval: "daily"
--- a/.npmrc
+++ b/.npmrc
@@ -1 +0,0 @@
-shamefully-hoist=true
--- a/README.md
+++ b/README.md
@@ -183,6 +183,26 @@ Dozzle has a [special route](https://github.com/amir20/dozzle/blob/master/assets

 </details>

+<details>
+ <summary>I installed Dozzle but memory consumption doesn't show up!</summary>
+
+*This is an issue specific to ARM devices*
+
+Dozzle uses the Docker API to gather information about the containers' memory usage. If the memory usage is not showing up, then it is likely that the Docker API is not returning the memory usage.
+
+You can verify this by running `docker info`, and you should see the following:
+```
+WARNING: No memory limit support
+WARNING: No swap limit support
+```
+
+In this case, you'll need to add the following line to your `/boot/cmdline.txt` file and reboot your device.
+```
+cgroup_enable=cpuset cgroup_enable=memory cgroup_memory=1
+```
+
+</details>
+
 ## License

 [MIT](LICENSE)
--- a/assets/components/MobileMenu.vue
+++ b/assets/components/MobileMenu.vue
@@ -24,6 +24,36 @@
      </div>
    </div>

+    <div class="menu-label level is-mobile is-hidden-mobile" :class="{ 'is-active': showNav }">
+      <div class="level-item has-text-centered">
+        <div>
+          <button class="button is-small is-rounded" @click="$emit('search')" :title="$t('tooltip.search')">
+            <span class="icon">
+              <mdi-light-magnify />
+            </span>
+          </button>
+        </div>
+      </div>
+      <div class="level-item has-text-centered">
+        <div>
+          <router-link :to="{ name: 'settings' }" active-class="is-active" class="button is-small is-rounded">
+            <span class="icon">
+              <mdi-light-cog />
+            </span>
+          </router-link>
+        </div>
+      </div>
+      <div class="level-item has-text-centered" v-if="secured">
+        <div>
+          <a class="button is-small is-rounded" :href="`${base}/logout`" :title="$t('button.logout')">
+            <span class="icon">
+              <mdi-light-logout />
+            </span>
+          </a>
+        </div>
+      </div>
+    </div>
+
    <p class="menu-label is-hidden-mobile" :class="{ 'is-active': showNav }">{{ $t("label.containers") }}</p>
    <ul class="menu-list is-hidden-mobile" :class="{ 'is-active': showNav }">
      <li v-for="item in visibleContainers" :key="item.id">
@@ -42,6 +72,7 @@
 </template>

 <script lang="ts" setup>
+const { base, secured } = config;
 const store = useContainerStore();
 const route = useRoute();
 const { visibleContainers, allContainersById } = storeToRefs(store);
@@ -63,6 +94,10 @@ aside {
  max-height: 100vh;
  overflow: auto;

+  .level.is-hidden-mobile.is-active {
+    display: flex !important;
+  }
+
  .menu-label {
    margin-top: 1em;
  }
--- a/assets/layouts/default.vue
+++ b/assets/layouts/default.vue
@@ -1,6 +1,6 @@
 <template>
  <main v-if="!authorizationNeeded">
-    <mobile-menu v-if="isMobile"></mobile-menu>
+    <mobile-menu v-if="isMobile" @search="showFuzzySearch"></mobile-menu>
    <splitpanes @resized="onResized($event)">
      <pane min-size="10" :size="menuWidth" v-if="!isMobile && !collapseNav">
        <side-menu @search="showFuzzySearch"></side-menu>
--- a/assets/pages/index.vue
+++ b/assets/pages/index.vue
@@ -1,13 +1,6 @@
 <template>
  <div>
-    <section class="is-small mt-1" v-if="secured && isMobile">
-      <div class="container">
-        <div class="ml-1">
-          <a class="button is-primary is-small" :href="`${base}/logout`">{{ $t("button.logout") }}</a>
-        </div>
-      </div>
-    </section>
-    <section class="level section">
+    <section class="level section pb-0-is-mobile">
      <div class="level-item has-text-centered">
        <div>
          <p class="title">{{ containers.length }}</p>
@@ -40,7 +33,7 @@
      </div>
    </section>

-    <section class="columns is-centered section is-marginless">
+    <section class="columns is-centered section is-marginless pt-0-is-mobile">
      <div class="column is-12-mobile is-6-tablet is-5-desktop is-4-fullhd">
        <div class="panel">
          <p class="panel-heading">{{ $t("label.containers") }}</p>
@@ -160,6 +153,16 @@ function onEnter() {
  }
 }

+@media screen and (max-width: 768px) {
+  .pb-0-is-mobile {
+    padding-bottom: 0 !important;
+  }
+
+  .pt-0-is-mobile {
+    padding-top: 0 !important;
+  }
+}
+
 .icon {
  padding: 10px 3px;
 }
--- a/e2e/Dockerfile
+++ b/e2e/Dockerfile
@@ -1,4 +1,4 @@
-FROM cypress/included:10.11.0
+FROM cypress/included:11.2.0

 RUN apt install curl && curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm

--- a/e2e/package.json
+++ b/e2e/package.json
@@ -6,8 +6,8 @@
  },
  "license": "ISC",
  "dependencies": {
-    "@frsource/cypress-plugin-visual-regression-diff": "^3.0.2",
-    "cypress": "^10.11.0",
+    "@frsource/cypress-plugin-visual-regression-diff": "^3.1.2",
+    "cypress": "^11.0.0",
    "typescript": "^4.8.4"
  }
 }
--- a/e2e/pnpm-lock.yaml
+++ b/e2e/pnpm-lock.yaml
@@ -1,13 +1,13 @@
 lockfileVersion: 5.4

 specifiers:
-  '@frsource/cypress-plugin-visual-regression-diff': ^3.0.2
-  cypress: ^10.11.0
+  '@frsource/cypress-plugin-visual-regression-diff': ^3.1.2
+  cypress: ^11.0.0
  typescript: ^4.8.4

 dependencies:
-  '@frsource/cypress-plugin-visual-regression-diff': 3.0.2_cypress@10.11.0
-  cypress: 10.11.0
+  '@frsource/cypress-plugin-visual-regression-diff': 3.1.2_cypress@11.0.0
+  cypress: 11.0.0
  typescript: 4.8.4

 packages:
@@ -56,20 +56,20 @@ packages:
    resolution: {integrity: sha512-IphM1ro1cvV5CqJWzX/LvPJcUE26cwgt/zMtBdssvTrfSNhh9KjfS2VXTA8SivkvPHK1DsdPnoMoXitmx8c3Cg==}
    dev: false

-  /@frsource/cypress-plugin-visual-regression-diff/3.0.2_cypress@10.11.0:
-    resolution: {integrity: sha512-2KvHg6M5FFe1DPjnHtOjBHsAjsrHK4JNdv2dSutiOGe3LX5ji3H+4zs1j8n9BPVTdILXhYrG6lT8jcRyquHl2w==}
+  /@frsource/cypress-plugin-visual-regression-diff/3.1.2_cypress@11.0.0:
+    resolution: {integrity: sha512-Tl04uSoyRyt/mUBEWnU49ZOYtQNRJIel6DwrBADGfohgQ81AGBTbO7yXOhVqIrUZ/PIJaAJG2J2vw6MDw1ObmA==}
    engines: {node: '>=10'}
    peerDependencies:
      cypress: '>=4.5.0'
    dependencies:
      '@frsource/base64': 1.0.4
-      cypress: 10.11.0
+      cypress: 11.0.0
      glob: 8.0.3
      meta-png: 1.0.3
      move-file: 2.1.0
      pixelmatch: 5.3.0
      pngjs: 6.0.0
-      sharp: 0.31.1
+      sharp: 0.31.2
    dev: false

  /@types/node/14.18.33:
@@ -342,8 +342,8 @@ packages:
      which: 2.0.2
    dev: false

-  /cypress/10.11.0:
-    resolution: {integrity: sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==}
+  /cypress/11.0.0:
+    resolution: {integrity: sha512-mYXGi2Wjmy9shRjAUDugSMOr4uuzE2nl7hXQi3oQkIQsnwwBx2HNB8Vbfsix3A0zyPXlL5jTcbb6rCVWKRaXbg==}
    engines: {node: '>=12.0.0'}
    hasBin: true
    requiresBuild: true
@@ -1068,7 +1068,7 @@ packages:
  /rxjs/7.5.7:
    resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
    dependencies:
-      tslib: 2.4.0
+      tslib: 2.4.1
    dev: false

  /safe-buffer/5.2.1:
@@ -1087,8 +1087,8 @@ packages:
      lru-cache: 6.0.0
    dev: false

-  /sharp/0.31.1:
-    resolution: {integrity: sha512-GR8M1wBwOiFKLkm9JPun27OQnNRZdHfSf9VwcdZX6UrRmM1/XnOrLFTF0GAil+y/YK4E6qcM/ugxs80QirsHxg==}
+  /sharp/0.31.2:
+    resolution: {integrity: sha512-DUdNVEXgS5A97cTagSLIIp8dUZ/lZtk78iNVZgHdHbx1qnQR7JAHY0BnXnwwH39Iw+VKhO08CTYhIg0p98vQ5Q==}
    engines: {node: '>=14.15.0'}
    requiresBuild: true
    dependencies:
@@ -1259,8 +1259,8 @@ packages:
      punycode: 2.1.1
    dev: false

-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
+  /tslib/2.4.1:
+    resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
    dev: false

  /tunnel-agent/0.6.0:
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.0
-	github.com/spf13/afero v1.9.2
+	github.com/spf13/afero v1.9.3
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/stretchr/testify v1.8.1
 	golang.org/x/net v0.0.0-20211104170005-ce137452f963 // indirect
@@ -40,4 +40,4 @@ require (
 	gotest.tools/v3 v3.0.3 // indirect
 )

-go 1.18
+go 1.19
--- a/go.sum
+++ b/go.sum
@@ -183,6 +183,8 @@ github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
 github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
+github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "dozzle",
-  "version": "4.4.0",
+  "version": "4.4.1",
  "description": "Realtime log viewer for docker containers. ",
  "homepage": "https://github.com/amir20/dozzle#readme",
  "bugs": {
@@ -22,16 +22,16 @@
    "postinstall": "husky install"
  },
  "dependencies": {
-    "@iconify-json/carbon": "^1.1.9",
+    "@iconify-json/carbon": "^1.1.10",
    "@iconify-json/cil": "^1.1.2",
    "@iconify-json/mdi": "^1.1.34",
    "@iconify-json/mdi-light": "^1.1.2",
    "@iconify-json/octicon": "^1.1.23",
    "@oruga-ui/oruga-next": "^0.5.8",
    "@oruga-ui/theme-bulma": "^0.2.7",
-    "@vueuse/core": "^9.4.0",
-    "@vueuse/integrations": "^9.4.0",
-    "@vueuse/router": "^9.4.0",
+    "@vueuse/core": "^9.5.0",
+    "@vueuse/integrations": "^9.5.0",
+    "@vueuse/router": "^9.5.0",
    "ansi-to-html": "^0.7.2",
    "bulma": "^0.9.4",
    "d3-array": "^3.2.0",
@@ -46,7 +46,7 @@
    "pinia": "^2.0.23",
    "semver": "^7.3.8",
    "splitpanes": "^3.1.5",
-    "vue": "^3.2.41",
+    "vue": "^3.2.45",
    "vue-i18n": "^9.2.2",
    "vue-router": "^4.1.6"
  },
@@ -63,27 +63,27 @@
    "@types/node": "^18.11.9",
    "@types/semver": "^7.3.13",
    "@vitejs/plugin-vue": "3.2.0",
-    "@vue/compiler-sfc": "^3.2.41",
-    "@vue/test-utils": "^2.2.1",
+    "@vue/compiler-sfc": "^3.2.45",
+    "@vue/test-utils": "^2.2.2",
    "c8": "^7.12.0",
    "eventsourcemock": "^2.0.0",
-    "husky": "^8.0.1",
-    "jest-serializer-vue": "^2.0.2",
+    "husky": "^8.0.2",
+    "jest-serializer-vue": "^3.0.0",
    "jsdom": "^20.0.2",
    "lint-staged": "^13.0.3",
    "npm-run-all": "^4.1.5",
    "prettier": "^2.7.1",
    "release-it": "^15.5.0",
-    "sass": "^1.56.0",
+    "sass": "^1.56.1",
    "ts-node": "^10.9.1",
    "typescript": "^4.8.4",
-    "unplugin-auto-import": "^0.11.4",
+    "unplugin-auto-import": "^0.12.0",
    "unplugin-icons": "^0.14.13",
    "unplugin-vue-components": "^0.22.9",
-    "vite": "3.2.3",
+    "vite": "3.2.4",
    "vite-plugin-pages": "^0.27.1",
    "vite-plugin-vue-layouts": "^0.7.0",
-    "vitest": "^0.25.0",
+    "vitest": "^0.25.2",
    "vue-tsc": "^1.0.9"
  },
  "lint-staged": {
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/renovate.json
+++ b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}
Author	SHA1	Message	Date
IrwenXYZ	ae3283adda	Update readme for memory consumption on ARM devices (#1967 )	2022-11-25 20:19:39 -08:00
renovate[bot]	145158a925	Update dependency unplugin-auto-import to ^0.12.0 (#1966 )	2022-11-25 09:56:19 -08:00
renovate[bot]	e46e1a0814	Update cypress/included Docker tag to v11.2.0 (#1961 )	2022-11-23 06:34:10 -08:00
renovate[bot]	7a624cd065	Update dependency jest-serializer-vue to v3 (#1959 )	2022-11-23 06:33:56 -08:00
Amir Raminfar	fe7c8743b9	Removes depedenbot	2022-11-15 15:40:58 -08:00
renovate[bot]	ccc1aae78e	Update cypress/included Docker tag to v11.1.0 (#1958 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-11-15 13:05:01 -08:00
renovate[bot]	935e17c200	Update dependency vite to v3.2.4 (#1957 )	2022-11-15 07:11:03 -08:00
renovate[bot]	63bb1f24a3	Update module github.com/spf13/afero to v1.9.3 (#1954 )	2022-11-14 20:11:08 -08:00
renovate[bot]	cdc8189ad1	Update module go to 1.19 (#1955 )	2022-11-14 20:09:59 -08:00
renovate[bot]	f6daab2111	Add renovate.json (#1953 )	2022-11-14 19:43:38 -08:00
Amir Raminfar	7ed461e6ef	Removes npmrc and hositing is not needed anymore (#1952 )	2022-11-14 09:42:01 -08:00
Amir Raminfar	15636348b5	Updates modules	2022-11-10 09:35:11 -08:00
kodiakhq[bot]	a370ad48d5	Merge pull request #1950 from amir20/dependabot/docker/e2e/cypress/included-11.0.1 Bump cypress/included from 11.0.0 to 11.0.1 in /e2e	2022-11-10 09:11:52 +00:00
dependabot[bot]	8900631b20	Bump cypress/included from 11.0.0 to 11.0.1 in /e2e Bumps cypress/included from 11.0.0 to 11.0.1. --- updated-dependencies: - dependency-name: cypress/included dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-10 09:06:19 +00:00
Amir Raminfar	fa3ef24999	Updates cypress to 11.x (#1949 )	2022-11-09 09:11:02 -08:00
kodiakhq[bot]	deaf58c47b	Merge pull request #1948 from amir20/dependabot/docker/e2e/cypress/included-11.0.0 Bump cypress/included from 10.11.0 to 11.0.0 in /e2e	2022-11-09 09:11:24 +00:00
dependabot[bot]	1d4573a657	Bump cypress/included from 10.11.0 to 11.0.0 in /e2e Bumps cypress/included from 10.11.0 to 11.0.0. --- updated-dependencies: - dependency-name: cypress/included dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-09 09:07:24 +00:00
Amir Raminfar	84300fc734	Release 4.4.1	2022-11-08 15:10:14 -08:00
Dmitry Mazurov	2b9873e76b	Update mobile menu (#1946 )	2022-11-08 15:09:57 -08:00