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

feat: update dockerfile to node 18 and sample mediator to askar #1622

Merged
merged 1 commit into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND noninteractive
# Define packages to install
ENV PACKAGES software-properties-common ca-certificates \
curl build-essential git \
libzmq3-dev libsodium-dev pkg-config
libzmq3-dev libsodium-dev pkg-config gnupg

# Combined update and install to ensure Docker caching works correctly
RUN apt-get update -y \
Expand All @@ -24,7 +24,9 @@ RUN curl http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1-1
# Add APT sources
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 \
&& add-apt-repository "deb https://repo.sovrin.org/sdk/deb bionic stable" \
&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
&& mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"next-version-bump": "ts-node ./scripts/get-next-bump.ts"
},
"devDependencies": {
"@hyperledger/aries-askar-nodejs": "^0.2.0-dev.1",
"@types/cors": "^2.8.10",
"@types/eslint": "^8.21.2",
"@types/express": "^4.17.13",
Expand Down
6 changes: 3 additions & 3 deletions samples/mediator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
import type { InitConfig } from '@aries-framework/core'
import type { Socket } from 'net'

import { ariesAskar } from '@hyperledger/aries-askar-nodejs'
import express from 'express'
import * as indySdk from 'indy-sdk'
import { Server } from 'ws'

import { TestLogger } from '../packages/core/tests/logger'

import { AskarModule } from '@aries-framework/askar'
import {
ConnectionsModule,
MediatorModule,
Expand All @@ -30,7 +31,6 @@ import {
LogLevel,
WsOutboundTransport,
} from '@aries-framework/core'
import { IndySdkModule } from '@aries-framework/indy-sdk'
import { HttpInboundTransport, agentDependencies, WsInboundTransport } from '@aries-framework/node'

const port = process.env.AGENT_PORT ? Number(process.env.AGENT_PORT) : 3001
Expand Down Expand Up @@ -60,7 +60,7 @@ const agent = new Agent({
config: agentConfig,
dependencies: agentDependencies,
modules: {
indySdk: new IndySdkModule({ indySdk }),
askar: new AskarModule({ ariesAskar }),
mediator: new MediatorModule({
autoAcceptMediationRequests: true,
}),
Expand Down
Loading