Skip to content

Commit 4b13e06

Browse files
authored
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.
1 parent f83cb9d commit 4b13e06

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

.github/actions/cpUtility-testing/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ runs:
2929

3030
- name: Set up Docker Buildx
3131
uses: docker/setup-buildx-action@v3
32+
with:
33+
driver-opts: image=moby/buildkit:v0.15.1
3234

3335
- name: Configure AWS Credentials
3436
uses: aws-actions/configure-aws-credentials@v4

.github/workflows/pr-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ jobs:
103103

104104
- name: Set up Docker Buildx
105105
uses: docker/setup-buildx-action@v3
106+
with:
107+
driver-opts: image=moby/buildkit:v0.15.1
106108
if: ${{ matrix.os == 'ubuntu-latest' }}
107109

108110
- name: Build image for testing

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ ARG ADOT_JAVA_VERSION
5151
COPY --from=builder /usr/src/cp-utility/bin/cp-utility /bin/cp
5252

5353

54-
COPY --chmod=0644 ./otelagent/build/libs/aws-opentelemetry-agent-${ADOT_JAVA_VERSION}.jar /javaagent.jar
54+
COPY --chmod=go+r ./otelagent/build/libs/aws-opentelemetry-agent-${ADOT_JAVA_VERSION}.jar /javaagent.jar

0 commit comments

Comments
 (0)