Skip to content

Commit 8d18458

Browse files
authored
integration of dive-dsa-slicer repo (#219)
* integration of dive-dsa-slicer repo * update github ci uses * update readme
1 parent 5547214 commit 8d18458

File tree

83 files changed

+12228
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+12228
-12
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
-
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121
-
22-
uses: actions/setup-node@v2
22+
uses: actions/setup-node@v3
2323
with:
2424
node-version: '20.10.0'
2525
-
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: NPM Publish DIVE-DSA-Slicer
2+
on:
3+
workflow_dispatch:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
name: Publish Vue Girder SlicerCLI UI Client Library
11+
defaults:
12+
run:
13+
working-directory: ./
14+
steps:
15+
- uses: actions/checkout@v3
16+
# Setup .npmrc file to publish to npm
17+
- uses: actions/setup-node@v3
18+
with:
19+
node-version: '20.x'
20+
registry-url: 'https://registry.npmjs.org'
21+
- run: npm install
22+
working-directory: ./dive-dsa-slicer/vue-girder-slicer-ui
23+
- run: npm run build
24+
working-directory: ./dive-dsa-slicer/vue-girder-slicer-ui
25+
- run: npm publish
26+
working-directory: ./dive-dsa-slicer/vue-girder-slicer-ui
27+
env:
28+
NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: NPM Publish
1+
name: NPM Publish DIVE-DSA
22
on:
33
workflow_dispatch:
44
release:
@@ -21,4 +21,4 @@ jobs:
2121
- run: yarn build:web
2222
- run: yarn publish
2323
env:
24-
NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
24+
NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Build DIVE-DSA-Slicer Docker Images
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- main
7+
jobs:
8+
publish:
9+
name: Publish Docker Container
10+
runs-on: ubuntu-latest
11+
steps:
12+
-
13+
uses: actions/checkout@v3
14+
-
15+
name: Set up Docker Buildx
16+
uses: docker/setup-buildx-action@v2
17+
-
18+
name: Login to GitHub Container Registry
19+
uses: docker/login-action@v2
20+
with:
21+
registry: ghcr.io
22+
username: ${{ github.actor }}
23+
password: ${{ secrets.GITHUB_TOKEN }}
24+
-
25+
name: Build and push web
26+
uses: docker/build-push-action@v3
27+
with:
28+
context: ./dive-dsa-slicer
29+
file: example-docker-containers/Dockerfile
30+
tags: ghcr.io/DigitalSlideArchive/dive-dsa/dive-dsa-slicer-examples:latest
31+
push: true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
with:
2828
context: .
2929
file: docker/girder.Dockerfile
30-
tags: ghcr.io/DigitalSlideArchive/dive-dsa/dive-dsa-web:latest
30+
tags: ghcr.io/digitalslidearchive/dive-dsa/dive-dsa-web:latest
3131
push: true
3232
-
3333
name: Build and push worker
3434
uses: docker/build-push-action@v3
3535
with:
3636
context: .
3737
file: docker/girder_worker.Dockerfile
38-
tags: ghcr.io/DigitalSlideArchive/dive-dsa/dive-dsa-worker:latest
38+
tags: ghcr.io/digitalslidearchive/dive-dsa/dive-dsa-worker:latest
3939
push: true
4040

4141
docs:

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
<img src="http://www.viametoolkit.org/wp-content/uploads/2016/08/viami_logo.png" alt="VIAME Logo" width="200" height="78">
2-
31
DIVE is a web interface for performing data management, video annotation, and running a portion of the algorithms stored within the [VIAME](https://github.com/VIAME/VIAME) repository. When compiled, docker instances for DIVE can be run either as local servers or online in web services. A sample instance of DIVE is running on a public server at [viame.kitware.com](https://viame.kitware.com).
42

5-
THis is a version of DIVE that integrates with [Digital Slide Archive](https://digitalslidearchive.github.io/digital_slide_archive/). There are features and differences with the core DIVE functionality. The DIVE-DSA user guide lists all new features and functionality.
3+
This is a version of DIVE that integrates with [Digital Slide Archive](https://digitalslidearchive.github.io/digital_slide_archive/). There are features and differences with the core DIVE functionality. The [DIVE-DSA user guide] (https://DigitalSlideArchive.github.io/dive-dsa/) lists all new features and functionality.
64

75
![docs/images/Banner.png](docs/images/Banner.png)
86

client/platform/web-girder/views/SlicerTaskRunner.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ export default defineComponent({
189189
<v-card-text>
190190
<p>
191191
This is a beta version of providing a Slicer CLI task running interface inside of DIVE. It will eventually be used inside of other DSA projects like volview and histomics. Please underststand that this is a <b>Beta</b> version and will likely have some bugs.
192-
Any bugs that are found please provide details in an issue (including a screenshot if possible) to: <a target="_blank" href="https://github.com/BryonLewis/dive-dsa-slicer/issues"> DIVE-DSA Github Isssue Page </a>
192+
Any bugs that are found please provide details in an issue (including a screenshot if possible) to: <a target="_blank" href="https://github.com/DigitalSlideArchive/dive-dsa/issues"> DIVE-DSA Github Isssue Page </a>
193193
</p>
194-
<p><a href="https://github.com/BryonLewis/dive-dsa-slicer/tree/main/small-docker" target="_blank">Sample DIVE Tasks</a></p>
194+
<p><a href="https://github.com/DigitalSlideArchive/dive-dsa/tree/main/dive-dsa-slicer/example-docker-containers" target="_blank">Sample DIVE Tasks</a></p>
195195
<p>Sample tasks are on the Github Container Registry under the tag: <b>ghcr.io/bryonlewis/dive-dsa-slicer/dive-dsa-slicer:latest</b></p>
196196
<p>Below are some notes about it's operation</p>
197197
<ul style="list-style-type:disc;line-height: 2em;">

0 commit comments

Comments
 (0)