Skip to content

feat: upgrade to Verawood#69

Open
ahmed-arb wants to merge 12 commits into
releasefrom
verawood
Open

feat: upgrade to Verawood#69
ahmed-arb wants to merge 12 commits into
releasefrom
verawood

Conversation

@ahmed-arb

Copy link
Copy Markdown
Contributor

v22.0.0 verawood release

Epic: Verawood Sandbox and Release Preparation

Todos before merge

  • Ensure changelog-entry exists for verawood upgrade
  • Ensure changelog exists for v22
  • Ensure CI/Tests are working as expected
  • Ensure verawood branch is up-to-date with main (updated as of April 17, 2026)

Merge Option

  • Ensure "Merge Commit" option is used to merge the branch into release (Responsible: @ahmed-arb). This is needed to ensure the commit history when release is merged back into main

Generated by Claude Code on behalf of @ahmed-arb

Syed-Ali-Abbas-568 and others added 11 commits June 2, 2026 17:37
* fix: patch in dockerfile to update didkit package

Fix the patch to update didkit package in credentials that was added recently in Dockerfile, credentials build was failing as the commit patch was from master, not from release/ulmo branch.
This change fixes the below error.

```
 => CACHED [code 4/6] RUN curl -fsSL openedx/credentials@0b66761d681faf9e8df5f63  0.0s
 => CACHED [code 5/6] RUN curl -fsSL openedx/credentials@8bc7969fab022625e600f5b  0.0s
 => ERROR [code 6/6] RUN curl -fsSL openedx/credentials@b157908f5fd7e7b0ed9cb757  0.9s
------
 > importing cache manifest from docker.io/overhangio/openedx-credentials:21.0.2-cache:
------
------
 > [code 6/6] RUN curl -fsSL https://github.com/openedx/credentials/commit/b157908f5fd7e7b0ed9cb7577bcebb404d625bff.patch | git am:
0.828 error: patch failed: requirements/base.txt:55
0.828 error: requirements/base.txt: patch does not apply
0.828 error: patch failed: requirements/dev.txt:105
0.828 error: requirements/dev.txt: patch does not apply
0.828 error: patch failed: requirements/production.txt:80
0.828 error: requirements/production.txt: patch does not apply
0.828 error: patch failed: requirements/test.txt:97
0.828 error: requirements/test.txt: patch does not apply
0.828 hint: Use 'git am --show-current-patch=diff' to see the failed patch
0.828 Applying: chore(vc): update didkit package to openedx fork (#2976)
0.828 Patch failed at 0001 chore(vc): update didkit package to openedx fork (#2976)
0.828 When you have resolved this problem, run "git am --continue".
0.828 If you prefer to skip this patch, run "git am --skip" instead.
0.828 To restore the original branch and stop patching, run "git am --abort".
------

 2 warnings found (use --debug to expand):
 - SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "CREDENTIALS_REPOSITORY") (line 45)
 - SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "CREDENTIALS_CFG") (line 152)
Dockerfile:60
--------------------
  58 |     RUN curl -fsSL https://github.com/openedx/credentials/commit/8bc7969fab022625e600f5ba03c70ccda3ccf905.patch | git am
  59 |     ## Update didkit package to openedx fork
  60 | >>> RUN curl -fsSL https://github.com/openedx/credentials/commit/b157908f5fd7e7b0ed9cb7577bcebb404d625bff.patch | git am
  61 |
  62 |
--------------------
ERROR: failed to solve: process "/bin/sh -c curl -fsSL https://github.com/openedx/credentials/commit/b157908f5fd7e7b0ed9cb7577bcebb404d625bff.patch | git am" did not complete successfully: exit code: 128

View build details: docker-desktop://dashboard/build/desktop-linux/desktop-linux/usxqexttl9ng86zvw0dqgfjy7
Error: Command failed with status 1: docker buildx build --tag=docker.io/overhangio/openedx-credentials:21.0.2 --output=type=docker --cache-from=type=registry,ref=docker.io/overhangio/openedx-credentials:21.0.2-cache /Users/faraz.maqsood/Desktop/test/tutor_env/env/plugins/credentials/build/credentials
```

* docs: update changelog for v21.0.2
Generated by Claude Code on behalf of @ahmed-arb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Pending Triage

Development

Successfully merging this pull request may close these issues.

5 participants