From 39a36dec498dd90f23eb264113c0082af3291705 Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:24:41 +0100 Subject: [PATCH 1/9] Update docker.yml Added support for linux/amd64, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/arm/v7 & linux/arm/v6 (experimental) --- .github/workflows/docker.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bff3e6fd..0746db1e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -32,8 +32,9 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 - - # setup Docker buld action + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + # setup Docker build action - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v1 @@ -47,6 +48,7 @@ jobs: uses: docker/build-push-action@v2 with: context: ./ + platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 tags: jvt038/metatube:latest push: ${{ github.ref == 'refs/heads/master' }} - name: Image digest From 0cddf48bb3a6b01d71bce805de30e49d1ca365d3 Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:33:27 +0100 Subject: [PATCH 2/9] Update docker.yml --- .github/workflows/docker.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0746db1e..a5aaf889 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -32,9 +32,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - # setup Docker build action + - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v1 @@ -48,7 +49,7 @@ jobs: uses: docker/build-push-action@v2 with: context: ./ - platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/arm/v7 tags: jvt038/metatube:latest push: ${{ github.ref == 'refs/heads/master' }} - name: Image digest From 8fe042f7339f5c72abb6bd24e47ba0e9feae36b2 Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:46:17 +0100 Subject: [PATCH 3/9] Added more dependenies --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f93f7605..2e5f12a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,11 @@ EXPOSE $PORT COPY . /config/ RUN \ apk update && \ - apk add --no-cache python3-dev libffi-dev gcc musl-dev make ffmpeg libmagic && \ + apk add --no-cache python3-dev libffi-dev gcc musl-dev make ffmpeg libmagic build-deps file && \ mkdir -p /config && \ + /usr/local/bin/python -m pip install --upgrade pip && \ pip3 install -r /config/requirements.txt && \ - apk del --purge python3-dev libffi-dev gcc musl-dev make && \ + apk del --purge python3-dev libffi-dev gcc musl-dev make build-deps file && \ mkdir -p $DOWNLOADS ENTRYPOINT ["/usr/local/bin/python3", "config/metatube.py"] From a7a7180bcfb4dd0eb4d8f6c5912f53b8a6a10d8d Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:46:59 +0100 Subject: [PATCH 4/9] Fixed updating PIP --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2e5f12a1..b4f198b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN \ apk update && \ apk add --no-cache python3-dev libffi-dev gcc musl-dev make ffmpeg libmagic build-deps file && \ mkdir -p /config && \ - /usr/local/bin/python -m pip install --upgrade pip && \ + python3 -m pip install --upgrade pip && \ pip3 install -r /config/requirements.txt && \ apk del --purge python3-dev libffi-dev gcc musl-dev make build-deps file && \ mkdir -p $DOWNLOADS From e93335458dc5f13efb57f4544b44adea435026ce Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:52:59 +0100 Subject: [PATCH 5/9] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b4f198b2..8423973a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,12 @@ EXPOSE $PORT COPY . /config/ RUN \ apk update && \ - apk add --no-cache python3-dev libffi-dev gcc musl-dev make ffmpeg libmagic build-deps file && \ + apk add -t build-deps --no-cache python3-dev libffi-dev gcc musl-dev make file && \ + apk add --no-cache ffmpeg libmagic && \ mkdir -p /config && \ python3 -m pip install --upgrade pip && \ pip3 install -r /config/requirements.txt && \ - apk del --purge python3-dev libffi-dev gcc musl-dev make build-deps file && \ + apk del --purge build-deps && \ mkdir -p $DOWNLOADS ENTRYPOINT ["/usr/local/bin/python3", "config/metatube.py"] From 8da40860143a9c13b7b984ddb6a4ca94351ea866 Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Mon, 10 Jan 2022 22:08:24 +0100 Subject: [PATCH 6/9] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8423973a..247e96d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ EXPOSE $PORT COPY . /config/ RUN \ apk update && \ - apk add -t build-deps --no-cache python3-dev libffi-dev gcc musl-dev make file && \ + apk add -t build-deps --no-cache python3-dev libffi-dev gcc g++ musl-dev make file && \ apk add --no-cache ffmpeg libmagic && \ mkdir -p /config && \ python3 -m pip install --upgrade pip && \ From e045825d00259a5a17f21bc0137f7eb829eeda43 Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Tue, 11 Jan 2022 14:44:04 +0100 Subject: [PATCH 7/9] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a5aaf889..f39037af 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -49,7 +49,7 @@ jobs: uses: docker/build-push-action@v2 with: context: ./ - platforms: linux/amd64,linux/arm64,linux/arm/v7 + platforms: linux/amd64,linux/arm64 tags: jvt038/metatube:latest push: ${{ github.ref == 'refs/heads/master' }} - name: Image digest From 51eb2cd77e7d04b0b12c3f903828a73351c9efcb Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Tue, 11 Jan 2022 14:57:47 +0100 Subject: [PATCH 8/9] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 247e96d0..8423973a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ EXPOSE $PORT COPY . /config/ RUN \ apk update && \ - apk add -t build-deps --no-cache python3-dev libffi-dev gcc g++ musl-dev make file && \ + apk add -t build-deps --no-cache python3-dev libffi-dev gcc musl-dev make file && \ apk add --no-cache ffmpeg libmagic && \ mkdir -p /config && \ python3 -m pip install --upgrade pip && \ From 2120f66323cf41820f68037e7e0099c423419f7e Mon Sep 17 00:00:00 2001 From: JVT038 <47184046+JVT038@users.noreply.github.com> Date: Tue, 11 Jan 2022 15:03:24 +0100 Subject: [PATCH 9/9] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8423973a..247e96d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ EXPOSE $PORT COPY . /config/ RUN \ apk update && \ - apk add -t build-deps --no-cache python3-dev libffi-dev gcc musl-dev make file && \ + apk add -t build-deps --no-cache python3-dev libffi-dev gcc g++ musl-dev make file && \ apk add --no-cache ffmpeg libmagic && \ mkdir -p /config && \ python3 -m pip install --upgrade pip && \