Skip to content
This repository was archived by the owner on Feb 17, 2023. It is now read-only.

Commit daddbff

Browse files
authored
Merge pull request #39 from linuxserver/master-remove-armhf
2 parents fa1080f + e663f30 commit daddbff

File tree

11 files changed

+44
-101
lines changed

11 files changed

+44
-101
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
1515
indent_style = space
1616
indent_size = 2
1717

18-
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
18+
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
1919
indent_style = space
2020
indent_size = 4
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Comment on invalid interaction
2+
on:
3+
issues:
4+
types:
5+
- labeled
6+
jobs:
7+
add-comment-on-invalid:
8+
if: github.event.label.name == 'invalid'
9+
permissions:
10+
issues: write
11+
uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
12+
secrets: inherit

.github/workflows/greetings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
steps:
99
- uses: actions/first-interaction@v1
1010
with:
11-
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-baseimage-mono/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-baseimage-mono/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
11+
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.'
1212
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-mono/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/permissions.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Permission check
2+
on:
3+
pull_request:
4+
paths:
5+
- '**/run'
6+
- '**/finish'
7+
jobs:
8+
permission_check:
9+
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
24

35
# environment settings

Dockerfile.aarch64

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
24

35
# environment settings

Dockerfile.armhf

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

Jenkinsfile

Lines changed: 15 additions & 70 deletions
Large diffs are not rendered by default.

jenkins-vars.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ external_type: os
66
release_type: prerelease
77
release_tag: focal
88
ls_branch: master
9+
build_armhf: false
910
repo_vars:
1011
- BUILD_VERSION_ARG = 'MONO_VERSION'
1112
- LS_USER = 'linuxserver'
@@ -21,6 +22,6 @@ repo_vars:
2122
- CI_PORT='80'
2223
- CI_SSL='true'
2324
- CI_DELAY='30'
24-
- CI_DOCKERENV='TZ=US/Pacific|ISCI=true'
25+
- CI_DOCKERENV='TZ=US/Pacific'
2526
- CI_AUTH='user:password'
2627
- CI_WEBPATH=''

root-armhf/etc/cont-init.d/50-armless

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

0 commit comments

Comments
 (0)