Merge pull request #36 from linuxserver/develop-remove-armhf

Author: Roxedus

.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

.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-mastodon/blob/develop/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-mastodon/blob/develop/.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-mastodon/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.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

Dockerfile.armhf

@@ -55,7 +55,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf| ❌ | |
+| armhf | ❌ | |
 
 ## Version Tags
 
@@ -65,7 +65,7 @@ This image provides various versions that are available via tags. Please read th
 | :----: | :----: |--- |
 | latest | ✅ | Stable releases. |
 | develop | ✅ | Pre-releases *only*. |
-
+| glitch | ✅ | [glitch-soc](https://github.com/glitch-soc/mastodon) fork releases. |
 ## Application Setup
 
 We provide aliases for the common commands that execute in the correct context so that environment variables from secrets are available to them:
@@ -112,7 +112,7 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=America/New_York
+      - TZ=Etc/UTC
       - LOCAL_DOMAIN=example.com
       - REDIS_HOST=redis
       - REDIS_PORT=6379
@@ -161,7 +161,7 @@ docker run -d \
   --name=mastodon \
   -e PUID=1000 \
   -e PGID=1000 \
-  -e TZ=America/New_York \
+  -e TZ=Etc/UTC \
   -e LOCAL_DOMAIN=example.com \
   -e REDIS_HOST=redis \
   -e REDIS_PORT=6379 \
@@ -200,6 +200,7 @@ docker run -d \
   -v /path/to/appdata/config:/config \
   --restart unless-stopped \
   lscr.io/linuxserver/mastodon:develop
+
 ```
 
 ## Parameters
@@ -212,7 +213,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-p 443` | Port for web frontend |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=America/New_York` | Specify a timezone to use EG America/New_York |
+| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
 | `-e LOCAL_DOMAIN=example.com` | This is the unique identifier of your server in the network. It cannot be safely changed later. |
 | `-e REDIS_HOST=redis` | Redis server hostname |
 | `-e REDIS_PORT=6379` | Redis port |
@@ -357,6 +358,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **09.02.23:** - Add Glitch branch.
 * **26.01.23:** - Add aliases for key generation & tootctl to better support secrets.
 * **19.12.22:** - Support separate sidekiq queue instances.
 * **08.11.22:** - Add develop branch.

Jenkinsfile

@@ -6,6 +6,7 @@ external_type: custom_json
 release_type: prerelease
 release_tag: develop
 ls_branch: develop
+build_armhf: false
 repo_vars:
   - JSON_URL='https://api.github.com/repos/mastodon/mastodon/releases'
   - JSON_PATH='first(.[] | select(.prerelease==true)) | .tag_name'

README.md

@@ -19,6 +19,7 @@ development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable releases." }
   - { tag: "develop", desc: "Pre-releases *only*." }
+  - { tag: "glitch", desc: "[glitch-soc](https://github.com/glitch-soc/mastodon) fork releases." }
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -106,6 +107,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "09.02.23:", desc: "Add Glitch branch." }
   - { date: "26.01.23:", desc: "Add aliases for key generation & tootctl to better support secrets." }
   - { date: "19.12.22:", desc: "Support separate sidekiq queue instances." }
   - { date: "08.11.22:", desc: "Add develop branch." }

jenkins-vars.yml

@@ -95,7 +95,7 @@ server {
         try_files $uri =404;
     }
 
-    location ^~ /api/v1/streaming/ {
+    location ^~ /api/v1/streaming {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;