Skip to content

Commit

Permalink
Fix chmod from Dockerfile (#891)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
zzhlogin authored Sep 19, 2024
1 parent f83cb9d commit 4b13e06
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/actions/cpUtility-testing/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 4b13e06

Please sign in to comment.