Skip to content

Update to ccf-5.0.0 #249

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Update to ccf-5.0.0 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "CCF Samples",
"image": "mcr.microsoft.com/ccf/app/dev:4.0.12-virtual",
"image": "ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0",
"customizations": {
"vscode": {
"extensions": [
Expand Down
4 changes: 2 additions & 2 deletions auditable-logging-app/docker/ccf_app_js.virtual
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Build
FROM mcr.microsoft.com/ccf/app/dev:4.0.12-virtual as builder
FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0 as builder

# Run
FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-virtual
FROM ghcr.io/microsoft/ccf/app/run-js/virtual:ccf-5.0.0

# Note: libjs_generic.virtual is not included in run-js container
COPY --from=builder /opt/ccf_virtual/lib/libjs_generic.virtual.so /usr/lib/ccf
Expand Down
2 changes: 1 addition & 1 deletion auditable-logging-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"node": ">=16"
},
"dependencies": {
"@microsoft/ccf-app": "^4.0.0",
"@microsoft/ccf-app": "^5.0.0",
"js-base64": "^3.5.2",
"jsrsasign": "^11.0.0",
"jsrsasign-util": "^1.0.2",
Expand Down
4 changes: 2 additions & 2 deletions banking-app/docker/ccf_app_js.enclave
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Build
FROM mcr.microsoft.com/ccf/app/dev:4.0.12-sgx as builder
FROM ghcr.io/microsoft/ccf/app/dev/sgx:ccf-5.0.0 as builder

# Run
FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-sgx
FROM ghcr.io/microsoft/ccf/app/run-js/sgx:ccf-5.0.0

# copy configuration into image
COPY ./governance/constitution/*.js /app/
Expand Down
4 changes: 2 additions & 2 deletions banking-app/docker/ccf_app_js.virtual
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Build
FROM mcr.microsoft.com/ccf/app/dev:4.0.12-virtual as builder
FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0 as builder

# Run
FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-virtual
FROM ghcr.io/microsoft/ccf/app/run-js/virtual:ccf-5.0.0

# Note: libjs_generic.virtual is not included in run-js container
COPY --from=builder /opt/ccf_virtual/lib/libjs_generic.virtual.so /usr/lib/ccf
Expand Down
2 changes: 1 addition & 1 deletion banking-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"node": ">=16"
},
"dependencies": {
"@microsoft/ccf-app": "^4.0.12",
"@microsoft/ccf-app": "^5.0.0",
"js-base64": "^3.5.2",
"jsrsasign": "^11.0.0",
"jsrsasign-util": "^1.0.2",
Expand Down
4 changes: 2 additions & 2 deletions data-reconciliation-app/docker/ccf_app_js.enclave
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Build
FROM mcr.microsoft.com/ccf/app/dev:4.0.12-sgx as builder
FROM ghcr.io/microsoft/ccf/app/dev/sgx:ccf-5.0.0 as builder

# Run
FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-sgx
FROM ghcr.io/microsoft/ccf/app/run-js/sgx:ccf-5.0.0

# copy configuration into image
COPY ./governance/constitution/*.js /app/
Expand Down
4 changes: 2 additions & 2 deletions data-reconciliation-app/docker/ccf_app_js.virtual
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Build
FROM mcr.microsoft.com/ccf/app/dev:4.0.12-virtual as builder
FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0 as builder

# Run
FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-virtual
FROM ghcr.io/microsoft/ccf/app/run-js/virtual:ccf-5.0.0

# Note: libjs_generic.virtual is not included in run-js container
COPY --from=builder /opt/ccf_virtual/lib/libjs_generic.virtual.so /usr/lib/ccf
Expand Down
2 changes: 1 addition & 1 deletion data-reconciliation-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"node": ">=16"
},
"dependencies": {
"@microsoft/ccf-app": "^4.0.12",
"@microsoft/ccf-app": "^5.0.0",
"axios": "^1.2.4",
"crypto-js": "^4.2.0",
"inquirer": "9.1.4",
Expand Down
2 changes: 1 addition & 1 deletion decentralize-rbac-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"node": ">=16"
},
"dependencies": {
"@microsoft/ccf-app": "^4.0.12",
"@microsoft/ccf-app": "^5.0.0",
"axios": "^1.2.4",
"crypto-js": "^3.1.9-1",
"inquirer": "9.1.4",
Expand Down
3 changes: 2 additions & 1 deletion express-debug/bundle_loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import * as path from "path";

import yargs from "yargs";

console.info(process.argv);
const argv = yargs(process.argv.slice(2)).option("bundle", {
describe: "JSON bundle describing application to host",
type: "string",
Expand All @@ -28,7 +29,7 @@ export async function resolve(specifier, context, nextResolve) {
}
canonicalSpecifier = path.resolve(
path.dirname(canonicalSpecifier),
specifier,
specifier
);
canonicalSpecifier = path.relative(targetRoot, canonicalSpecifier);
specifier = canonicalSpecifier;
Expand Down
2 changes: 1 addition & 1 deletion express-debug/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"type": "module",
"dependencies": {
"@microsoft/ccf-app": "^4.0.12",
"@microsoft/ccf-app": "^5.0.0",
"express": "^4.18.2",
"jsonwebtoken": "^9.0.0",
"pem": "^1.14.8",
Expand Down
Loading