From f3e7ce89d3adfc68267d94b403c77bf54b64db03 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 17:09:29 +0300 Subject: [PATCH 01/12] 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 d49bacb5f6596c6b16754c6e03457357979a8ee0 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:41:23 +0300 Subject: [PATCH 02/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4528fa1..e60777a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @devops \ No newline at end of file +.github/** @UVeye/devops From d51638a1a6995b24e976e5ea31fea51d3056da17 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:42:06 +0300 Subject: [PATCH 03/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e60777a..be7af7c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @UVeye/devops +.github/** @UVeye/dannielshalev From b885be746ad8739cdc7b2dab5170dac904f3f9f6 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:43:26 +0300 Subject: [PATCH 04/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index be7af7c..2b48772 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @UVeye/dannielshalev +.github/** @dannielshalev From bd20fd783b977278e23194718fb735ec0053b9f0 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:43:50 +0300 Subject: [PATCH 05/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2b48772..7d2f352 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @dannielshalev +.github/** @dannielshalev @uveye/devops From 194f6bd05409f180e2db5d5259cd7be81cdb1c38 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:44:46 +0300 Subject: [PATCH 06/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7d2f352..5efe0aa 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @dannielshalev @uveye/devops +.github/** @dannielshalev @uveye/* From f7d542085a86f292d030ec599f5840a7a72778ec Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:44:57 +0300 Subject: [PATCH 07/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5efe0aa..ac9bb5a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @dannielshalev @uveye/* +.github/** @dannielshalev @uveye From a2bbff0bcd2d896d8bcc05e66af27606d211ba68 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:45:21 +0300 Subject: [PATCH 08/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ac9bb5a..2b48772 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @dannielshalev @uveye +.github/** @dannielshalev From 9c08979db3f1074d4b87a18d0efc25265382f0b2 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:46:35 +0300 Subject: [PATCH 09/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2b48772..21369f9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @dannielshalev +.github/** @dannielshalev @eladso From d5c85ac7bed4ea6bba78f024a14ae6f6f1be47a4 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:49:48 +0300 Subject: [PATCH 10/12] Update CODEOWNERS Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 21369f9..b21480d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -.github/** @dannielshalev @eladso +.github/** @dannielshalev @eladso @ilchemla @it-uveye From e1d5b144331fcc53adb6f1080c8880a7811dcd71 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Thu, 27 Apr 2023 14:31:55 +0300 Subject: [PATCH 11/12] Update main.yaml Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- .github/workflows/main.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c22ab72..0a5ddc0 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -6,7 +6,6 @@ on: - main - 'release_v**' env: - AWS_REGISTRY: "230690759643.dkr.ecr.eu-west-1.amazonaws.com" REPOSITORY_NAME: "vnc-desktop" jobs: @@ -36,4 +35,4 @@ jobs: with: context: . push: true - tags: "${{ env.AWS_REGISTRY }}/${{ env.REPOSITORY_NAME }}:${{ github.ref_name }}.${{ github.run_number }}" + tags: "${{ secrets.AWS_REGISTRY }}/${{ env.REPOSITORY_NAME }}:${{ github.ref_name }}.${{ github.run_number }}" From 1e2fcf9003fff784cd5bbca89cff9fe617c727c6 Mon Sep 17 00:00:00 2001 From: dannielshalev <44364077+dannielshalev@users.noreply.github.com> Date: Sun, 16 Jul 2023 14:08:10 +0300 Subject: [PATCH 12/12] Update Dockerfile.amd64 Signed-off-by: dannielshalev <44364077+dannielshalev@users.noreply.github.com> --- Dockerfile.amd64 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 3b282c8..d0f27ac 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -34,9 +34,8 @@ 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 \ + && 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/* @@ -126,4 +125,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"] \ No newline at end of file +ENTRYPOINT ["/startup.sh"]