From 4b4961ca76881246a90591c70b994e512d67f4ae Mon Sep 17 00:00:00 2001 From: henryruhs Date: Mon, 17 Feb 2025 11:02:01 +0100 Subject: [PATCH 1/5] Prepare next release --- Dockerfile.cpu | 2 +- Dockerfile.cuda | 2 +- Dockerfile.rocm | 2 +- Dockerfile.tensorrt | 4 ++-- LICENSE.md | 4 ++-- README.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile.cpu b/Dockerfile.cpu index b26c376..7649a9b 100644 --- a/Dockerfile.cpu +++ b/Dockerfile.cpu @@ -1,6 +1,6 @@ FROM python:3.12 -ARG FACEFUSION_VERSION=3.1.2 +ARG FACEFUSION_VERSION=3.2.0 ENV GRADIO_SERVER_NAME=0.0.0.0 ENV PIP_BREAK_SYSTEM_PACKAGES=1 diff --git a/Dockerfile.cuda b/Dockerfile.cuda index ccb4f0c..43b4a8e 100644 --- a/Dockerfile.cuda +++ b/Dockerfile.cuda @@ -1,6 +1,6 @@ FROM nvidia/cuda:12.8.1-cudnn-runtime-ubuntu24.04 -ARG FACEFUSION_VERSION=3.1.2 +ARG FACEFUSION_VERSION=3.2.0 ENV GRADIO_SERVER_NAME=0.0.0.0 ENV PIP_BREAK_SYSTEM_PACKAGES=1 diff --git a/Dockerfile.rocm b/Dockerfile.rocm index 7ba819a..87b297f 100644 --- a/Dockerfile.rocm +++ b/Dockerfile.rocm @@ -1,6 +1,6 @@ FROM rocm/dev-ubuntu-24.04:6.2 -ARG FACEFUSION_VERSION=3.1.2 +ARG FACEFUSION_VERSION=3.2.0 ENV GRADIO_SERVER_NAME=0.0.0.0 ENV PIP_BREAK_SYSTEM_PACKAGES=1 diff --git a/Dockerfile.tensorrt b/Dockerfile.tensorrt index 68a560c..569c589 100644 --- a/Dockerfile.tensorrt +++ b/Dockerfile.tensorrt @@ -1,6 +1,6 @@ -FROM nvidia/cuda:12.8.1-cudnn-runtime-ubuntu24.04 +FROM nvidia/cuda:12.8.0-cudnn-runtime-ubuntu24.04 -ARG FACEFUSION_VERSION=3.1.2 +ARG FACEFUSION_VERSION=3.2.0 ENV GRADIO_SERVER_NAME=0.0.0.0 ENV PIP_BREAK_SYSTEM_PACKAGES=1 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/python3.12/dist-packages/tensorrt_libs diff --git a/LICENSE.md b/LICENSE.md index aae2360..32361dc 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,3 +1,3 @@ -MIT license +OpenRAIL-S license -Copyright (c) 2024 Henry Ruhs +Copyright (c) 2025 Henry Ruhs diff --git a/README.md b/README.md index 5ddf2d7..e910ecc 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ FaceFusion Docker [![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/master-cuda?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=master-cuda) [![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/master-tensorrt?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=master-tensorrt) [![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/master-rocm?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=master-rocm) -![License](https://img.shields.io/badge/license-MIT-green) +![License](https://img.shields.io/badge/license-OpenRAIL--S-green) Installation From f4e0aef7517e0e8a24ff67faf0b59bdf15167487 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Tue, 29 Apr 2025 17:36:37 +0200 Subject: [PATCH 2/5] Update images --- Dockerfile.rocm | 2 +- Dockerfile.tensorrt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.rocm b/Dockerfile.rocm index 87b297f..c4f2eaa 100644 --- a/Dockerfile.rocm +++ b/Dockerfile.rocm @@ -1,4 +1,4 @@ -FROM rocm/dev-ubuntu-24.04:6.2 +FROM rocm/dev-ubuntu-24.04:6.4 ARG FACEFUSION_VERSION=3.2.0 ENV GRADIO_SERVER_NAME=0.0.0.0 diff --git a/Dockerfile.tensorrt b/Dockerfile.tensorrt index 569c589..13c79bb 100644 --- a/Dockerfile.tensorrt +++ b/Dockerfile.tensorrt @@ -1,4 +1,4 @@ -FROM nvidia/cuda:12.8.0-cudnn-runtime-ubuntu24.04 +FROM nvidia/cuda:12.8.1-cudnn-runtime-ubuntu24.04 ARG FACEFUSION_VERSION=3.2.0 ENV GRADIO_SERVER_NAME=0.0.0.0 @@ -14,7 +14,7 @@ RUN apt-get install pip -y RUN apt-get install git -y RUN apt-get install curl -y RUN apt-get install ffmpeg -y -RUN pip install tensorrt==10.8.0.43 --extra-index-url https://pypi.nvidia.com +RUN pip install tensorrt==10.9.0.34 --extra-index-url https://pypi.nvidia.com RUN git clone https://github.com/facefusion/facefusion.git --branch ${FACEFUSION_VERSION} --single-branch . RUN python install.py --onnxruntime cuda --skip-conda From 28063af0477feb74b9838621cdfe77e67f70bd18 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Tue, 29 Apr 2025 17:55:47 +0200 Subject: [PATCH 3/5] Add proper docker tags --- .github/workflows/ci.yml | 11 ++++++----- README.md | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4ca9d2..5b02bf8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,15 +24,16 @@ jobs: run: docker ps | grep -q ${{ matrix.config.image-slug }} deploy: name: ${{ matrix.config.display-name }} - runs-on: ubuntu-latest + if: github.ref == 'refs/heads/master' needs: test + runs-on: ubuntu-latest strategy: matrix: config: - - { display-name: 'deploy (cpu)', docker-file: 'Dockerfile.cpu', image-slug: 'facefusion/facefusion:${{ github.ref_name }}-cpu' } - - { display-name: 'deploy (cuda)', docker-file: 'Dockerfile.cuda', image-slug: 'facefusion/facefusion:${{ github.ref_name }}-cuda' } - - { display-name: 'deploy (tensorrt)', docker-file: 'Dockerfile.tensorrt', image-slug: 'facefusion/facefusion:${{ github.ref_name }}-tensorrt' } - - { display-name: 'deploy (rocm)', docker-file: 'Dockerfile.rocm', image-slug: 'facefusion/facefusion:${{ github.ref_name }}-rocm' } + - { display-name: 'deploy (cpu)', docker-file: 'Dockerfile.cpu', image-slug: 'facefusion/facefusion:3.2.0-cpu' } + - { display-name: 'deploy (cuda)', docker-file: 'Dockerfile.cuda', image-slug: 'facefusion/facefusion:3.2.0-cuda' } + - { display-name: 'deploy (tensorrt)', docker-file: 'Dockerfile.tensorrt', image-slug: 'facefusion/facefusion:3.2.0-tensorrt' } + - { display-name: 'deploy (rocm)', docker-file: 'Dockerfile.rocm', image-slug: 'facefusion/facefusion:3.2.0-rocm' } steps: - name: Login uses: docker/login-action@v3 diff --git a/README.md b/README.md index e910ecc..056ae33 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ FaceFusion Docker > Industry leading face manipulation platform. [![Build Status](https://img.shields.io/github/actions/workflow/status/facefusion/facefusion-docker/ci.yml.svg?branch=master)](https://github.com/facefusion/facefusion-docker/actions?query=workflow:ci) -[![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/master-cpu?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=master-cpu) -[![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/master-cuda?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=master-cuda) -[![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/master-tensorrt?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=master-tensorrt) -[![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/master-rocm?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=master-rocm) +[![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/3.2.0-cpu?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=3.2.0-cpu) +[![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/3.2.0-cuda?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=3.2.0-cuda) +[![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/3.2.0-tensorrt?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=3.2.0-tensorrt) +[![Docker Hub](https://img.shields.io/docker/v/facefusion/facefusion/3.2.0-rocm?label=docker-hub)](https://hub.docker.com/r/facefusion/facefusion/tags?name=3.2.0-rocm) ![License](https://img.shields.io/badge/license-OpenRAIL--S-green) From 07a837a093879ac5bdc0f24f3c507046e292d949 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Tue, 29 Apr 2025 18:09:19 +0200 Subject: [PATCH 4/5] Add proper docker tags --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b02bf8..389039e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ jobs: strategy: matrix: config: - - { display-name: 'test (cpu)', docker-file: 'Dockerfile.cpu', image-slug: 'facefusion/facefusion:${{ github.ref_name }}-cpu' } - - { display-name: 'test (cuda)', docker-file: 'Dockerfile.cuda', image-slug: 'facefusion/facefusion:${{ github.ref_name }}-cuda' } - - { display-name: 'test (tensorrt)', docker-file: 'Dockerfile.tensorrt', image-slug: 'facefusion/facefusion:${{ github.ref_name }}-tensorrt' } - - { display-name: 'test (rocm)', docker-file: 'Dockerfile.rocm', image-slug: 'facefusion/facefusion:${{ github.ref_name }}-rocm' } + - { display-name: 'deploy (cpu)', docker-file: 'Dockerfile.cpu', image-slug: 'facefusion/facefusion:3.2.0-cpu' } + - { display-name: 'deploy (cuda)', docker-file: 'Dockerfile.cuda', image-slug: 'facefusion/facefusion:3.2.0-cuda' } + - { display-name: 'deploy (tensorrt)', docker-file: 'Dockerfile.tensorrt', image-slug: 'facefusion/facefusion:3.2.0-tensorrt' } + - { display-name: 'deploy (rocm)', docker-file: 'Dockerfile.rocm', image-slug: 'facefusion/facefusion:3.2.0-rocm' } steps: - name: Checkout uses: actions/checkout@v4 From d3b3b9e3f1bf83c71617b7ca6fa1ebb986e7136f Mon Sep 17 00:00:00 2001 From: henryruhs Date: Tue, 29 Apr 2025 18:11:37 +0200 Subject: [PATCH 5/5] Add proper docker tags --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 389039e..9ee6fab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ jobs: strategy: matrix: config: - - { display-name: 'deploy (cpu)', docker-file: 'Dockerfile.cpu', image-slug: 'facefusion/facefusion:3.2.0-cpu' } - - { display-name: 'deploy (cuda)', docker-file: 'Dockerfile.cuda', image-slug: 'facefusion/facefusion:3.2.0-cuda' } - - { display-name: 'deploy (tensorrt)', docker-file: 'Dockerfile.tensorrt', image-slug: 'facefusion/facefusion:3.2.0-tensorrt' } - - { display-name: 'deploy (rocm)', docker-file: 'Dockerfile.rocm', image-slug: 'facefusion/facefusion:3.2.0-rocm' } + - { display-name: 'test (cpu)', docker-file: 'Dockerfile.cpu', image-slug: 'facefusion/facefusion:3.2.0-cpu' } + - { display-name: 'test (cuda)', docker-file: 'Dockerfile.cuda', image-slug: 'facefusion/facefusion:3.2.0-cuda' } + - { display-name: 'test (tensorrt)', docker-file: 'Dockerfile.tensorrt', image-slug: 'facefusion/facefusion:3.2.0-tensorrt' } + - { display-name: 'test (rocm)', docker-file: 'Dockerfile.rocm', image-slug: 'facefusion/facefusion:3.2.0-rocm' } steps: - name: Checkout uses: actions/checkout@v4