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
10 changes: 5 additions & 5 deletions .github/workflows/docker_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set build tag
id: build_tag_generator
run: |
RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger-firefly/firefly-sandbox/releases/latest -s | jq .tag_name -r)
RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger-firefly/sandbox/releases/latest -s | jq .tag_name -r)
BUILD_TAG=$RELEASE_TAG-$(date +"%Y%m%d")-$GITHUB_RUN_NUMBER
echo ::set-output name=BUILD_TAG::$BUILD_TAG

Expand All @@ -24,17 +24,17 @@ jobs:
--label commit=$GITHUB_SHA \
--label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
--tag ghcr.io/hyperledger-firefly/firefly-sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
--tag ghcr.io/hyperledger-firefly/sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .

- name: Tag release
run: docker tag ghcr.io/hyperledger-firefly/firefly-sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger-firefly/firefly-sandbox:head
run: docker tag ghcr.io/hyperledger-firefly/sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger-firefly/sandbox:head

- name: Push docker image
run: |
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
docker push ghcr.io/hyperledger-firefly/firefly-sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }}
docker push ghcr.io/hyperledger-firefly/sandbox:${{ steps.build_tag_generator.outputs.BUILD_TAG }}

- name: Push head tag
run: |
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
docker push ghcr.io/hyperledger-firefly/firefly-sandbox:head
docker push ghcr.io/hyperledger-firefly/sandbox:head
8 changes: 4 additions & 4 deletions .github/workflows/docker_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ jobs:
- uses: actions/checkout@v4

- name: Build
run: docker build -t ghcr.io/hyperledger-firefly/firefly-sandbox:${GITHUB_REF##*/} .
run: docker build -t ghcr.io/hyperledger-firefly/sandbox:${GITHUB_REF##*/} .

- name: Tag release
if: github.event.action == 'released'
run: docker tag ghcr.io/hyperledger-firefly/firefly-sandbox:${GITHUB_REF##*/} ghcr.io/hyperledger-firefly/firefly-sandbox:latest
run: docker tag ghcr.io/hyperledger-firefly/sandbox:${GITHUB_REF##*/} ghcr.io/hyperledger-firefly/sandbox:latest

- name: Push docker image
run: |
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
docker push ghcr.io/hyperledger-firefly/firefly-sandbox:${GITHUB_REF##*/}
docker push ghcr.io/hyperledger-firefly/sandbox:${GITHUB_REF##*/}

- name: Push latest tag
if: github.event.action == 'released'
run: |
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
docker push ghcr.io/hyperledger-firefly/firefly-sandbox:latest
docker push ghcr.io/hyperledger-firefly/sandbox:latest
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# FireFly Sandbox

![version-ui](https://img.shields.io/github/package-json/v/hyperledger-firefly/firefly-sandbox?color=orange&filename=ui%2Fpackage.json&label=firefly-sandbox-ui)
![version-server](https://img.shields.io/github/package-json/v/hyperledger-firefly/firefly-sandbox?color=orange&filename=server%2Fpackage.json&label=firefly-sandbox-server)
![version-ui](https://img.shields.io/github/package-json/v/hyperledger-firefly/sandbox?color=orange&filename=ui%2Fpackage.json&label=firefly-sandbox-ui)
![version-server](https://img.shields.io/github/package-json/v/hyperledger-firefly/sandbox?color=orange&filename=server%2Fpackage.json&label=firefly-sandbox-server)
[![FireFly Documentation](https://img.shields.io/static/v1?label=FireFly&message=documentation&color=informational)](https://hyperledger.github.io/firefly/)

![Hyperledger FireFly](./images/hyperledger_firefly_logo.png)
Expand Down
6 changes: 3 additions & 3 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/hyperledger-firefly/firefly-sandbox.git"
"url": "git+https://github.com/hyperledger-firefly/sandbox.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/hyperledger-firefly/firefly-sandbox/issues"
"url": "https://github.com/hyperledger-firefly/sandbox/issues"
},
"homepage": "https://github.com/hyperledger-firefly/firefly-sandbox#readme",
"homepage": "https://github.com/hyperledger-firefly/sandbox#readme",
"dependencies": {
"@hyperledger/firefly-sdk": "^1.3.0",
"body-parser": "^1.20.0",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/constants/ResourceUrls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const ResourceUrls = {
'https://hyperledger.github.io/firefly/latest/tutorials/custom_contracts/ethereum#contract-deployment',
fireflyTutorialDeployContractFabric:
'https://hyperledger.github.io/firefly/latest/tutorials/custom_contracts/fabric',
sandBoxGH: 'https://github.com/hyperledger-firefly/firefly-sandbox',
sandBoxGH: 'https://github.com/hyperledger-firefly/sandbox',
solidityABI:
'https://docs.ethers.io/v5/api/utils/abi/formats/#abi-formats--solidity',
solidityInstall:
Expand Down
Loading