topaLE
/
theme.park
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: topaLE:master
Branches Tags
topaLE:develop
topaLE:live
topaLE:live_develop
topaLE:live_testing
topaLE:master
topaLE:testing
...
pull from: topaLE:testing
Branches Tags
topaLE:develop
topaLE:live
topaLE:live_develop
topaLE:live_testing
topaLE:master
topaLE:testing

32 Commits
master ... testing

Author SHA1 Message Date
GilbN 6b3736963d remove extra tag
2 years ago
GilbN 5888815fc8 asdasd
2 years ago
GilbN e2702f1ee2 aasdsad
2 years ago
GilbN 639a888e60 add input to normal tag
2 years ago
GilbN b877de3148 make arch env
2 years ago
GilbN c03b10d62c add source
2 years ago
GilbN f3deb3129c add tag to cache
2 years ago
GilbN 7a3e6344b3 move input tag
2 years ago
GilbN 33e9c6a970 update tag env
2 years ago
GilbN c45dbf61ca add source input
2 years ago
GilbN 8405de7107 docker syntax fix
2 years ago
GilbN 2520432f40 Bump checkout to use node16
2 years ago
GilbN 7eecf14027 append input tag
2 years ago
GilbN 502f0bcdfe dockerbuild: bump ver. Replace depricated commands
2 years ago
GilbN bb210ad980 sed body only
2 years ago
GilbN 7b3bda2292 sed body tag
2 years ago
GilbN d926e934ff testing qbit noscript
2 years ago
GilbN e1c6b2a06e Merge branch 'develop' into testing
2 years ago
GilbN bda39b7773 for loop fix
2 years ago
GilbN 2787cf1194 syntax fix
2 years ago
GilbN 523132ae7d syntax fix
2 years ago
GilbN 6b04917a66 build-app-mods test
2 years ago
GilbN 17abb62b07 chmod +x
2 years ago
GilbN e0c55a7556 forgot user folder
2 years ago
GilbN 593f4ac017 convert all mods to support s6-v3
2 years ago
GilbN 339306296e Swag and vuetorrent s6-v3 mods
2 years ago
GilbN 52e9c6df08 add mod to init-mods-end
2 years ago
GilbN a18f4b3ccb exec
2 years ago
GilbN a80f0d24b4 worky work?
2 years ago
GilbN a359913875 add user folder
2 years ago
GilbN acddcf1bb4 Qbit s6 v3 hybrid mod
2 years ago
GilbN 1765e9e53a append-tag on mod build
2 years ago
2 changed files with 47 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 91
      .github/workflows/docker-build.yml
  2. 2
      docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run

91
.github/workflows/docker-build.yml
View File

@ -14,7 +14,7 @@ on:
- develop
- testing
tag:
description: 'Add a tag'
description: 'Append a the tag with "-custom" e.g :develop-custom'
push:
branches:
- develop
@ -29,67 +29,67 @@ jobs:
architecture: [linux-arm-v7,linux-arm64,linux-amd64]
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3.1.0
with:
fetch-depth: 0
- name: Prepare
id: prep
run: |
ARCHITECTURE=${{ matrix.architecture }}
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=title::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}
echo ::set-output name=revision::${GITHUB_SHA}
echo ::set-output name=source::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${{ github.ref_name }}
echo ::set-output name=vendor::${{ github.repository_owner }}
echo ::set-output name=url::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/blob/master/README.md
echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
echo ::set-output name=platform::${ARCHITECTURE//-/\/}
echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-cache-${{ matrix.architecture }}
echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }}
echo ::set-output name=release::${{ github.event.release.target_commitish }}
echo "ARCHITECTURE=${{ matrix.architecture }}" >> $GITHUB_ENV
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
echo "title=${GITHUB_REPOSITORY,,}:${{ github.ref_name }}" >> $GITHUB_ENV
echo "revision=${GITHUB_SHA}" >> $GITHUB_ENV
echo "source=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${{ github.ref_name }}" >> $GITHUB_ENV
echo "vendor=${{ github.repository_owner }}" >> $GITHUB_ENV
echo "url=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/blob/master/README.md" >> $GITHUB_ENV
echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
echo "platform=${ARCHITECTURE//-/\/}" >> $GITHUB_ENV
echo "cache=${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-cache-${{ matrix.architecture }}${{ github.event.inputs.tag }}" >> $GITHUB_ENV
echo "tag=${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }}${{ github.event.inputs.tag }}" >> $GITHUB_ENV
echo "release=${{ github.event.release.target_commitish }}" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2.2.1
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2.1.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GH_PAT }}
- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v2.1.0
with:
username: ${{ secrets.DH_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: build&push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3.2.0
with:
push: ${{ github.event_name != 'pull_request' }}
platforms: ${{ steps.prep.outputs.platform }}
platforms: ${{ env.platform }}
file: ./${{ matrix.architecture }}.Dockerfile
cache-from: docker.io/${{ steps.prep.outputs.cache }}
cache-to: docker.io/${{ steps.prep.outputs.cache }}
cache-from: docker.io/${{ env.cache }}
cache-to: docker.io/${{ env.cache }}
tags: |
docker.io/${{ steps.prep.outputs.tag }}
ghcr.io/${{ steps.prep.outputs.tag }}
docker.io/${{ env.tag }}
ghcr.io/${{ env.tag }}
labels: |
org.opencontainers.image.created=${{ steps.prep.outputs.created }}
org.opencontainers.image.title=${{ steps.prep.outputs.title }}
org.opencontainers.image.revision=${{ steps.prep.outputs.revision }}
org.opencontainers.image.source=${{ steps.prep.outputs.source }}
org.opencontainers.image.vendor=${{ steps.prep.outputs.vendor }}
org.opencontainers.image.url=${{ steps.prep.outputs.url }}
org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }}
org.opencontainers.image.created=${{ env.created }}
org.opencontainers.image.title=${{ env.title }}
org.opencontainers.image.revision=${{ env.revision }}
org.opencontainers.image.source=${{ env.source }}
org.opencontainers.image.vendor=${{ env.vendor }}
org.opencontainers.image.url=${{ env.url }}
org.opencontainers.image.version=${{ env.VERSION }}
build-args: |
TP_RELEASE=${{ steps.prep.outputs.VERSION }}
BUILD_DATE=${{ steps.date_time.outputs.created }}
TP_RELEASE=${{ env.VERSION }}
BUILD_DATE=${{ env.created }}
BUILD_ARCHITECTURE=${{ matrix.architecture }}
publish:
@ -100,11 +100,11 @@ jobs:
needs: [build-and-push-it-to-the-limit]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3.1.0
- name: Login to DockerHub
if: matrix.registry == 'docker.io'
uses: docker/login-action@v1
uses: docker/login-action@v2.1.0
with:
registry: docker.io
username: ${{ secrets.DH_USER }}
@ -112,7 +112,7 @@ jobs:
- name: Login to GitHub Container Registry
if: matrix.registry == 'ghcr.io'
uses: docker/login-action@v1
uses: docker/login-action@v2.1.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
@ -123,16 +123,19 @@ jobs:
DOCKER_CLI_EXPERIMENTAL: enabled
run: |
IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,}
TAG=${{ github.ref_name }}
SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
VERSION=${{ steps.prep.outputs.VERSION }}
[[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64
[[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64
[[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7
TAG=${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
SOURCE=${IMAGE}:${TAG}
[[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64${{ github.event.inputs.tag }}
[[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64${{ github.event.inputs.tag }}
[[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7${{ github.event.inputs.tag }}
docker manifest create ${IMAGE}:${TAG}${{ github.event.inputs.tag }} ${AMD64} ${ARM64} ${ARMV7}
docker manifest push ${IMAGE}:${TAG}${{ github.event.inputs.tag }}
TAG=${{ github.ref_name }}${{ github.event.inputs.tag }}
docker manifest create ${IMAGE}:${TAG} ${AMD64} ${ARM64} ${ARMV7}
docker manifest push ${IMAGE}:${TAG}
docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7}
docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7}
- name: Latest manifest
if: ${{ github.event.release.target_commitish == 'master' }}
env:

2
docker-mods/qbittorrent/root/etc/s6-overlay/s6-rc.d/init-mod-themepark/run
View File

@ -79,8 +79,6 @@ fi
sed_file(){
sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/qbittorrent\/qbittorrent-base.css'><\/body> /g" $1
sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" $1
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/qbittorrent\/qbittorrent-base.css'><\/head> /g" $1
sed -i "s/<\/head>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/head> /g" $1
printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
}

Write Preview
Loading…
Cancel
Save