From b08e4dd134167e43c2f24870fd9b216e82e0fc32 Mon Sep 17 00:00:00 2001 From: bayrakmustafa Date: Mon, 1 Apr 2024 21:28:52 +0300 Subject: [PATCH] Updated CodeSignTool v1.3.0 --- .github/workflows/docker.yml | 22 +++++++++---------- Dockerfile | 4 ++-- Dockerfile-ltsc2019 | 5 ++--- Dockerfile-ltsc2022 | 5 ++--- codesign-tool/conf/code_sign_tool.properties | 3 ++- .../conf/code_sign_tool_demo.properties | 3 ++- entrypoint.sh | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index eedb427..a5f5ae0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,7 +16,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Docker Image Name run: | @@ -24,10 +24,10 @@ jobs: if: startsWith(github.ref, 'refs/tags/') - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: platforms: linux/amd64,linux/arm64,linux/arm/7 driver-opts: 'image=moby/buildkit:v0.10.5' @@ -52,7 +52,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Docker Image Name run: | @@ -79,7 +79,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Docker Image Name run: | @@ -107,7 +107,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Docker Image Name run: | @@ -115,7 +115,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -146,7 +146,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Docker Image Name run: | @@ -154,7 +154,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -187,7 +187,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Docker Image Name run: | @@ -195,7 +195,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/Dockerfile b/Dockerfile index f1bb691..2418ddb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,9 @@ ENV ENVIRONMENT_NAME=PROD RUN apt update && apt install -y unzip vim wget curl # Add CodeSignTool -ADD --chown=root:root https://github.com/SSLcom/CodeSignTool/releases/download/v1.2.7/CodeSignTool-v1.2.7.zip /tmp/CodeSignTool-v1.2.7.zip +ADD --chown=root:root https://github.com/SSLcom/CodeSignTool/releases/download/v1.3.0/CodeSignTool-v1.3.0.zip /tmp/CodeSignTool-v1.3.0.zip -RUN unzip "/tmp/CodeSignTool-v1.2.7.zip" -d "/tmp" && mv "/tmp/CodeSignTool-v1.2.7" "/codesign" && \ +RUN mkdir -p "/codesign" && unzip "/tmp/CodeSignTool-v1.3.0.zip" -d "/codesign" && \ chmod +x "/codesign/CodeSignTool.sh" && ln -s "/codesign/CodeSignTool.sh" "/usr/bin/codesign" COPY ./codesign-tool/ /codesign diff --git a/Dockerfile-ltsc2019 b/Dockerfile-ltsc2019 index e198f3a..b3e5e9d 100644 --- a/Dockerfile-ltsc2019 +++ b/Dockerfile-ltsc2019 @@ -46,11 +46,10 @@ CMD ["jshell"] # Add CodeSignTool RUN New-Item -ItemType Directory -Force -Path C:\Setup -RUN Invoke-WebRequest -OutFile C:\Setup\CodeSignTool-v1.2.7.zip "https://www.ssl.com/download/codesigntool-for-windows" +RUN Invoke-WebRequest -OutFile C:\Setup\CodeSignTool-v1.3.0.zip "https://www.ssl.com/download/codesigntool-for-windows" -RUN Expand-Archive -LiteralPath C:\Setup\CodeSignTool-v1.2.7.zip -DestinationPath C:/ -Force -RUN Move-Item -Destination "C:\CodeSignTool" -Path "C:\CodeSignTool-v1.2.7-windows" RUN New-Item -ItemType Directory -Force -Path C:\CodeSignTool +RUN Expand-Archive -LiteralPath C:\Setup\CodeSignTool-v1.3.0.zip -DestinationPath C:/CodeSignTool -Force COPY ./codesign-tool C:/CodeSignTool COPY ./entrypoint.ps1 C:/CodeSignTool/entrypoint.ps1 diff --git a/Dockerfile-ltsc2022 b/Dockerfile-ltsc2022 index 12243a8..554acc0 100644 --- a/Dockerfile-ltsc2022 +++ b/Dockerfile-ltsc2022 @@ -46,11 +46,10 @@ CMD ["jshell"] # Add CodeSignTool RUN New-Item -ItemType Directory -Force -Path C:\Setup -RUN Invoke-WebRequest -OutFile C:\Setup\CodeSignTool-v1.2.7.zip "https://www.ssl.com/download/codesigntool-for-windows" +RUN Invoke-WebRequest -OutFile C:\Setup\CodeSignTool-v1.3.0.zip "https://www.ssl.com/download/codesigntool-for-windows" -RUN Expand-Archive -LiteralPath C:\Setup\CodeSignTool-v1.2.7.zip -DestinationPath C:/ -Force -RUN Move-Item -Destination "C:\CodeSignTool" -Path "C:\CodeSignTool-v1.2.7-windows" RUN New-Item -ItemType Directory -Force -Path C:\CodeSignTool +RUN Expand-Archive -LiteralPath C:\Setup\CodeSignTool-v1.3.0.zip -DestinationPath C:/CodeSignTool -Force COPY ./codesign-tool C:/CodeSignTool COPY ./entrypoint.ps1 C:/CodeSignTool/entrypoint.ps1 diff --git a/codesign-tool/conf/code_sign_tool.properties b/codesign-tool/conf/code_sign_tool.properties index 5816569..72378c7 100644 --- a/codesign-tool/conf/code_sign_tool.properties +++ b/codesign-tool/conf/code_sign_tool.properties @@ -1,4 +1,5 @@ CLIENT_ID=kaXTRACNijSWsFdRKg_KAfD3fqrBlzMbWs6TwWHwAn8 OAUTH2_ENDPOINT=https://login.ssl.com/oauth2/token CSC_API_ENDPOINT=https://cs.ssl.com -TSA_URL=http://ts.ssl.com \ No newline at end of file +TSA_URL=http://ts.ssl.com +TSA_LEGACY_URL=http://ts.ssl.com/legacy diff --git a/codesign-tool/conf/code_sign_tool_demo.properties b/codesign-tool/conf/code_sign_tool_demo.properties index 01a534c..265339a 100644 --- a/codesign-tool/conf/code_sign_tool_demo.properties +++ b/codesign-tool/conf/code_sign_tool_demo.properties @@ -1,4 +1,5 @@ CLIENT_ID=qOUeZCCzSqgA93acB3LYq6lBNjgZdiOxQc-KayC3UMw OAUTH2_ENDPOINT=https://oauth-sandbox.ssl.com/oauth2/token CSC_API_ENDPOINT=https://cs-try.ssl.com -TSA_URL=http://ts.ssl.com \ No newline at end of file +TSA_URL=http://ts.ssl.com +TSA_LEGACY_URL=http://ts.ssl.com/legacy diff --git a/entrypoint.sh b/entrypoint.sh index 584c0cf..63cfd08 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -40,7 +40,7 @@ if [[ ! "${CMD[@]}" =~ .*"--help".* ]]; then fi RESULT=$(bash -c "set -e; $COMMAND") -if [[ "$RESULT" =~ .*"Error".* || "$RESULT" =~ .*"Exception".* || "$RESULT" =~ .*"Missing required option".* || $RESULT =~ .*"Unmatched arguments from".* ]]; then +if [[ "$RESULT" =~ .*"Error".* || "$RESULT" =~ .*"Exception".* || "$RESULT" =~ .*"Missing required option".* || $RESULT =~ .*"Unmatched arguments from".* || $RESULT =~ .*"Unmatched argument".* ]]; then echo "Something Went Wrong. Please try again." echo "$RESULT" exit 1