taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-03 10:12:50 +00:00
Code Issues Projects Releases Wiki Activity

change docker config

Browse Source
This commit is contained in:
mzixofjsla committed 2023-12-14 19:31:04 +08:00
1 parent 3cc58f38dd
commit 6b29778351
3 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/docker.yml
+8 -8
View File
@@ -39,7 +39,7 @@ jobs:
with: with:
platforms: linux/amd64 platforms: linux/amd64
context: scripts/ context: scripts/
tags: tindy2013/subconverter:latest tags: asdlokj1qpi23/subconverter:latest
build-args: | build-args: |
SHA=${{ steps.vars.outputs.sha_short }} SHA=${{ steps.vars.outputs.sha_short }}
outputs: type=image,push=true outputs: type=image,push=true
@@ -60,7 +60,7 @@ jobs:
with: with:
platforms: linux/amd64 platforms: linux/amd64
context: scripts/ context: scripts/
tags: tindy2013/subconverter:${{steps.version.outputs.result}} tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
outputs: type=image,push=true outputs: type=image,push=true
- name: Save digest - name: Save digest
@@ -106,7 +106,7 @@ jobs:
with: with:
platforms: linux/386 platforms: linux/386
context: scripts/ context: scripts/
tags: tindy2013/subconverter:latest tags: asdlokj1qpi23/subconverter:latest
build-args: | build-args: |
SHA=${{ steps.vars.outputs.sha_short }} SHA=${{ steps.vars.outputs.sha_short }}
outputs: type=image,push=true outputs: type=image,push=true
@@ -127,7 +127,7 @@ jobs:
with: with:
platforms: linux/386 platforms: linux/386
context: scripts/ context: scripts/
tags: tindy2013/subconverter:${{steps.version.outputs.result}} tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
outputs: type=image,push=true outputs: type=image,push=true
- name: Save digest - name: Save digest
@@ -173,7 +173,7 @@ jobs:
with: with:
platforms: linux/arm/v7 platforms: linux/arm/v7
context: scripts/ context: scripts/
tags: tindy2013/subconverter:latest tags: asdlokj1qpi23/subconverter:latest
build-args: | build-args: |
SHA=${{ steps.vars.outputs.sha_short }} SHA=${{ steps.vars.outputs.sha_short }}
THREADS=4 THREADS=4
@@ -195,7 +195,7 @@ jobs:
with: with:
platforms: linux/arm/v7 platforms: linux/arm/v7
context: scripts/ context: scripts/
tags: tindy2013/subconverter:${{steps.version.outputs.result}} tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
build-args: | build-args: |
THREADS=4 THREADS=4
outputs: type=image,push=true outputs: type=image,push=true
@@ -243,7 +243,7 @@ jobs:
with: with:
platforms: linux/arm64 platforms: linux/arm64
context: scripts/ context: scripts/
tags: tindy2013/subconverter:latest tags: asdlokj1qpi23/subconverter:latest
build-args: | build-args: |
SHA=${{ steps.vars.outputs.sha_short }} SHA=${{ steps.vars.outputs.sha_short }}
THREADS=4 THREADS=4
@@ -265,7 +265,7 @@ jobs:
with: with:
platforms: linux/arm64 platforms: linux/arm64
context: scripts/ context: scripts/
tags: tindy2013/subconverter:${{steps.version.outputs.result}} tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
build-args: | build-args: |
THREADS=4 THREADS=4
outputs: type=image,push=true outputs: type=image,push=true
scripts/Dockerfile
+1 -1
View File
@@ -35,7 +35,7 @@ RUN set -xe && \
cmake -DCMAKE_CXX_STANDARD=11 . && \ cmake -DCMAKE_CXX_STANDARD=11 . && \
make install -j $THREADS && \ make install -j $THREADS && \
cd .. && \ cd .. && \
git clone https://github.com/tindy2013/subconverter --depth=1 && \ git clone https://github.com/asdlokj1qpi23/subconverter --depth=1 && \
cd subconverter && \ cd subconverter && \
[ -n "$SHA" ] && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h;\ [ -n "$SHA" ] && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h;\
python3 -m ensurepip && \ python3 -m ensurepip && \
scripts/merge_manifest.py
+1 -1
View File
@@ -1,7 +1,7 @@
import glob import glob
import os, sys import os, sys
MAIN_IMAGE_NAME="tindy2013/subconverter" MAIN_IMAGE_NAME="asdlokj1qpi23/subconverter"
TARGET_TAG="latest" if len(sys.argv) < 2 else sys.argv[1] TARGET_TAG="latest" if len(sys.argv) < 2 else sys.argv[1]
args=["docker manifest create {}:{}".format(MAIN_IMAGE_NAME, TARGET_TAG)] args=["docker manifest create {}:{}".format(MAIN_IMAGE_NAME, TARGET_TAG)]