Skip to content
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
14 changes: 7 additions & 7 deletions .github/actions/fsat-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ description: Set up the Full Stack Asset Transfer Guide Dependencies
inputs:
node-version:
description: Version of node
default: 20.x
default: "lts/*"
just-version:
description: Just Version
default: "1.24.0"
default: "1.43.0"
k9s-version:
description: k9s Version
default: v0.25.3
default: v0.50.15
fabric-version:
description: Version of Hyperledger Fabric
default: "2.5.13"
default: "2.5.14"
ca-version:
description: Version of Hyperledger Fabric CA
default: "1.5.15"

runs:
using: "composite"
steps:
- uses: actions/setup-node@v4
- uses: actions/setup-node@v6
with:
node-version: ${{ inputs.node-version }}
cache: "npm"
Expand All @@ -29,8 +29,8 @@ runs:
- name: Install k9s
shell: bash
run: |
curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/${{ inputs.k9s-version }}/k9s_Linux_x86_64.tar.gz -o /tmp/k9s_Linux_x86_64.tar.gz
tar -zxf /tmp/k9s_Linux_x86_64.tar.gz -C /usr/local/bin k9s
curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/${{ inputs.k9s-version }}/k9s_Linux_amd64.tar.gz -o /tmp/k9s_Linux_amd64.tar.gz
tar -zxf /tmp/k9s_Linux_amd64.tar.gz -C /usr/local/bin k9s
sudo chown root /usr/local/bin/k9s
sudo chmod 755 /usr/local/bin/k9s

Expand Down
12 changes: 6 additions & 6 deletions .github/actions/test-network-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@ description: Set up the Test Network Runtime
inputs:
go-version:
description: Version of go
default: "1.23"
default: stable
node-version:
description: Version of node
default: 20.x
default: "lts/*"
java-version:
description: Version of JDK
default: 25.x
fabric-version:
description: Version of Hyperledger Fabric
default: 2.5.13
default: 2.5.14
ca-version:
description: Version of Hyperledger Fabric CA
default: 1.5.15

runs:
using: "composite"
steps:
- uses: actions/setup-go@v5
- uses: actions/setup-go@v6
with:
go-version: ${{ inputs.go-version }}
cache-dependency-path: "**/go.sum"

- uses: actions/setup-node@v4
- uses: actions/setup-node@v6
with:
node-version: ${{ inputs.node-version }}
cache: "npm"
cache-dependency-path: "**/package-lock.json"

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: temurin
java-version: ${{ inputs.java-version }}
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,16 @@ concurrency:
cancel-in-progress: true

env:
GO_VER: "1.23"
NODE_VER: 20.x
NODE_VER: "lts/*"
JAVA_VER: 25.x

jobs:
go:
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
steps:
- uses: actions/setup-go@v5
- uses: actions/setup-go@v6
with:
go-version: ${{ env.GO_VER }}
go-version: stable
- uses: actions/checkout@v5
- run: go install golang.org/x/tools/cmd/goimports@latest
- run: ci/scripts/lint-go.sh
Expand All @@ -35,7 +34,7 @@ jobs:
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
steps:
- uses: actions/checkout@v5
- uses: actions/setup-node@v5
- uses: actions/setup-node@v6
with:
node-version: ${{ env.NODE_VER }}
- run: ci/scripts/lint-typescript.sh
Expand All @@ -44,7 +43,7 @@ jobs:
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
steps:
- uses: actions/checkout@v5
- uses: actions/setup-node@v5
- uses: actions/setup-node@v6
with:
node-version: ${{ env.NODE_VER }}
- run: ci/scripts/lint-javascript.sh
Expand All @@ -53,7 +52,7 @@ jobs:
runs-on: ${{ github.repository == 'hyperledger/fabric-samples' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: temurin
java-version: ${{ env.JAVA_VER }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rest-sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: REST Sample 🐧
run-name: ${{ github.actor }} is testing the REST Sample 🐧

env:
NODE_VER: 20.x
NODE_VER: "lts/*"

on:
workflow_dispatch:
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v5

- uses: actions/setup-node@v5
- uses: actions/setup-node@v6
with:
node-version: ${{ env.NODE_VER }}
cache: "npm"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-network-bft-orderer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network with BFT Orderer tests
on:
workflow_dispatch:
push:
branches: [ "main" ]
branches: ["main"]
pull_request:
branches: [ "main" ]
branches: ["main"]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
# Note: The default Fabric version for CI is currently the latest LTS (v2.5.x).
# To test BFT Orderers, Fabric v3.x is explicitly specified here.
with:
fabric-version: 3.1.1
fabric-version: 3.1.3

- name: Run Test Network with BFT Orderers
working-directory: test-network
Expand Down
5 changes: 1 addition & 4 deletions asset-transfer-basic/chaincode-external/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

ARG GO_VER=1.23
ARG ALPINE_VER=3.21

FROM golang:${GO_VER}-alpine${ALPINE_VER}
FROM golang:alpine

WORKDIR /go/src/github.com/hyperledger/fabric-samples/asset-transfer-basic/chaincode-external
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions asset-transfer-basic/chaincode-typescript/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
FROM node:22 AS builder
FROM node:lts AS builder

WORKDIR /usr/src/app

Expand All @@ -11,7 +11,7 @@ ENV npm_config_cache=/usr/src/app
RUN npm ci && npm run package


FROM node:22 AS production
FROM node:lts AS production
ARG CC_SERVER_PORT

# Setup tini to work better handle signals
Expand Down
4 changes: 2 additions & 2 deletions asset-transfer-basic/rest-api-typescript/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22-alpine AS build
FROM node:lts-alpine AS build

RUN apk add --no-cache g++ make python3 dumb-init

Expand All @@ -10,7 +10,7 @@ RUN npm ci
RUN npm run build
RUN npm prune --production

FROM node:22-alpine
FROM node:lts-alpine
ENV NODE_ENV production
WORKDIR /app

Expand Down
4 changes: 2 additions & 2 deletions asset-transfer-private-data/chaincode-typescript/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
FROM node:22 AS builder
FROM node:lts AS builder

WORKDIR /usr/src/app

Expand All @@ -11,7 +11,7 @@ ENV npm_config_cache=/usr/src/app
RUN npm ci && npm run package


FROM node:22 AS production
FROM node:lts AS production
ARG CC_SERVER_PORT

# Setup tini to work better handle signals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22-alpine AS build
FROM node:lts-alpine AS build
WORKDIR /app
COPY package.json /app
RUN npm install
Expand Down
8 changes: 4 additions & 4 deletions full-stack-asset-transfer-guide/check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ then
echo "curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Darwin_arm64.tar.gz -o /tmp/k9s_Darwin_arm64.tar.gz"
echo "tar -zxf /tmp/k9s_Darwin_arm64.tar.gz -C /usr/local/bin k9s"
else
echo "curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Darwin_x86_64.tar.gz -o /tmp/k9s_Darwin_x86_64.tar.gz"
echo "tar -zxf /tmp/k9s_Darwin_x86_64.tar.gz -C /usr/local/bin k9s"
echo "curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Darwin_amd64.tar.gz -o /tmp/k9s_Darwin_amd64.tar.gz"
echo "tar -zxf /tmp/k9s_Darwin_amd64.tar.gz -C /usr/local/bin k9s"
fi
else
echo "curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_x86_64.tar.gz -o /tmp/k9s_Linux_x86_64.tar.gz"
echo "tar -zxf /tmp/k9s_Linux_x86_64.tar.gz -C /usr/local/bin k9s"
echo "curl --fail --silent --show-error -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_amd64.tar.gz -o /tmp/k9s_Linux_amd64.tar.gz"
echo "tar -zxf /tmp/k9s_Linux_amd64.tar.gz -C /usr/local/bin k9s"
fi
echo "sudo chown root /usr/local/bin/k9s"
echo "sudo chmod 755 /usr/local/bin/k9s"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
FROM node:22 AS builder
FROM node:lts AS builder

WORKDIR /usr/src/app

Expand All @@ -12,7 +12,7 @@ RUN npm install
RUN npm run build && npm shrinkwrap


FROM node:22 as prod-builder
FROM node:lts as prod-builder
WORKDIR /usr/src/app
COPY --chown=node:node --from=builder /usr/src/app/dist ./dist
COPY --chown=node:node --from=builder /usr/src/app/package.json ./
Expand All @@ -21,7 +21,7 @@ RUN npm ci --omit=dev && npm cache clean --force

# ------------------------------------------------------------------------------
# Builds the Chaincode as a Service docker version
FROM node:22 AS ccaas
FROM node:lts AS ccaas
WORKDIR /usr/src/app

ARG TARGETARCH
Expand All @@ -47,7 +47,7 @@ ENTRYPOINT [ "/tini", "--", "/usr/src/app/docker-entrypoint.sh" ]

# ------------------------------------------------------------------------------
# Builds the chaincode for the k8s builder
FROM node:22 AS k8s
FROM node:lts AS k8s
WORKDIR /usr/src/app

ARG TARGETARCH
Expand All @@ -66,4 +66,3 @@ RUN chmod +x /tini
ENV NODE_ENV=production
USER node
ENTRYPOINT [ "/tini", "--", "/usr/src/app/docker-entrypoint.sh" ]

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

write_files:
- path: /config/provision-root.sh
permissions: '0744'
permissions: "0744"
content: |
#!/usr/bin/env bash
set -ex
Expand Down Expand Up @@ -33,8 +33,8 @@ write_files:
# Install k9s
K9S_VERSION=0.25.3
if [ ! -x "/usr/local/bin/k9s" ]; then
curl --fail --silent --show-error -L "https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_x86_64.tar.gz" -o "/tmp/k9s_Linux_x86_64.tar.gz"
tar -zxf "/tmp/k9s_Linux_x86_64.tar.gz" -C /usr/local/bin k9s
curl --fail --silent --show-error -L "https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_amd64.tar.gz" -o "/tmp/k9s_Linux_amd64.tar.gz"
tar -zxf "/tmp/k9s_Linux_amd64.tar.gz" -C /usr/local/bin k9s
chown root:root /usr/local/bin/k9s
chmod 755 /usr/local/bin/k9s
fi
Expand Down
Loading
Loading