diff --git a/.dockerignore b/.dockerignore index 2c9f916..ef4b339 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,4 +2,3 @@ !pyproject.toml !poetry.lock !vidmergebot -!setup diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d1ffb97..434cb93 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -103,7 +103,7 @@ jobs: # update description of the docker image on docker hub update-dockerhub-description: name: Update Description - needs: create-tag + needs: docker-build runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index c4ebae3..e2d787e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM ghcr.io/divideprojects/docker-python-base:latest WORKDIR /app -COPY setup setup -RUN setup/ffmpeg-setup.sh COPY pyproject.toml poetry.lock . RUN poetry export -f requirements.txt --without-hashes --output requirements.txt \ && pip install --disable-pip-version-check -r requirements.txt diff --git a/setup/ffmpeg-setup.sh b/setup/ffmpeg-setup.sh deleted file mode 100755 index 0d85c33..0000000 --- a/setup/ffmpeg-setup.sh +++ /dev/null @@ -1,17 +0,0 @@ -mkdir /static-ffmpeg -cd /tmp && mkdir ffmpeg-build && cd ffmpeg-build - -# identify arch -uname_machine=$(uname -m) -if [ "$uname_machine" = "amd64" ] || [ "$uname_machine" = "x86_64" ]; then - arch="amd64" -elif [ "$uname_machine" = "arm64" ] || [ "$uname_machine" = "aarch64" ]; then - arch="arm64" -else - exit 1 -fi - -wget "https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-${arch}-static.tar.xz" -tar xvf ffmpeg*.xz -cp ffmpeg-*-static/ffmpeg "/usr/local/bin/ffmpeg" -cp ffmpeg-*-static/ffprobe "/usr/local/bin/ffprobe"