Skip to content

Commit a95df55

Browse files
Fix KasmVNC QuPath CI and branch isolation
Co-authored-by: Florian Wuennemann <flowuenne@gmail.com>
1 parent ceb37da commit a95df55

22 files changed

Lines changed: 16 additions & 1424 deletions

.github/workflows/docker-pr.yml

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,20 @@ jobs:
1515
matrix: ${{ steps.set-matrix.outputs.matrix }}
1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1919

2020
- name: Detect changed Dockerfiles
2121
id: changes
22-
uses: dorny/paths-filter@v3
22+
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
2323
with:
2424
filters: |
25-
ttyd:
26-
- 'ttyd/**'
27-
streamlit:
28-
- 'streamlit/**'
29-
cellxgene:
30-
- 'cellxgene/**'
31-
shiny:
32-
- 'shiny-simple-example/**'
33-
marimo:
34-
- 'marimo/**'
3525
kasmvnc_qupath:
3626
- '.seqera/**'
37-
- 'kasmVNC/qupath/**'
3827
3928
- name: Set matrix
4029
id: set-matrix
4130
run: |
4231
CONTAINERS="[]"
43-
if [[ "${{ steps.changes.outputs.ttyd }}" == "true" ]]; then
44-
CONTAINERS=$(echo "$CONTAINERS" | jq -c '. + [{"name":"ttyd","path":"./ttyd"}]')
45-
fi
46-
if [[ "${{ steps.changes.outputs.streamlit }}" == "true" ]]; then
47-
CONTAINERS=$(echo "$CONTAINERS" | jq -c '. + [{"name":"streamlit","path":"./streamlit"}]')
48-
fi
49-
if [[ "${{ steps.changes.outputs.cellxgene }}" == "true" ]]; then
50-
CONTAINERS=$(echo "$CONTAINERS" | jq -c '. + [{"name":"cellxgene","path":"./cellxgene"}]')
51-
fi
52-
if [[ "${{ steps.changes.outputs.shiny }}" == "true" ]]; then
53-
CONTAINERS=$(echo "$CONTAINERS" | jq -c '. + [{"name":"shiny","path":"./shiny-simple-example"}]')
54-
fi
55-
if [[ "${{ steps.changes.outputs.marimo }}" == "true" ]]; then
56-
CONTAINERS=$(echo "$CONTAINERS" | jq -c '. + [{"name":"marimo","path":"./marimo"}]')
57-
fi
5832
if [[ "${{ steps.changes.outputs.kasmvnc_qupath }}" == "true" ]]; then
5933
CONTAINERS=$(echo "$CONTAINERS" | jq -c '. + [{"name":"kasmvnc-qupath","path":"./.seqera"}]')
6034
fi
@@ -75,28 +49,28 @@ jobs:
7549

7650
steps:
7751
- name: Checkout repository
78-
uses: actions/checkout@v4
52+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
7953

8054
- name: Log in to the Container registry
81-
uses: docker/login-action@v3
55+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
8256
with:
8357
registry: ${{ env.REGISTRY }}
8458
username: ${{ github.actor }}
8559
password: ${{ secrets.GHCR_TOKEN }}
8660

8761
- name: Set up Docker Buildx
88-
uses: docker/setup-buildx-action@v3
62+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2
8963

9064
- name: Extract metadata
9165
id: meta
92-
uses: docker/metadata-action@v5
66+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
9367
with:
9468
images: ${{ env.REGISTRY }}/${{ github.repository }}/development
9569
tags: |
9670
type=ref,event=pr,prefix=${{ matrix.container.name }}-pr
9771
9872
- name: Build and push ${{ matrix.container.name }}
99-
uses: docker/build-push-action@v5
73+
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25
10074
with:
10175
context: ${{ matrix.container.path }}
10276
push: true
@@ -112,7 +86,7 @@ jobs:
11286
echo "ref=${{ fromJSON(steps.meta.outputs.json).tags[0] }}" >> $GITHUB_OUTPUT
11387
11488
- name: Run security scan
115-
uses: aquasecurity/trivy-action@0.31.0
89+
uses: aquasecurity/trivy-action@76071ef0d7ec797419534a183b498b4d6366cf37
11690
with:
11791
image-ref: ${{ steps.scanref.outputs.ref }}
11892
format: "table"
@@ -133,7 +107,7 @@ jobs:
133107
fi
134108
135109
- name: Upload security scan results
136-
uses: actions/upload-artifact@v4
110+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
137111
if: always()
138112
with:
139113
name: trivy-scan-${{ matrix.container.name }}-${{ github.run_id }}
@@ -151,7 +125,7 @@ jobs:
151125
echo "- **Commit**: \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
152126
153127
- name: Comment on PR
154-
uses: actions/github-script@v7
128+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
155129
with:
156130
script: |
157131
const fs = require('fs');

.github/workflows/docker-release.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ on:
88
required: true
99
type: choice
1010
options:
11-
- ttyd
12-
- streamlit
13-
- cellxgene
14-
- shiny
15-
- marimo
1611
- kasmvnc-qupath
1712
version:
1813
description: 'Version to release (e.g., 1.0.0)'
@@ -37,33 +32,28 @@ jobs:
3732

3833
steps:
3934
- name: Checkout repository
40-
uses: actions/checkout@v4
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
4136

4237
- name: Set container path
4338
id: container
4439
run: |
4540
case "${{ inputs.container }}" in
46-
ttyd) echo "path=./ttyd" >> "$GITHUB_OUTPUT" ;;
47-
streamlit) echo "path=./streamlit" >> "$GITHUB_OUTPUT" ;;
48-
cellxgene) echo "path=./cellxgene" >> "$GITHUB_OUTPUT" ;;
49-
shiny) echo "path=./shiny-simple-example" >> "$GITHUB_OUTPUT" ;;
50-
marimo) echo "path=./marimo" >> "$GITHUB_OUTPUT" ;;
5141
kasmvnc-qupath) echo "path=./.seqera" >> "$GITHUB_OUTPUT" ;;
5242
esac
5343
5444
- name: Log in to the Container registry
55-
uses: docker/login-action@v3
45+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
5646
with:
5747
registry: ${{ env.REGISTRY }}
5848
username: ${{ github.actor }}
5949
password: ${{ secrets.GHCR_TOKEN }}
6050

6151
- name: Set up Docker Buildx
62-
uses: docker/setup-buildx-action@v3
52+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2
6353

6454
- name: Extract metadata
6555
id: meta
66-
uses: docker/metadata-action@v5
56+
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
6757
with:
6858
images: ${{ env.REGISTRY }}/${{ github.repository }}/${{ inputs.container }}
6959
tags: |
@@ -74,7 +64,7 @@ jobs:
7464
org.opencontainers.image.licenses=MIT
7565
7666
- name: Build and push ${{ inputs.container }}
77-
uses: docker/build-push-action@v5
67+
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25
7868
with:
7969
context: ${{ steps.container.outputs.path }}
8070
push: true
@@ -87,7 +77,7 @@ jobs:
8777
cache-to: type=gha,mode=max,scope=${{ inputs.container }}
8878

8979
- name: Create GitHub Release
90-
uses: softprops/action-gh-release@v2
80+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8
9181
with:
9282
tag_name: ${{ inputs.container }}/${{ inputs.version }}
9383
name: ${{ inputs.container }} ${{ inputs.version }}

cellxgene/Dockerfile

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)