From df389a2ba68519e9c78d09f0b740598849432bdf Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Sun, 16 Jul 2023 20:24:40 +0300 Subject: [PATCH 1/3] Update Dockerfile.amd64 Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- Dockerfile.amd64 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 6a78a04..f36e07d 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -34,9 +34,9 @@ RUN apt update \ RUN apt update \ && apt install -y gpg-agent \ - && apt install -y wget \ - && wget -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ - && sudo dpkg -i google-chrome-stable_current_amd64.deb \ + && curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ + && (dpkg -i ./google-chrome-stable_current_amd64.deb || apt-get install -fy) \ + && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add \ && rm google-chrome-stable_current_amd64.deb \ && rm -rf /var/lib/apt/lists/* From 4a2023aa8d33a8f3d44384faf3ebca9c93607f09 Mon Sep 17 00:00:00 2001 From: danniel Date: Sun, 3 Sep 2023 17:17:13 +0300 Subject: [PATCH 2/3] add icon --- .github/CODEOWNERS | 2 +- Dockerfile.amd64 | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4528fa1..aca9579 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @devops \ No newline at end of file +.github/** @UVeye/devops \ No newline at end of file diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 3b282c8..6ec4f11 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -121,6 +121,29 @@ COPY rootfs / RUN ln -sf /usr/local/lib/web/frontend/static/websockify /usr/local/lib/web/frontend/static/novnc/utils/websockify && \ chmod +x /usr/local/lib/web/frontend/static/websockify/run +# Create application Icon + +RUN cat << eof >> /usr/share/applications/uvportal.desktop +[Desktop Entry] +Name=UVportal +Type=Application +Icon=google-chrome +Exec=/usr/bin/google-chrome http://uvportal.uveye.local +Terminal=false +eof + + +RUN cat << eof >> portal.desktop +[Desktop Entry] +Type=Link +Name=UVportal +Icon=google-chrome +URL=/usr/share/applications/uvportal.desktop +eof + + + +eof EXPOSE 80 WORKDIR /root ENV HOME=/home/ubuntu \ From fe0982ed506f62295c96c1f9242de128afe1698c Mon Sep 17 00:00:00 2001 From: danniel Date: Sun, 3 Sep 2023 17:26:00 +0300 Subject: [PATCH 3/3] revert change --- Dockerfile.amd64 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 5952fc4..0528899 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -34,9 +34,9 @@ RUN apt update \ RUN apt update \ && apt install -y gpg-agent \ - && curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ - && (dpkg -i ./google-chrome-stable_current_amd64.deb || apt-get install -fy) \ - && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add \ + && apt install -y wget \ + && wget -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ + && sudo dpkg -i google-chrome-stable_current_amd64.deb \ && rm google-chrome-stable_current_amd64.deb \ && rm -rf /var/lib/apt/lists/* @@ -141,9 +141,6 @@ Icon=google-chrome URL=/usr/share/applications/uvportal.desktop eof - - -eof EXPOSE 80 WORKDIR /root ENV HOME=/home/ubuntu \