Skip to content

Commit ac3112c

Browse files
thespadthespad
authored
Merge pull request #35 from linuxserver/main-remove-armhf
2 parents dcf126f + 1465343 commit ac3112c

6 files changed

Lines changed: 12 additions & 90 deletions

File tree

‎Dockerfile.armhf‎

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

‎Jenkinsfile‎

Lines changed: 7 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ pipeline {
167167
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
168168
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
169169
if (env.MULTIARCH == 'true') {
170-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
170+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
171171
} else {
172172
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
173173
}
@@ -190,7 +190,7 @@ pipeline {
190190
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
191191
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
192192
if (env.MULTIARCH == 'true') {
193-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
193+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
194194
} else {
195195
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
196196
}
@@ -213,7 +213,7 @@ pipeline {
213213
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
214214
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
215215
if (env.MULTIARCH == 'true') {
216-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
216+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
217217
} else {
218218
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
219219
}
@@ -499,40 +499,6 @@ pipeline {
499499
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
500500
}
501501
}
502-
stage('Build ARMHF') {
503-
agent {
504-
label 'ARMHF'
505-
}
506-
steps {
507-
echo "Running on node: ${NODE_NAME}"
508-
echo 'Logging into Github'
509-
sh '''#! /bin/bash
510-
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
511-
'''
512-
sh "docker build \
513-
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
514-
--label \"org.opencontainers.image.authors=linuxserver.io\" \
515-
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-mastodon/packages\" \
516-
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-mastodon\" \
517-
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-mastodon\" \
518-
--label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
519-
--label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
520-
--label \"org.opencontainers.image.vendor=linuxserver.io\" \
521-
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
522-
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
523-
--label \"org.opencontainers.image.title=Mastodon\" \
524-
--label \"org.opencontainers.image.description=[Mastodon](https://github.com/mastodon/mastodon/) is a free, open-source social network server based on ActivityPub where users can follow friends and discover new ones.. \" \
525-
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
526-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
527-
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
528-
retry(5) {
529-
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
530-
}
531-
sh '''docker rmi \
532-
${IMAGE}:arm32v7-${META_TAG} \
533-
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
534-
}
535-
}
536502
stage('Build ARM64') {
537503
agent {
538504
label 'ARM64'
@@ -696,9 +662,7 @@ pipeline {
696662
set -e
697663
docker pull ghcr.io/linuxserver/ci:latest
698664
if [ "${MULTIARCH}" == "true" ]; then
699-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
700665
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
701-
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
702666
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
703667
fi
704668
docker run --rm \
@@ -814,56 +778,42 @@ pipeline {
814778
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
815779
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
816780
if [ "${CI}" == "false" ]; then
817-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
818-
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
819781
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
820782
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
821783
fi
822784
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
823785
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
824786
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
825787
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
826-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
827-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
828-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
829788
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
830789
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
831790
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
832791
if [ -n "${SEMVER}" ]; then
833792
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
834-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
835793
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
836794
fi
837795
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
838796
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
839797
docker push ${MANIFESTIMAGE}:amd64-latest
840-
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
841-
docker push ${MANIFESTIMAGE}:arm32v7-latest
842-
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
843798
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
844799
docker push ${MANIFESTIMAGE}:arm64v8-latest
845800
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
846801
if [ -n "${SEMVER}" ]; then
847802
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
848-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
849803
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
850804
fi
851805
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
852-
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
853-
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
806+
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
854807
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
855808
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
856-
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
857-
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
809+
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
858810
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
859811
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
860-
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
861-
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
812+
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
862813
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
863814
if [ -n "${SEMVER}" ]; then
864815
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
865-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
866-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
816+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
867817
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
868818
fi
869819
docker manifest push --purge ${MANIFESTIMAGE}:latest
@@ -881,21 +831,16 @@ pipeline {
881831
${DELETEIMAGE}:amd64-${META_TAG} \
882832
${DELETEIMAGE}:amd64-latest \
883833
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
884-
${DELETEIMAGE}:arm32v7-${META_TAG} \
885-
${DELETEIMAGE}:arm32v7-latest \
886-
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
887834
${DELETEIMAGE}:arm64v8-${META_TAG} \
888835
${DELETEIMAGE}:arm64v8-latest \
889836
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
890837
if [ -n "${SEMVER}" ]; then
891838
docker rmi \
892839
${DELETEIMAGE}:amd64-${SEMVER} \
893-
${DELETEIMAGE}:arm32v7-${SEMVER} \
894840
${DELETEIMAGE}:arm64v8-${SEMVER} || :
895841
fi
896842
done
897843
docker rmi \
898-
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
899844
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
900845
'''
901846
}

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ This image provides various versions that are available via tags. Please read th
6565
| :----: | :----: |--- |
6666
| latest | ✅ | Stable releases. |
6767
| develop | ✅ | Pre-releases *only*. |
68+
| glitch | ✅ | [glitch-soc](https://github.com/glitch-soc/mastodon) fork releases. |
6869
## Application Setup
6970

7071
We provide aliases for the common commands that execute in the correct context so that environment variables from secrets are available to them:
@@ -357,6 +358,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
357358

358359
## Versions
359360

361+
* **09.02.23:** - Add Glitch branch.
360362
* **09.01.23:** - Updated nginx conf to fix bring inline with Mastodon configuration (fixes Elk integration).
361363
* **19.12.22:** - Support separate sidekiq queue instances.
362364
* **05.11.22:** - Initial Release.

‎jenkins-vars.yml‎

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

‎readme-vars.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ development_versions: true
1919
development_versions_items:
2020
- { tag: "latest", desc: "Stable releases." }
2121
- { tag: "develop", desc: "Pre-releases *only*." }
22+
- { tag: "glitch", desc: "[glitch-soc](https://github.com/glitch-soc/mastodon) fork releases." }
2223

2324
# container parameters
2425
common_param_env_vars_enabled: true
@@ -106,6 +107,7 @@ app_setup_block: |
106107
107108
# changelog
108109
changelogs:
110+
- { date: "09.02.23:", desc: "Add Glitch branch." }
109111
- { date: "09.01.23:", desc: "Updated nginx conf to fix bring inline with Mastodon configuration (fixes Elk integration)." }
110112
- { date: "19.12.22:", desc: "Support separate sidekiq queue instances." }
111113
- { date: "05.11.22:", desc: "Initial Release." }

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

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

0 commit comments

Comments
 (0)