From 81a4bd0f76d66b9e0b62b297cd6377b3e1288ce0 Mon Sep 17 00:00:00 2001 From: Joey Parrish Date: Sat, 12 Nov 2022 21:44:03 -0800 Subject: [PATCH] fix: Fix Tizen cert issues in Docker image (#59) Upgrading Tizen Studio to 5.0 (released just a couple weeks ago) seems to fix the certificate issues we've been having. Closes #57 --- backends/tizen/tizen-studio-docker/base/Dockerfile | 12 +++++------- backends/tizen/tizen-utils.js | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/backends/tizen/tizen-studio-docker/base/Dockerfile b/backends/tizen/tizen-studio-docker/base/Dockerfile index 3dc8f6d..a6a9cd4 100644 --- a/backends/tizen/tizen-studio-docker/base/Dockerfile +++ b/backends/tizen/tizen-studio-docker/base/Dockerfile @@ -11,8 +11,8 @@ MAINTAINER joeyparrish # Then clear the apt cache to reduce the size of the final image. # Docker's best practices guide recommends that these all be combined into one # step to avoid issues with the caching system. -RUN apt-get -y update \ -&& apt-get -y install --no-install-recommends \ +RUN apt-get -y update +RUN apt-get -y install --no-install-recommends \ ca-certificates \ cpio \ gettext \ @@ -25,10 +25,8 @@ RUN apt-get -y update \ sudo \ unzip \ wget \ - zip \ -&& apt-get -y clean \ -&& rm -rf /var/lib/apt/lists/* \ -&& rm -rf /etc/apt/sources.list.d/* + zip +RUN apt-get -y clean && rm -rf /var/lib/apt/lists/* && rm -rf /etc/apt/sources.list.d/* # Add a non-root user with sudo access. RUN groupadd -r tizen \ @@ -43,7 +41,7 @@ USER tizen WORKDIR /home/tizen # Download the Tizen Studio installer. -ARG TIZEN_STUDIO_VERSION=3.7 +ARG TIZEN_STUDIO_VERSION=5.0 ARG TIZEN_STUDIO_DL_FOLDER=http://download.tizen.org/sdk/Installer/tizen-studio_${TIZEN_STUDIO_VERSION} ARG TIZEN_STUDIO_BINARY=web-cli_Tizen_Studio_${TIZEN_STUDIO_VERSION}_ubuntu-64.bin RUN wget ${TIZEN_STUDIO_DL_FOLDER}/${TIZEN_STUDIO_BINARY} \ diff --git a/backends/tizen/tizen-utils.js b/backends/tizen/tizen-utils.js index 5206b15..6d3013c 100644 --- a/backends/tizen/tizen-utils.js +++ b/backends/tizen/tizen-utils.js @@ -206,7 +206,7 @@ function addTizenArgs(yargs) { 'For local Tizen Studio installations, use ' + '--local-tizen-studio.\n', type: 'string', - default: 'gcr.io/generic-webdriver-server/tizen-studio-tv-3.0:1.0.0', + default: 'gcr.io/generic-webdriver-server/tizen-studio-tv-3.0:1.1.4', }) .option('tizen-studio-path', { description: