diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 4a02ec9..e35a6a3 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -1,73 +1,72 @@ name: Docker Hub on: - release: - types: [ published ] + push: + branches: [ development ] + pull_request: + branches: [ development ] workflow_dispatch: jobs: - build: + docker: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: checkout repo - uses: actions/checkout@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v1 + uses: docker/setup-buildx-action@v2 + + - name: Login to Docker Hub + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USER_NAME }} password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v3 - with: - images: baxtree/subaligner:latest - + - name: Extract the tag id: tag - run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\/v/} - - - name: Build and push the latest image - id: docker_build_latest - uses: docker/build-push-action@v2 - with: - context: ./docker - file: "./docker/Dockerfile-Ubuntu20" - build-args: | - "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}" - allow: network.host - github-token: ${{ github.token }} - tags: baxtree/subaligner:latest - push: true + run: echo ::set-output name=TAG::0.3.4 - - name: Build and push the Ubuntu 20 image - id: docker_build_u20 - uses: docker/build-push-action@v2 - with: - context: ./docker - file: "./docker/Dockerfile-Ubuntu20" - build-args: | - "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}" - allow: network.host - github-token: ${{ github.token }} - tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.u20 - push: true +# - name: Build and push the latest image +# id: docker_build_latest +# uses: docker/build-push-action@v4 +# with: +# context: ./docker +# file: "./docker/Dockerfile-Ubuntu20" +# build-args: | +# "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}" +# platforms: linux/amd64,linux/arm64 +# allow: network.host +# github-token: ${{ github.token }} +# tags: baxtree/subaligner:latest +# push: true +# +# - name: Build and push the Ubuntu 20 image +# id: docker_build_u20 +# uses: docker/build-push-action@v4 +# with: +# context: ./docker +# file: "./docker/Dockerfile-Ubuntu20" +# build-args: | +# "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}" +# platforms: linux/amd64,linux/arm64 +# allow: network.host +# github-token: ${{ github.token }} +# tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.u20 +# push: true - name: Build and push the Ubuntu 22 image id: docker_build_u22 - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: ./docker file: "./docker/Dockerfile-Ubuntu22" build-args: | "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}" + platforms: linux/amd64 allow: network.host github-token: ${{ github.token }} tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.u22 @@ -81,6 +80,7 @@ jobs: file: "./docker/Dockerfile-Fedora34" build-args: | "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}" + platforms: linux/amd64,linux/arm64 allow: network.host github-token: ${{ github.token }} tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.fed34 @@ -94,6 +94,7 @@ jobs: file: "./docker/Dockerfile-ArchLinux" build-args: | "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}" + platforms: linux/amd64,linux/arm64 allow: network.host github-token: ${{ github.token }} tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.arch @@ -107,10 +108,8 @@ jobs: file: "./docker/Dockerfile-CentOS7" build-args: | "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}" + platforms: linux/amd64,linux/arm64 allow: network.host github-token: ${{ github.token }} tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.el7 push: true - - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/README.md b/README.md index c34e715..b0afd29 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- subaligner + subaligner
[![Build Status](https://github.com/baxtree/subaligner/actions/workflows/ci-pipeline.yml/badge.svg?branch=master)](https://github.com/baxtree/subaligner/actions/workflows/ci-pipeline.yml?query=branch%3Amaster) ![Codecov](https://img.shields.io/codecov/c/github/baxtree/subaligner) diff --git a/docker/Dockerfile-CentOS7 b/docker/Dockerfile-CentOS7 index 8b5749d..0f586d4 100644 --- a/docker/Dockerfile-CentOS7 +++ b/docker/Dockerfile-CentOS7 @@ -1,25 +1,30 @@ # Subaligner CentOS 7 Docker Image -From centos:7 +From centos:8 ARG RELEASE_VERSION ENV RELEASE_VERSION=${RELEASE_VERSION} -RUN ["/bin/bash", "-c", "yum install -y epel-release &&\ - yum update -y &&\ - yum groupinstall -y \"Development Tools\" &&\ - rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm &&\ - yum install -y openssl-devel bzip2-devel libffi-devel xz-devel &&\ - yum install -y wget &&\ - yum install -y ffmpeg &&\ - yum install -y espeak espeak-devel &&\ - yum install -y libsndfile-devel &&\ - yum install -y gcc &&\ - wget https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tgz &&\ - tar xvf Python-3.8.12.tgz &&\ - cd Python-3.8.12 &&\ - ./configure --enable-optimizations &&\ - make altinstall &&\ - python3.8 -m pip install --upgrade pip &&\ - python3.8 -m pip install \"subaligner==${RELEASE_VERSION}\" &&\ - python3.8 -m pip install \"subaligner[harmony]==${RELEASE_VERSION}\""] +RUN cd /etc/yum.repos.d/ +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* + +RUN ["/bin/bash", "-c", "dnf install -y epel-release dnf-utils &&\ + dnf upgrade -y openssl-libs bind-export-libs &&\ + dnf config-manager --set-enabled powertools &&\ + dnf install -y https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm &&\ + dnf install -y ffmpeg &&\ + dnf install -y espeak-ng &&\ + ln -s /usr/lib64/libespeak-ng.so.1 /usr/lib64/libespeak.so &&\ + dnf install -y libsndfile-devel &&\ + dnf install -y python3 &&\ + dnf install -y gcc &&\ + dnf install -y python3-wheel &&\ + dnf install -y python3-devel &&\ + dnf install -y python3-pip &&\ + dnf makecache &&\ + dnf upgrade python3-pip &&\ + python3 -m pip install --upgrade pip &&\ + python3 -m pip install --upgrade setuptools wheel &&\ + python3 -m pip install \"subaligner==0.3.1\" &&\ + python3 -m pip install \"subaligner[harmony]==0.3.1\""] diff --git a/docker/Dockerfile-Ubuntu20 b/docker/Dockerfile-Ubuntu20 index 297bb4e..d4f9947 100644 --- a/docker/Dockerfile-Ubuntu20 +++ b/docker/Dockerfile-Ubuntu20 @@ -11,6 +11,7 @@ RUN ["/bin/bash", "-c", "apt-get -y update &&\ apt-get -y install ffmpeg &&\ apt-get -y install espeak libespeak1 libespeak-dev espeak-data &&\ apt-get -y install libsndfile-dev &&\ + apt-get -y install libhdf5-dev &&\ apt-get -y install python3-dev &&\ apt-get -y install python3-tk &&\ apt-get -y install python3-pip &&\ diff --git a/docker/Dockerfile-Ubuntu22 b/docker/Dockerfile-Ubuntu22 index 23974e5..77b60c9 100644 --- a/docker/Dockerfile-Ubuntu22 +++ b/docker/Dockerfile-Ubuntu22 @@ -11,9 +11,11 @@ RUN ["/bin/bash", "-c", "apt-get -y update &&\ apt-get -y install ffmpeg &&\ apt-get -y install espeak libespeak1 libespeak-dev espeak-data &&\ apt-get -y install libsndfile-dev &&\ + apt-get -y install libhdf5-dev &&\ apt-get -y install python3-dev &&\ apt-get -y install python3-tk &&\ apt-get -y install python3-pip &&\ python3 -m pip install --upgrade pip &&\ + python3 -m pip install --upgrade setuptools wheel &&\ python3 -m pip install \"subaligner==${RELEASE_VERSION}\" &&\ python3 -m pip install \"subaligner[harmony]==${RELEASE_VERSION}\""] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c68b25b..35921e5 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,12 +7,6 @@ services: dockerfile: Dockerfile-CentOS7 image: baxtree/subaligner:${SUBALIGNER_VERSION}.el7 - subaligner-ubuntu18: - build: - context: ./ - dockerfile: Dockerfile-Ubuntu18 - image: baxtree/subaligner:${SUBALIGNER_VERSION}.u18 - subaligner-ubuntu20: build: context: ./ diff --git a/site/source/conf.py b/site/source/conf.py index f92d723..1abe453 100644 --- a/site/source/conf.py +++ b/site/source/conf.py @@ -87,7 +87,7 @@ "sklearn", "tensorflow", "pysubs2", - "cchardet", + "chardet", "captionstransformer", "bs4", "transformers",