Merge pull request #2 from linuxserver/master-remove-armhf

linuxserver · Feb 12, 2023 · aa7e1bc · aa7e1bc
2 parents 55ee9a5 + 6141265
commit aa7e1bc
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 101 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
-[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-baseimage-kasmvnc/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-baseimage-kasmvnc/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
         pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-kasmvnc/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml
@@ -0,0 +1,9 @@
+name: Permission check
+on:
+  pull_request:
+    paths:
+      - '**/run'
+      - '**/finish'
+jobs:
+  permission_check:
+    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage
 
 ARG KASMVNC_RELEASE="1.0.1"

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 as buildstage
 
 ARG KASMVNC_RELEASE="1.0.1"

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -6,6 +6,7 @@ external_type: os
 release_type: stable
 release_tag: alpine317
 ls_branch: master
+build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'KASMVNC_RELEASE'
   - LS_USER = 'linuxserver'

diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/svc-splash/dependencies.d/init-services b/root-armhf/etc/s6-overlay/s6-rc.d/svc-splash/dependencies.d/init-services
diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/svc-splash/notification-fd b/root-armhf/etc/s6-overlay/s6-rc.d/svc-splash/notification-fd
diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/svc-splash/run b/root-armhf/etc/s6-overlay/s6-rc.d/svc-splash/run
diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/svc-splash/type b/root-armhf/etc/s6-overlay/s6-rc.d/svc-splash/type
diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/user/contents.d/svc-splash b/root-armhf/etc/s6-overlay/s6-rc.d/user/contents.d/svc-splash