Skip to content

Commit a23ca1e

Browse files
committed
Remove dummy armhf build
1 parent 2aa4489 commit a23ca1e

8 files changed

Lines changed: 32 additions & 105 deletions

File tree

.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

.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-mastodon/blob/glitch/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-mastodon/blob/glitch/.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-mastodon/blob/glitch/.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.armhf

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

Jenkinsfile

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

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The architectures supported by this image are:
5555
| :----: | :----: | ---- |
5656
| x86-64 || amd64-\<version tag\> |
5757
| arm64 || arm64v8-\<version tag\> |
58-
| armhf|| |
58+
| armhf || |
5959

6060
## Version Tags
6161

@@ -66,7 +66,6 @@ This image provides various versions that are available via tags. Please read th
6666
| latest || Stable releases. |
6767
| develop || Pre-releases *only*. |
6868
| glitch || [glitch-soc](https://github.com/glitch-soc/mastodon) fork releases. |
69-
7069
## Application Setup
7170

7271
We provide aliases for the common commands that execute in the correct context so that environment variables from secrets are available to them:
@@ -113,7 +112,7 @@ services:
113112
environment:
114113
- PUID=1000
115114
- PGID=1000
116-
- TZ=America/New_York
115+
- TZ=Etc/UTC
117116
- LOCAL_DOMAIN=example.com
118117
- REDIS_HOST=redis
119118
- REDIS_PORT=6379
@@ -162,7 +161,7 @@ docker run -d \
162161
--name=mastodon \
163162
-e PUID=1000 \
164163
-e PGID=1000 \
165-
-e TZ=America/New_York \
164+
-e TZ=Etc/UTC \
166165
-e LOCAL_DOMAIN=example.com \
167166
-e REDIS_HOST=redis \
168167
-e REDIS_PORT=6379 \
@@ -201,6 +200,7 @@ docker run -d \
201200
-v /path/to/appdata/config:/config \
202201
--restart unless-stopped \
203202
lscr.io/linuxserver/mastodon:glitch
203+
204204
```
205205

206206
## Parameters
@@ -213,7 +213,7 @@ Container images are configured using parameters passed at runtime (such as thos
213213
| `-p 443` | Port for web frontend |
214214
| `-e PUID=1000` | for UserID - see below for explanation |
215215
| `-e PGID=1000` | for GroupID - see below for explanation |
216-
| `-e TZ=America/New_York` | Specify a timezone to use EG America/New_York |
216+
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
217217
| `-e LOCAL_DOMAIN=example.com` | This is the unique identifier of your server in the network. It cannot be safely changed later. |
218218
| `-e REDIS_HOST=redis` | Redis server hostname |
219219
| `-e REDIS_PORT=6379` | Redis port |

jenkins-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ external_type: github_commit
66
release_type: prerelease
77
release_tag: glitch
88
ls_branch: glitch
9+
build_armhf: false
910
repo_vars:
1011
- EXT_GIT_BRANCH = 'main'
1112
- EXT_USER = 'glitch-soc'

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

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

0 commit comments

Comments
 (0)