From 8040845550a04b65dded2704d4d018703c2069a3 Mon Sep 17 00:00:00 2001 From: Stefan Vacareanu Date: Mon, 10 Apr 2023 12:19:36 +0300 Subject: [PATCH 1/6] fix vulnerability issues TS-292 --- .circleci/config.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7ee25a..5ff6fd4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - codacy: codacy/base@9.3.6 + codacy: codacy/base@10.2.2 codacy_plugins_test: codacy/plugins-test@1.1.1 workflows: diff --git a/build.sbt b/build.sbt index eb58c69..296087d 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ val installPHPCPD: String = Docker / packageName := packageName.value Docker / version := version.value Docker / maintainer := "Codacy " -dockerBaseImage := "php:8.1.13-alpine3.16" +dockerBaseImage := "php:8.1.13-alpine3.17" dockerUpdateLatest := true Docker / defaultLinuxInstallLocation := defaultDockerInstallationPath Docker / daemonUser := "docker" From 41d9f4b53373949b080bb2f71806d03f793b205a Mon Sep 17 00:00:00 2001 From: stefanvacareanu7 <91726880+stefanvacareanu7@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:56:38 +0300 Subject: [PATCH 2/6] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 296087d..55567f5 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ val installPHPCPD: String = s"""|export COMPOSER_HOME=/home/docker/.composer && |mkdir -p /home/docker/.composer && |chown -R docker:docker /home/docker && - |apk --update --no-cache add openjdk8-jre bash curl git php8 php8-xml php8-cli php8-pdo php8-curl php8-json php8-phar php8-ctype php8-openssl php8-dom php8-iconv && + |apk --update --no-cache add openjdk8-jre bash curl git php8.1 php8.1-xml php8.1-cli php8.1-pdo php8.1-curl php8.1-json php8.1-phar php8.1-ctype php8.1-openssl php8.1-dom php8.1-iconv && |curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && |su - docker -c 'composer global require "sebastian/phpcpd=$phpCPDVersion"' && |apk del curl && From 6c4efe711141672beff241a91e3865e7bde94022 Mon Sep 17 00:00:00 2001 From: stefanvacareanu7 <91726880+stefanvacareanu7@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:05:47 +0300 Subject: [PATCH 3/6] Test if it's working --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 55567f5..eb58c69 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ val installPHPCPD: String = s"""|export COMPOSER_HOME=/home/docker/.composer && |mkdir -p /home/docker/.composer && |chown -R docker:docker /home/docker && - |apk --update --no-cache add openjdk8-jre bash curl git php8.1 php8.1-xml php8.1-cli php8.1-pdo php8.1-curl php8.1-json php8.1-phar php8.1-ctype php8.1-openssl php8.1-dom php8.1-iconv && + |apk --update --no-cache add openjdk8-jre bash curl git php8 php8-xml php8-cli php8-pdo php8-curl php8-json php8-phar php8-ctype php8-openssl php8-dom php8-iconv && |curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && |su - docker -c 'composer global require "sebastian/phpcpd=$phpCPDVersion"' && |apk del curl && @@ -40,7 +40,7 @@ val installPHPCPD: String = Docker / packageName := packageName.value Docker / version := version.value Docker / maintainer := "Codacy " -dockerBaseImage := "php:8.1.13-alpine3.17" +dockerBaseImage := "php:8.1.13-alpine3.16" dockerUpdateLatest := true Docker / defaultLinuxInstallLocation := defaultDockerInstallationPath Docker / daemonUser := "docker" From 826cd1d79f67ef8bcb7e4c3d586f15fe170a338b Mon Sep 17 00:00:00 2001 From: stefanvacareanu7 <91726880+stefanvacareanu7@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:14:05 +0300 Subject: [PATCH 4/6] Update build.sbt --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index eb58c69..dcf0af9 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ val installPHPCPD: String = s"""|export COMPOSER_HOME=/home/docker/.composer && |mkdir -p /home/docker/.composer && |chown -R docker:docker /home/docker && - |apk --update --no-cache add openjdk8-jre bash curl git php8 php8-xml php8-cli php8-pdo php8-curl php8-json php8-phar php8-ctype php8-openssl php8-dom php8-iconv && + |apk --update --no-cache add openjdk8-jre bash curl git php8.1.13 php8.1.13-xml php8.1.13-cli php8.1.13-pdo php8.1.13-curl php8.1.13-json php8.1.13-phar php8.1.13-ctype php8.1.13-openssl php8.1.13-dom php8.1.13-iconv && |curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && |su - docker -c 'composer global require "sebastian/phpcpd=$phpCPDVersion"' && |apk del curl && @@ -40,7 +40,7 @@ val installPHPCPD: String = Docker / packageName := packageName.value Docker / version := version.value Docker / maintainer := "Codacy " -dockerBaseImage := "php:8.1.13-alpine3.16" +dockerBaseImage := "php:8.1.13-alpine3.17" dockerUpdateLatest := true Docker / defaultLinuxInstallLocation := defaultDockerInstallationPath Docker / daemonUser := "docker" From fb69e448f474def59fe62829f936cbe9a97c2285 Mon Sep 17 00:00:00 2001 From: stefanvacareanu7 <91726880+stefanvacareanu7@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:25:26 +0300 Subject: [PATCH 5/6] Update build.sbt --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index dcf0af9..7388529 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ val installPHPCPD: String = s"""|export COMPOSER_HOME=/home/docker/.composer && |mkdir -p /home/docker/.composer && |chown -R docker:docker /home/docker && - |apk --update --no-cache add openjdk8-jre bash curl git php8.1.13 php8.1.13-xml php8.1.13-cli php8.1.13-pdo php8.1.13-curl php8.1.13-json php8.1.13-phar php8.1.13-ctype php8.1.13-openssl php8.1.13-dom php8.1.13-iconv && + |apk --update --no-cache add openjdk8-jre bash curl git php8.1 php8.1-xml php8.1-cli php8.1-pdo php8.1-curl php8.1-json php8.1-phar php8.1-ctype php8.1-openssl php8.1-dom php8.1-iconv && |curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && |su - docker -c 'composer global require "sebastian/phpcpd=$phpCPDVersion"' && |apk del curl && @@ -40,7 +40,7 @@ val installPHPCPD: String = Docker / packageName := packageName.value Docker / version := version.value Docker / maintainer := "Codacy " -dockerBaseImage := "php:8.1.13-alpine3.17" +dockerBaseImage := "php:8.1-alpine3.17" dockerUpdateLatest := true Docker / defaultLinuxInstallLocation := defaultDockerInstallationPath Docker / daemonUser := "docker" From d09ba269ba390236b3b020de7400361a5deed5a1 Mon Sep 17 00:00:00 2001 From: stefanvacareanu7 <91726880+stefanvacareanu7@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:30:43 +0300 Subject: [PATCH 6/6] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7388529..5f2dc75 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ val installPHPCPD: String = s"""|export COMPOSER_HOME=/home/docker/.composer && |mkdir -p /home/docker/.composer && |chown -R docker:docker /home/docker && - |apk --update --no-cache add openjdk8-jre bash curl git php8.1 php8.1-xml php8.1-cli php8.1-pdo php8.1-curl php8.1-json php8.1-phar php8.1-ctype php8.1-openssl php8.1-dom php8.1-iconv && + |apk --update --no-cache add openjdk8-jre bash curl git php8 php8-xml php8-cli php8-pdo php8-curl php8-json php8-phar php8-ctype php8-openssl php8-dom php8-iconv && |curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && |su - docker -c 'composer global require "sebastian/phpcpd=$phpCPDVersion"' && |apk del curl &&