From c4de97951f2d0f333d22fedbda1678ff96feadc7 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 17:09:46 +0300 Subject: [PATCH 1/5] Update main.yaml Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c0fe6fa..c22ab72 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -36,4 +36,4 @@ jobs: with: context: . push: true - tags: "${{ env.AWS_REGISTRY }}/${{ env.REPOSITORY_NAME }}:v{{ github.ref_name }}.${{ github.run_number }}" + tags: "${{ env.AWS_REGISTRY }}/${{ env.REPOSITORY_NAME }}:${{ github.ref_name }}.${{ github.run_number }}" From 17ade1c03330b61540192d598dacd8070c94ce05 Mon Sep 17 00:00:00 2001 From: danniel Date: Mon, 24 Apr 2023 18:24:42 +0300 Subject: [PATCH 2/5] update ca-certificate image --- Dockerfile.amd64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index f36e07d..87527f6 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -19,7 +19,7 @@ RUN apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ supervisor nginx sudo net-tools zenity xz-utils \ dbus-x11 x11-utils alsa-utils \ - mesa-utils libgl1-mesa-dri \ + mesa-utils libgl1-mesa-dri ca-certificates \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* From 506ec4b27e2cfff422ff8ac344e53a1c5a412819 Mon Sep 17 00:00:00 2001 From: danniel Date: Mon, 24 Apr 2023 18:32:47 +0300 Subject: [PATCH 3/5] update docker image --- Dockerfile.amd64 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 87527f6..a5841ce 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -19,7 +19,7 @@ RUN apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ supervisor nginx sudo net-tools zenity xz-utils \ dbus-x11 x11-utils alsa-utils \ - mesa-utils libgl1-mesa-dri ca-certificates \ + mesa-utils libgl1-mesa-dri \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* @@ -32,14 +32,6 @@ RUN apt update \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* -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 \ - && rm google-chrome-stable_current_amd64.deb \ - && rm -rf /var/lib/apt/lists/* - RUN apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \ @@ -47,6 +39,15 @@ RUN apt update \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* +RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; + +RUN apt update \ + && apt install -y ca-certificates gnupg patch 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 \ + && rm google-chrome-stable_current_amd64.deb \ + && rm -rf /var/lib/apt/lists/* # Additional packages require ~600MB # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw From f2173f5d27084c4b4a042597e9afb9a720468332 Mon Sep 17 00:00:00 2001 From: danniel Date: Mon, 24 Apr 2023 18:35:48 +0300 Subject: [PATCH 4/5] revert --- Dockerfile.amd64 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index a5841ce..3b282c8 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -32,6 +32,14 @@ RUN apt update \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* +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 \ + && rm google-chrome-stable_current_amd64.deb \ + && rm -rf /var/lib/apt/lists/* + RUN apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \ @@ -39,15 +47,6 @@ RUN apt update \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* -RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; - -RUN apt update \ - && apt install -y ca-certificates gnupg patch 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 \ - && rm google-chrome-stable_current_amd64.deb \ - && rm -rf /var/lib/apt/lists/* # Additional packages require ~600MB # libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw @@ -127,4 +126,4 @@ WORKDIR /root ENV HOME=/home/ubuntu \ SHELL=/bin/bash HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://127.0.0.1:6079/api/health -ENTRYPOINT ["/startup.sh"] +ENTRYPOINT ["/startup.sh"] \ No newline at end of file From 11d029295489747196e12d0e30c23073474db772 Mon Sep 17 00:00:00 2001 From: danniel Date: Mon, 24 Apr 2023 19:35:33 +0300 Subject: [PATCH 5/5] add code owners --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..4528fa1 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +.github/** @devops \ No newline at end of file