Release 1.27.3

Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.2.9 to 10.2.10.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.2.9...v10.2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: amir20
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS, Windows or Mac Os]
+ - Docker version [e.g. `docker version`'s output]
+ - Browser & version [e.g. chrome, safari]
+ - Version [e.g. 1.26.1. Can be found at `<Dozzle-host>/version`]
+
+**If applicable include logs with `--level debug` and browser logs**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: amir20
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 20
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 3
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

Dockerfile

@@ -1,5 +1,5 @@
 # Build assets
-FROM node:13-alpine as node
+FROM node:current-alpine as node
 
 RUN apk add --no-cache git openssh python make g++ util-linux
 

Makefile

@@ -1,5 +1,5 @@
 TAG := $(shell git describe --tags)
-PLATFROMS := linux/amd64,linux/arm64,linux/arm/v7
+PLATFROMS := linux/amd64,linux/arm/v7,linux/arm64/v8
 
 .PHONY: publish
 publish:

README.md

@@ -81,7 +81,6 @@ Dozzle follows the [12-factor](https://12factor.net/) model. Configurations can
 | `--addr`     | `DOZZLE_ADDR`        | `:8080` |
 | `--base`     | `DOZZLE_BASE`        | `/`     |
 | `--level`    | `DOZZLE_LEVEL`       | `info`  |
-| `--showAll`  | `DOZZLE_SHOWALL`     | `false` |
 | n/a          | `DOCKER_API_VERSION` | not set |
 | `--tailSize` | `DOZZLE_TAILSIZE`    | `300`   |
 | `--filter`   | `DOZZLE_FILTER`      | `""`    |

__snapshots__/dozzle.snapshot

@@ -1,7 +1,7 @@
 /* snapshot: Test_createRoutes_foobar */
 HTTP/1.1 200 OK
 Connection: close
-Content-Security-Policy: default-src 'none'; script-src 'self'; style-src 'self' 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-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
 
 foo page
@@ -9,7 +9,7 @@ foo page
 /* snapshot: Test_createRoutes_index */
 HTTP/1.1 200 OK
 Connection: close
-Content-Security-Policy: default-src 'none'; script-src 'self'; style-src 'self' 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-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
 
 index page
@@ -17,7 +17,7 @@ index page
 /* snapshot: Test_createRoutes_redirect */
 HTTP/1.1 301 Moved Permanently
 Connection: close
-Content-Security-Policy: default-src 'none'; script-src 'self'; style-src 'self' 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-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/html; charset=utf-8
 Location: /foobar/
 
@@ -26,7 +26,7 @@ Location: /foobar/
 /* snapshot: Test_createRoutes_version */
 HTTP/1.1 200 OK
 Connection: close
-Content-Security-Policy: default-src 'none'; script-src 'self'; style-src 'self' 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-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
@@ -89,4 +89,26 @@ Connection: keep-alive
 Content-Type: text/event-stream
 X-Accel-Buffering: no
 
-data: INFO Testing logs...
+data: INFO Testing logs...
+
+/* snapshot: Test_handler_streamLogs_happy_container_stopped */
+HTTP/1.1 200 OK
+Connection: close
+Cache-Control: no-cache
+Connection: keep-alive
+Content-Type: text/event-stream
+X-Accel-Buffering: no
+
+event: container-stopped
+data: end of stream
+
+/* snapshot: Test_handler_streamLogs_happy_with_id */
+HTTP/1.1 200 OK
+Connection: close
+Cache-Control: no-cache
+Connection: keep-alive
+Content-Type: text/event-stream
+X-Accel-Buffering: no
+
+data: 2020-05-13T18:55:37.772853839Z INFO Testing logs...
+id: 2020-05-13T18:55:37.772853839Z

assets/App.spec.js

@@ -16,19 +16,25 @@ describe("<App />", () => {
   beforeEach(() => {
     global.EventSource = EventSource;
     const state = {
-      containers: [
-        { id: "abc", name: "Test 1" },
-        { id: "xyz", name: "Test 2" },
-      ],
       settings: { menuWidth: 15 },
     };
 
+    const getters = {
+      visibleContainers() {
+        return [
+          { id: "abc", name: "Test 1" },
+          { id: "xyz", name: "Test 2" },
+        ];
+      },
+    };
+
     const actions = {
       FETCH_CONTAINERS: () => Promise.resolve(),
     };
 
     store = new Vuex.Store({
       state,
+      getters,
       actions,
     });
   });

assets/App.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <main>
     <mobile-menu v-if="isMobile"></mobile-menu>
 
@@ -76,7 +76,7 @@ export default {
   },
   async created() {
     await this.fetchContainerList();
-    this.title = `${this.containers.length} containers`;
+    this.title = `${this.visibleContainers.length} containers`;
   },
   mounted() {
     if (this.hasSmallerScrollbars) {
@@ -94,7 +94,8 @@ export default {
     },
   },
   computed: {
-    ...mapState(["containers", "activeContainers", "isMobile", "settings"]),
+    ...mapState(["activeContainers", "isMobile", "settings"]),
+    ...mapGetters(["visibleContainers"]),
     hasSmallerScrollbars() {
       return this.settings.smallerScrollbars;
     },

assets/components/ContainerTitle.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div class="name columns is-marginless">
     <span class="column">{{ value }}</span>
     <span class="column is-narrow" v-if="closable">

assets/components/InfiniteLoader.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div ref="observer" class="control" :class="{ 'is-loading': isLoading }"></div>
 </template>
 

assets/components/LogEventSource.spec.js

@@ -3,7 +3,6 @@ import EventSource from "eventsourcemock";
 import { sources } from "eventsourcemock";
 import { shallowMount, mount, createLocalVue } from "@vue/test-utils";
 import Vuex from "vuex";
-import MockDate from "mockdate";
 import LogEventSource from "./LogEventSource.vue";
 import LogViewer from "./LogViewer.vue";
 
@@ -18,9 +17,7 @@ jest.mock("../store/config.js", () => ({ base: "" }));
 describe("<LogEventSource />", () => {
   beforeEach(() => {
     global.EventSource = EventSource;
-    MockDate.set("6/12/2019", 0);
     window.scrollTo = jest.fn();
-
     const observe = jest.fn();
     const unobserve = jest.fn();
     global.IntersectionObserver = jest.fn(() => ({
@@ -30,8 +27,6 @@ describe("<LogEventSource />", () => {
     debounce.mockClear();
   });
 
-  afterEach(() => MockDate.reset());
-
   function createLogEventSource(searchFilter = null) {
     const localVue = createLocalVue();
     localVue.use(Vuex);
@@ -126,64 +121,80 @@ describe("<LogEventSource />", () => {
     `);
   });
 
-  test("should render messages", async () => {
-    const wrapper = createLogEventSource();
-    sources["/api/logs/stream?id=abc"].emitOpen();
-    sources["/api/logs/stream?id=abc"].emitMessage({ data: `2019-06-12T10:55:42.459034602Z "This is a message."` });
+  describe("render html correctly", () => {
+    const RealDate = Date;
+    beforeAll(() => {
+      global.Date = class extends RealDate {
+        constructor(arg) {
+          if (arg) {
+            return new RealDate(arg);
+          } else {
+            return new RealDate(1560336936000);
+          }
+        }
+      };
+    });
+    afterAll(() => (global.Date = RealDate));
 
-    await wrapper.vm.$nextTick();
-    expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
-      <ul class="events medium">
-        <li class=""><span class="date">today at 10:55 AM</span> <span class="text">"This is a message."</span></li>
-      </ul>
-    `);
-  });
+    test("should render messages", async () => {
+      const wrapper = createLogEventSource();
+      sources["/api/logs/stream?id=abc"].emitOpen();
+      sources["/api/logs/stream?id=abc"].emitMessage({ data: `2019-06-12T10:55:42.459034602Z "This is a message."` });
 
-  test("should render messages with color", async () => {
-    const wrapper = createLogEventSource();
-    sources["/api/logs/stream?id=abc"].emitOpen();
-    sources["/api/logs/stream?id=abc"].emitMessage({
-      data: `2019-06-12T10:55:42.459034602Z \x1b[30mblack\x1b[37mwhite`,
+      await wrapper.vm.$nextTick();
+      expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
+        <ul class="events medium">
+          <li class=""><span class="date">today at 10:55 AM</span> <span class="text">"This is a message."</span></li>
+        </ul>
+      `);
     });
 
-    await wrapper.vm.$nextTick();
-    expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
-      <ul class="events medium">
-        <li class=""><span class="date">today at 10:55 AM</span> <span class="text"><span style="color:#000">black<span style="color:#AAA">white</span></span></span></li>
-      </ul>
-    `);
-  });
+    test("should render messages with color", async () => {
+      const wrapper = createLogEventSource();
+      sources["/api/logs/stream?id=abc"].emitOpen();
+      sources["/api/logs/stream?id=abc"].emitMessage({
+        data: `2019-06-12T10:55:42.459034602Z \x1b[30mblack\x1b[37mwhite`,
+      });
 
-  test("should render messages with html entities", async () => {
-    const wrapper = createLogEventSource();
-    sources["/api/logs/stream?id=abc"].emitOpen();
-    sources["/api/logs/stream?id=abc"].emitMessage({
-      data: `2019-06-12T10:55:42.459034602Z <test>foo bar</test>`,
+      await wrapper.vm.$nextTick();
+      expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
+        <ul class="events medium">
+          <li class=""><span class="date">today at 10:55 AM</span> <span class="text"><span style="color:#000">black<span style="color:#AAA">white</span></span></span></li>
+        </ul>
+      `);
     });
 
-    await wrapper.vm.$nextTick();
-    expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
-      <ul class="events medium">
-        <li class=""><span class="date">today at 10:55 AM</span> <span class="text">&lt;test&gt;foo bar&lt;/test&gt;</span></li>
-      </ul>
-    `);
-  });
+    test("should render messages with html entities", async () => {
+      const wrapper = createLogEventSource();
+      sources["/api/logs/stream?id=abc"].emitOpen();
+      sources["/api/logs/stream?id=abc"].emitMessage({
+        data: `2019-06-12T10:55:42.459034602Z <test>foo bar</test>`,
+      });
 
-  test("should render messages with filter", async () => {
-    const wrapper = createLogEventSource("test");
-    sources["/api/logs/stream?id=abc"].emitOpen();
-    sources["/api/logs/stream?id=abc"].emitMessage({
-      data: `2019-06-11T10:55:42.459034602Z Foo bar`,
-    });
-    sources["/api/logs/stream?id=abc"].emitMessage({
-      data: `2019-06-12T10:55:42.459034602Z This is a test <hi></hi>`,
+      await wrapper.vm.$nextTick();
+      expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
+        <ul class="events medium">
+          <li class=""><span class="date">today at 10:55 AM</span> <span class="text">&lt;test&gt;foo bar&lt;/test&gt;</span></li>
+        </ul>
+      `);
     });
 
-    await wrapper.vm.$nextTick();
-    expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
-      <ul class="events medium">
-        <li class=""><span class="date">today at 10:55 AM</span> <span class="text">This is a <mark>test</mark> &lt;hi&gt;&lt;/hi&gt;</span></li>
-      </ul>
-    `);
+    test("should render messages with filter", async () => {
+      const wrapper = createLogEventSource("test");
+      sources["/api/logs/stream?id=abc"].emitOpen();
+      sources["/api/logs/stream?id=abc"].emitMessage({
+        data: `2019-06-11T10:55:42.459034602Z Foo bar`,
+      });
+      sources["/api/logs/stream?id=abc"].emitMessage({
+        data: `2019-06-12T10:55:42.459034602Z This is a test <hi></hi>`,
+      });
+
+      await wrapper.vm.$nextTick();
+      expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
+        <ul class="events medium">
+          <li class=""><span class="date">today at 10:55 AM</span> <span class="text">This is a <mark>test</mark> &lt;hi&gt;&lt;/hi&gt;</span></li>
+        </ul>
+      `);
+    });
   });
 });

assets/components/LogEventSource.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div>
     <infinite-loader :onLoadMore="loadOlderLogs" :enabled="messages.length > 100"></infinite-loader>
     <slot :messages="messages"></slot>

assets/components/LogViewer.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <ul class="events" :class="settings.size">
     <li v-for="item in filtered" :key="item.key" :class="{ event: !!item.event }">
       <span class="date" v-if="settings.showTimestamp">{{ item.date | relativeTime }}</span>

assets/components/LogViewerWithSource.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <log-event-source :id="id" v-slot="eventSource">
     <log-viewer :messages="eventSource.messages"></log-viewer>
   </log-event-source>

assets/components/MobileMenu.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <aside>
     <a
       role="button"
@@ -11,7 +11,7 @@
     <h1 class="title has-text-warning is-marginless">Dozzle</h1>
     <p class="menu-label is-hidden-mobile" :class="{ 'is-active': showNav }">Containers</p>
     <ul class="menu-list is-hidden-mobile" :class="{ 'is-active': showNav }">
-      <li v-for="item in containers">
+      <li v-for="item in visibleContainers" :key="item.id">
         <router-link
           :to="{ name: 'container', params: { id: item.id, name: item.name } }"
           active-class="is-active"

assets/components/ScrollableView.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <section :class="{ 'is-full-height-scrollable': scrollable }">
     <header v-if="$slots.header">
       <slot name="header"></slot>

assets/components/Search.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div class="search columns is-gapless is-vcentered" v-show="showSearch" v-if="settings.search">
     <div class="column">
       <p class="control has-icons-left">

assets/components/SideMenu.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <aside>
     <div class="columns is-marginless">
       <div class="column">

assets/main.js

@@ -9,6 +9,7 @@ import App from "./App.vue";
 import Container from "./pages/Container.vue";
 import Settings from "./pages/Settings.vue";
 import Index from "./pages/Index.vue";
+import Show from "./pages/Show.vue";
 
 Vue.use(VueRouter);
 Vue.use(Meta);
@@ -32,6 +33,11 @@ const routes = [
     component: Settings,
     name: "settings",
   },
+  {
+    path: "/show",
+    component: Show,
+    name: "show",
+  },
 ];
 
 const router = new VueRouter({

assets/pages/Container.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <scrollable-view :scrollable="activeContainers.length > 0">
     <template v-slot:header v-if="activeContainers.length > 0">
       <container-title :value="allContainersById[id].name"></container-title>

assets/pages/Index.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div class="hero is-fullheight is-dark">
     <div class="hero-body">
       <div class="container has-text-centered">

assets/pages/Settings.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div>
     <section class="section">
       <div class="has-underline">
@@ -10,7 +10,9 @@
         >.
         <span v-if="hasUpdate">
           New version is available! Update to
-          <a :href="nextRelease.html_url" class="next-release" target="_blank" rel="noopener">{{ nextRelease.name }}</a
+          <a :href="nextRelease.html_url" class="next-release" target="_blank" rel="noreferrer noopener">{{
+            nextRelease.name
+          }}</a
           >.
         </span>
       </div>

assets/pages/Show.vue

@@ -0,0 +1,29 @@
+<template> </template>
+
+<script>
+import { mapActions, mapGetters, mapState } from "vuex";
+export default {
+  props: [],
+  name: "Show",
+  computed: mapGetters(["visibleContainers"]),
+  watch: {
+    visibleContainers(newValue) {
+      if (newValue) {
+        if (this.$route.query.name) {
+          const [container, _] = this.visibleContainers.filter((c) => c.name == this.$route.query.name);
+          if (container) {
+            this.$router.push({ name: "container", params: { id: container.id } });
+          } else {
+            console.error(`No containers found matching name=${this.$route.query.name}. Redirecting to /`);
+            this.$router.push({ name: "default" });
+          }
+        } else {
+          console.error(`Expection query parameter name to be set. Redirecting to /`);
+          this.$router.push({ name: "default" });
+        }
+      }
+    },
+  },
+};
+</script>
+<style scoped></style>

assets/styles.scss

@@ -9,20 +9,20 @@ $menu-item-color: hsl(0, 6%, 87%);
 @import "~buefy/src/scss/components/_dropdown";
 @import "~buefy/src/scss/components/_switch";
 
-body {
-  font-family: "Roboto", sans-serif;
-  color: #ddd;
-  background-color: #111;
-}
-
-h1.title {
-  font-family: "Gafata", sans-serif;
-}
-
 html {
   overflow-x: unset;
   overflow-y: unset;
   scroll-snap-type: y proximity;
+  background-color: #111;
+}
+
+body {
+  font-family: "Roboto", sans-serif;
+  color: #ddd;
+}
+
+h1.title {
+  font-family: "Gafata", sans-serif;
 }
 
 html.has-custom-scrollbars {

docker/client.go

@@ -113,7 +113,7 @@ func (d *dockerClient) ListContainers() ([]Container, error) {
 	}
 
 	sort.Slice(containers, func(i, j int) bool {
-		return containers[i].Name < containers[j].Name
+		return strings.ToLower(containers[i].Name) < strings.ToLower(containers[j].Name)
 	})
 
 	if containers == nil {
@@ -153,7 +153,7 @@ func logReader(reader io.ReadCloser, tty bool) func() (string, error) {
 
 func (d *dockerClient) ContainerLogs(ctx context.Context, id string, tailSize int, since string) (<-chan string, <-chan error) {
 	log.WithField("id", id).WithField("since", since).Debug("Streaming logs for container")
-	
+
 	options := types.ContainerLogsOptions{
 		ShowStdout: true,
 		ShowStderr: true,

go.mod

@@ -41,10 +41,9 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.0
 	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.6.1
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
 	golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect
-	golang.org/x/text v0.3.2 // indirect
 	google.golang.org/genproto v0.0.0-20200226201735-46b91f19d98c // indirect
 	google.golang.org/grpc v1.27.1 // indirect
 	gopkg.in/ini.v1 v1.52.0 // indirect

go.sum

@@ -316,6 +316,10 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho=
+github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+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/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=
@@ -486,6 +490,8 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

integration/package.json

@@ -9,7 +9,7 @@
  "license": "ISC",
  "dependencies": {
   "jest": "^26.0.1",
-  "jest-image-snapshot": "^3.0.1",
+  "jest-image-snapshot": "^4.0.0",
   "puppeteer": "^3.0.4"
  },
  "jest": {

integration/test.js

@@ -29,10 +29,17 @@ describe("home page", () => {
     expect(image).toMatchImageSnapshot();
   });
 
+  it("displays iphone menu", async () => {
+    await page.emulate(iPhoneX);
+    await page.click("a.navbar-burger");
+
+    const menuText = await page.$eval("aside ul.menu-list.is-hidden-mobile li a", (e) => e.textContent);
+    expect(menuText.trim()).toEqual("dozzle");
+  });
+
   describe("has menu visible", () => {
     beforeAll(async () => {
       await jestPuppeteer.resetBrowser();
-      // await page.setViewport({ width: 1920, height: 1200 });
     });
 
     beforeEach(async () => {

integration/yarn.lock

@@ -2218,10 +2218,10 @@ jest-haste-map@^26.0.1:
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-image-snapshot@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jest-image-snapshot/-/jest-image-snapshot-3.1.0.tgz#eefc91f1570c426c368ae8a8890fef82d678fd5a"
-  integrity sha512-mzGCCyZlEyQIr6AnKi3KvbFvgOI7445qGPIoyhGm7Qmxw0YLTJMN+rH1WdGcs56ATx0CVM8aMjQMx4dDovlwtQ==
+jest-image-snapshot@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/jest-image-snapshot/-/jest-image-snapshot-4.0.2.tgz#a8d9aacc97f4279f52ed5e5e6049932f6c903ed5"
+  integrity sha512-RqKGk0HbQrfw3E3dDuxjFBXqubvPWzjj3zFP6Z7auo48rC0FNpQ5jYXThQjhfy+fvgIgyHk3jPnDNgSiIuVVtw==
   dependencies:
     chalk "^1.1.3"
     get-stdin "^5.0.1"
@@ -3110,9 +3110,9 @@ punycode@^2.1.0, punycode@^2.1.1:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 puppeteer@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.4.tgz#f445aae0a6732c65bbb90e963dcd6fd8fde0d780"
-  integrity sha512-1QEb4tJXXbNId7WSHlcDkS3B4GklTIebKn8Y9D6B7tAdUjQncb+8QlTjbQsAgGX5dhRG32Qycuk5XKzJgLs0sg==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7"
+  integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw==
   dependencies:
     debug "^4.1.0"
     extract-zip "^2.0.0"

main_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"errors"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -124,6 +125,60 @@ func Test_handler_streamLogs_happy(t *testing.T) {
 	mockedClient.AssertExpectations(t)
 }
 
+func Test_handler_streamLogs_happy_with_id(t *testing.T) {
+	id := "123456"
+	req, err := http.NewRequest("GET", "/api/logs/stream", nil)
+	q := req.URL.Query()
+	q.Add("id", id)
+	req.URL.RawQuery = q.Encode()
+	require.NoError(t, err, "NewRequest should not return an error.")
+
+	mockedClient := new(MockedClient)
+
+	messages := make(chan string)
+	errChannel := make(chan error)
+	mockedClient.On("FindContainer", id).Return(docker.Container{ID: id}, nil)
+	mockedClient.On("ContainerLogs", mock.Anything, mock.Anything, 300).Return(messages, errChannel)
+	go func() {
+		messages <- "2020-05-13T18:55:37.772853839Z INFO Testing logs..."
+		close(messages)
+	}()
+
+	h := handler{client: mockedClient}
+	handler := http.HandlerFunc(h.streamLogs)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+	abide.AssertHTTPResponse(t, t.Name(), rr.Result())
+	mockedClient.AssertExpectations(t)
+}
+
+func Test_handler_streamLogs_happy_container_stopped(t *testing.T) {
+	id := "123456"
+	req, err := http.NewRequest("GET", "/api/logs/stream", nil)
+	q := req.URL.Query()
+	q.Add("id", id)
+	req.URL.RawQuery = q.Encode()
+	require.NoError(t, err, "NewRequest should not return an error.")
+
+	mockedClient := new(MockedClient)
+	messages := make(chan string)
+	errChannel := make(chan error)
+	mockedClient.On("FindContainer", id).Return(docker.Container{ID: id}, nil)
+	mockedClient.On("ContainerLogs", mock.Anything, id, 300).Return(messages, errChannel)
+
+	go func() {
+		errChannel <- io.EOF
+		close(messages)
+	}()
+
+	h := handler{client: mockedClient}
+	handler := http.HandlerFunc(h.streamLogs)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+	abide.AssertHTTPResponse(t, t.Name(), rr.Result())
+	mockedClient.AssertExpectations(t)
+}
+
 func Test_handler_streamLogs_error_finding_container(t *testing.T) {
 	id := "123456"
 	req, err := http.NewRequest("GET", "/api/logs/stream", nil)
@@ -159,6 +214,7 @@ func Test_handler_streamLogs_error_reading(t *testing.T) {
 
 	go func() {
 		errChannel <- errors.New("test error")
+		close(messages)
 	}()
 
 	h := handler{client: mockedClient}

package.json

@@ -1,17 +1,17 @@
 {
  "name": "dozzle",
- "version": "1.25.0",
+ "version": "1.27.3",
  "description": "Realtime log viewer for docker containers. ",
  "scripts": {
   "prestart": "yarn clean",
-  "start": "concurrently 'yarn watch-server' 'yarn watch-assets'",
-  "watch-assets": "webpack --mode=development --watch",
-  "watch-server": "reflex -c .reflex",
+  "start": "npm-run-all -p watch:*",
+  "watch:assets": "webpack --mode=development --watch",
+  "watch:server": "reflex -c .reflex",
   "prebuild": "yarn clean",
   "build": "yarn webpack --mode=production",
   "clean": "rm -rf static/ a_main-packr.go",
   "release": "release-it",
-  "test": "jest",
+  "test": "TZ=UTC jest",
   "integration": "docker-compose -f integration/docker-compose.test.yml up --build --force-recreate integration"
  },
  "repository": {
@@ -26,47 +26,44 @@
  "homepage": "https://github.com/amir20/dozzle#readme",
  "dependencies": {
   "ansi-to-html": "^0.6.14",
-  "buefy": "^0.8.18",
-  "bulma": "^0.8.2",
-  "date-fns": "^2.13.0",
+  "buefy": "^0.8.20",
+  "bulma": "^0.9.0",
+  "date-fns": "^2.14.0",
   "dompurify": "^2.0.11",
-  "hotkeys-js": "^3.7.6",
+  "hotkeys-js": "^3.8.1",
   "lodash.debounce": "^4.0.8",
   "semver": "^7.3.2",
   "splitpanes": "^2.2.1",
   "store": "^2.0.12",
   "vue": "^2.6.11",
-  "vue-meta": "^2.3.3",
-  "vue-router": "^3.1.6",
+  "vue-meta": "^2.4.0",
+  "vue-router": "^3.3.3",
   "vuex": "^3.4.0"
  },
  "devDependencies": {
-  "@babel/core": "^7.9.6",
-  "@babel/plugin-transform-runtime": "^7.9.6",
+  "@babel/core": "^7.10.2",
+  "@babel/plugin-transform-runtime": "^7.10.1",
   "@vue/component-compiler-utils": "^3.1.2",
-  "@vue/test-utils": "^1.0.2",
+  "@vue/test-utils": "^1.0.3",
   "babel-core": "^7.0.0-bridge.0",
   "babel-jest": "^26.0.1",
-  "babel-loader": "^8.1.0",
   "babel-preset-env": "^1.7.0",
-  "caniuse-lite": "^1.0.30001055",
-  "concurrently": "^5.2.0",
+  "caniuse-lite": "^1.0.30001081",
   "css-loader": "^3.5.3",
   "eventsourcemock": "^2.0.0",
   "html-webpack-plugin": "^4.3.0",
   "husky": "^4.2.5",
   "jest": "^26.0.1",
   "jest-serializer-vue": "^2.0.2",
-  "lint-staged": "^10.2.2",
+  "lint-staged": "^10.2.10",
   "mini-css-extract-plugin": "^0.9.0",
-  "mockdate": "^2.0.5",
-  "node-fetch": "^2.6.0",
+  "npm-run-all": "^4.1.5",
   "postcss-cssnext": "^3.1.0",
   "postcss-import": "^12.0.1",
   "postcss-loader": "^3.0.0",
   "prettier": "^2.0.5",
-  "release-it": "^13.5.8",
-  "sass": "^1.26.5",
+  "release-it": "^13.6.2",
+  "sass": "^1.26.8",
   "sass-loader": "^8.0.2",
   "vue-hot-reload-api": "^2.3.4",
   "vue-jest": "^3.0.5",
@@ -75,7 +72,6 @@
   "vue-template-compiler": "^2.6.11",
   "webpack": "^4.43.0",
   "webpack-cli": "^3.3.11",
-  "webpack-manifest-plugin": "^2.2.0",
   "webpack-pwa-manifest": "^4.2.0"
  },
  "husky": {

routes.go

@@ -34,7 +34,7 @@ func createRoutes(base string, h *handler) *mux.Router {
 
 func setCSPHeaders(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Security-Policy", "default-src 'none'; script-src 'self'; style-src 'self' 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'")
+		w.Header().Set("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'")
 		next.ServeHTTP(w, r)
 	})
 }

webpack.config.js

@@ -8,7 +8,7 @@ module.exports = (env, argv) => ({
   stats: { children: false, entrypoints: false, modules: false },
   performance: {
     maxAssetSize: 350000,
-    maxEntrypointSize: 585000,
+    maxEntrypointSize: 600000,
   },
   devtool: argv.mode === "development" ? "inline-cheap-source-map" : false,
   entry: ["./assets/main.js", "./assets/styles.scss"],