Skip to content

Commit af14f91

Browse files
committed
bump selkies update dev docs
1 parent c4e4516 commit af14f91

11 files changed

Lines changed: 33 additions & 33 deletions

.github/workflows/call_issue_pr_tracker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
pull_request_review:
99
types: [submitted,edited,dismissed]
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
manage-project:
1316
permissions:

.github/workflows/call_issues_cron.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
- cron: '34 9 * * *'
55
workflow_dispatch:
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
stale:
912
permissions:

.github/workflows/external_trigger.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: External Trigger Main
33
on:
44
workflow_dispatch:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
external-trigger-master:
811
runs-on: ubuntu-latest

.github/workflows/external_trigger_scheduler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- cron: '36 * * * *'
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
external-trigger-scheduler:
1013
runs-on: ubuntu-latest

.github/workflows/greetings.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@ name: Greetings
22

33
on: [pull_request_target, issues]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
greeting:
10+
permissions:
11+
issues: write
12+
pull-requests: write
713
runs-on: ubuntu-latest
814
steps:
915
- uses: actions/first-interaction@v1

.github/workflows/package_trigger_scheduler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- cron: '14 0 * * 6'
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
package-trigger-scheduler:
1013
runs-on: ubuntu-latest

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
https://github.com/selkies-project/selkies.git \
1616
/src && \
1717
cd /src && \
18-
git checkout -f 4ee90c0ad946ebc22ff8e3076454345ec633a169
18+
git checkout -f fe4078c7e2a44af0637ce4c486fc61219d11a4fc
1919

2020
RUN \
2121
echo "**** build frontend ****" && \
@@ -182,7 +182,7 @@ RUN \
182182
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
183183
curl -o \
184184
/tmp/selkies.tar.gz -L \
185-
"https://github.com/selkies-project/selkies/archive/4ee90c0ad946ebc22ff8e3076454345ec633a169.tar.gz" && \
185+
"https://github.com/selkies-project/selkies/archive/fe4078c7e2a44af0637ce4c486fc61219d11a4fc.tar.gz" && \
186186
cd /tmp && \
187187
tar xf selkies.tar.gz && \
188188
cd selkies-* && \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
https://github.com/selkies-project/selkies.git \
1616
/src && \
1717
cd /src && \
18-
git checkout -f 4ee90c0ad946ebc22ff8e3076454345ec633a169
18+
git checkout -f fe4078c7e2a44af0637ce4c486fc61219d11a4fc
1919

2020
RUN \
2121
echo "**** build frontend ****" && \
@@ -180,7 +180,7 @@ RUN \
180180
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
181181
curl -o \
182182
/tmp/selkies.tar.gz -L \
183-
"https://github.com/selkies-project/selkies/archive/4ee90c0ad946ebc22ff8e3076454345ec633a169.tar.gz" && \
183+
"https://github.com/selkies-project/selkies/archive/fe4078c7e2a44af0637ce4c486fc61219d11a4fc.tar.gz" && \
184184
cd /tmp && \
185185
tar xf selkies.tar.gz && \
186186
cd selkies-* && \

Jenkinsfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ pipeline {
9494
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
9595
env.PULL_REQUEST = env.CHANGE_ID
9696
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
97+
if ( env.SYFT_IMAGE_TAG == null ) {
98+
env.SYFT_IMAGE_TAG = 'latest'
99+
}
97100
}
101+
echo "Using syft image tag ${SYFT_IMAGE_TAG}"
98102
sh '''#! /bin/bash
99103
echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
100104
script{
@@ -712,7 +716,7 @@ pipeline {
712716
docker run --rm \
713717
-v /var/run/docker.sock:/var/run/docker.sock:ro \
714718
-v ${TEMPDIR}:/tmp \
715-
ghcr.io/anchore/syft:v1.26.1 \
719+
ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
716720
${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
717721
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
718722
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@@ -822,6 +826,7 @@ pipeline {
822826
-e WEB_AUTH=\"${CI_AUTH}\" \
823827
-e WEB_PATH=\"${CI_WEBPATH}\" \
824828
-e NODE_NAME=\"${NODE_NAME}\" \
829+
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
825830
-t ghcr.io/linuxserver/ci:latest \
826831
python3 test_build.py'''
827832
}

README.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -205,20 +205,7 @@ This container can also be used as a rapid development environment for the Selki
205205
```
206206
git clone https://github.com/selkies-project/selkies.git
207207
cd selkies
208-
docker run --rm -it \
209-
--shm-size=1gb \
210-
-e DEV_MODE=core \
211-
-e PUID=1000 \
212-
-e PGID=1000 \
213-
-v $(pwd):/config/src \
214-
-p 3001:3001 ghcr.io/linuxserver/baseimage-selkies:alpine322 bash
215-
```
216-
217-
This will start you up in "core" development mode to mess around with core logic. The container also supports strictly frontend development, if there is an addon named "selkies-dashboard" you can pass that as dev_mode and core will be built on init and your development RDE will run against the frontend.
218-
219-
```
220-
git clone https://github.com/selkies-project/selkies.git
221-
cd selkies
208+
git checkout -f feature/websockets
222209
docker run --rm -it \
223210
--shm-size=1gb \
224211
-e DEV_MODE=selkies-dashboard \

0 commit comments

Comments
 (0)