Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docker build after buildkit change #4204

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Fix docker build after buildkit change #4204

merged 1 commit into from
Mar 18, 2024

Conversation

timothycoleman
Copy link
Contributor

@timothycoleman timothycoleman commented Mar 16, 2024

Updated: dockerfile for newer buildkit

The CI has started reporting

17 |
18 | WORKDIR /build/.git
19 | >>> COPY ./.git .
20 |
21 | WORKDIR /build/src

e.g. https://github.com/EventStore/EventStore/actions/runs/8295795061/job/22734132242

It may be that this commit moby/buildkit@a8d926a is causing the COPY line to be detected as a git ref now (because it ends in .git) but it isn't.

Adding the slash prevents this and doesn't change the behaviour of the COPY line (the commit SHA is still printed correctly in the ES VERSION line).

The CI has started reporting

17 |
18 | WORKDIR /build/.git
19 | >>> COPY ./.git .
20 |
21 | WORKDIR /build/src

e.g. https://github.com/EventStore/EventStore/actions/runs/8295795061/job/22734132242

It may be that this commit moby/buildkit@a8d926a is causing the COPY line to be detected as a git ref now (because it ends in .git) but it isn't

Adding the slash prevents this and doesn't change the behaviour of the COPY line (the commit SHA is still printed correctly in the ES VERSION line)
@hayley-jean hayley-jean merged commit ceb86ba into master Mar 18, 2024
13 checks passed
@hayley-jean hayley-jean deleted the fix-docker-ci branch March 18, 2024 10:57
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚨 @hayley-jean Failed to create cherry Pick PR due to error:

RequestError [HttpError]: Merge conflict
   at /home/runner/work/_actions/EventStore/Automations/master/cherry-pick-pr-for-label/node_modules/@octokit/request/dist-node/index.js:66:23
   at processTicksAndRejections (node:internal/process/task_queues:96:5) {
 status: 409,
 headers: {
   'access-control-allow-origin': '*',
   'access-control-expose-headers': 'ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset',
   connection: 'close',
   'content-length': '112',
   'content-security-policy': "default-src 'none'",
   'content-type': 'application/json; charset=utf-8',
   date: 'Mon, 18 Mar 2024 10:57:27 GMT',
   'referrer-policy': 'origin-when-cross-origin, strict-origin-when-cross-origin',
   server: 'GitHub.com',
   'strict-transport-security': 'max-age=31536000; includeSubdomains; preload',
   vary: 'Accept-Encoding, Accept, X-Requested-With',
   'x-accepted-github-permissions': 'contents=write',
   'x-content-type-options': 'nosniff',
   'x-frame-options': 'deny',
   'x-github-api-version-selected': '2022-11-28',
   'x-github-media-type': 'github.v3; format=json',
   'x-github-request-id': '07C7:1E4A31:74E1CE4:D3F2DDC:65F81E16',
   'x-ratelimit-limit': '5000',
   'x-ratelimit-remaining': '4990',
   'x-ratelimit-reset': '1710763044',
   'x-ratelimit-resource': 'core',
   'x-ratelimit-used': '10',
   'x-xss-protection': '0'
 },
 request: {
   method: 'POST',
   url: 'https://api.github.com/repos/EventStore/EventStore/merges',
   headers: {
     accept: 'application/vnd.github.v3+json',
     'user-agent': 'octokit-core.js/3.3.2 Node.js/16.20.2 (linux; x64)',
     authorization: 'token [REDACTED]',
     'content-type': 'application/json; charset=utf-8'
   },
   body: '{"base":"cherry-pick-cherry-pick/4204/fix-docker-ci-release/oss-v22.10-85c5af36-8b18-486c-9a61-9f6703f5326f","commit_message":"Merge 202caf2867ca141de8e63d37862b5d7de94c2a80 into cherry-pick-cherry-pick/4204/fix-docker-ci-release/oss-v22.10-85c5af36-8b18-486c-9a61-9f6703f5326f [skip ci]\\n\\n\\nskip-checks: true\\n","head":"202caf2867ca141de8e63d37862b5d7de94c2a80"}',
   request: { agent: [Agent], hook: [Function: bound bound register] }
 },
 documentation_url: 'https://docs.github.com/rest/branches/branches#merge-a-branch'
}

🚨👉 Check https://github.com/EventStore/EventStore/actions/runs/8325369053

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚨 @hayley-jean Failed to create cherry Pick PR due to error:

RequestError [HttpError]: Merge conflict
   at /home/runner/work/_actions/EventStore/Automations/master/cherry-pick-pr-for-label/node_modules/@octokit/request/dist-node/index.js:66:23
   at processTicksAndRejections (node:internal/process/task_queues:96:5) {
 status: 409,
 headers: {
   'access-control-allow-origin': '*',
   'access-control-expose-headers': 'ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset',
   connection: 'close',
   'content-length': '112',
   'content-security-policy': "default-src 'none'",
   'content-type': 'application/json; charset=utf-8',
   date: 'Mon, 18 Mar 2024 10:57:30 GMT',
   'referrer-policy': 'origin-when-cross-origin, strict-origin-when-cross-origin',
   server: 'GitHub.com',
   'strict-transport-security': 'max-age=31536000; includeSubdomains; preload',
   vary: 'Accept-Encoding, Accept, X-Requested-With',
   'x-accepted-github-permissions': 'contents=write',
   'x-content-type-options': 'nosniff',
   'x-frame-options': 'deny',
   'x-github-api-version-selected': '2022-11-28',
   'x-github-media-type': 'github.v3; format=json',
   'x-github-request-id': '07D3:16B412:7C2CE1C:E210BD6:65F81E1A',
   'x-ratelimit-limit': '5000',
   'x-ratelimit-remaining': '4978',
   'x-ratelimit-reset': '1710763044',
   'x-ratelimit-resource': 'core',
   'x-ratelimit-used': '22',
   'x-xss-protection': '0'
 },
 request: {
   method: 'POST',
   url: 'https://api.github.com/repos/EventStore/EventStore/merges',
   headers: {
     accept: 'application/vnd.github.v3+json',
     'user-agent': 'octokit-core.js/3.3.2 Node.js/16.20.2 (linux; x64)',
     authorization: 'token [REDACTED]',
     'content-type': 'application/json; charset=utf-8'
   },
   body: '{"base":"cherry-pick-cherry-pick/4204/fix-docker-ci-release/oss-v23.10-3e14d684-6da5-41ad-be89-656fde0e7d1a","commit_message":"Merge 202caf2867ca141de8e63d37862b5d7de94c2a80 into cherry-pick-cherry-pick/4204/fix-docker-ci-release/oss-v23.10-3e14d684-6da5-41ad-be89-656fde0e7d1a [skip ci]\\n\\n\\nskip-checks: true\\n","head":"202caf2867ca141de8e63d37862b5d7de94c2a80"}',
   request: { agent: [Agent], hook: [Function: bound bound register] }
 },
 documentation_url: 'https://docs.github.com/rest/branches/branches#merge-a-branch'
}

🚨👉 Check https://github.com/EventStore/EventStore/actions/runs/8325369053

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hayley-jean 👉 Created pull request targeting release/oss-v24.2: #4205

sakno pushed a commit that referenced this pull request Mar 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants