From 4b13e06c7e46f8bf636fcd00800535e4ed1e8398 Mon Sep 17 00:00:00 2001 From: zzhlogin Date: Thu, 19 Sep 2024 12:27:38 -0700 Subject: [PATCH] Fix chmod from Dockerfile (#891) The Docker command doesn't work after new release of moby/buildkit. This PR use moby/buildkit:v0.15.1 version to re-use --chmod=go+r for jar agent build. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .github/actions/cpUtility-testing/action.yml | 2 ++ .github/workflows/pr-build.yml | 2 ++ Dockerfile | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/actions/cpUtility-testing/action.yml b/.github/actions/cpUtility-testing/action.yml index e01f9d1f7..883763ccd 100644 --- a/.github/actions/cpUtility-testing/action.yml +++ b/.github/actions/cpUtility-testing/action.yml @@ -29,6 +29,8 @@ runs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver-opts: image=moby/buildkit:v0.15.1 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 223bd82ae..38989dc65 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -103,6 +103,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver-opts: image=moby/buildkit:v0.15.1 if: ${{ matrix.os == 'ubuntu-latest' }} - name: Build image for testing diff --git a/Dockerfile b/Dockerfile index 8a0d81dbd..355901b12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,4 +51,4 @@ ARG ADOT_JAVA_VERSION COPY --from=builder /usr/src/cp-utility/bin/cp-utility /bin/cp -COPY --chmod=0644 ./otelagent/build/libs/aws-opentelemetry-agent-${ADOT_JAVA_VERSION}.jar /javaagent.jar +COPY --chmod=go+r ./otelagent/build/libs/aws-opentelemetry-agent-${ADOT_JAVA_VERSION}.jar /javaagent.jar