Skip to content

Extra ENV breaking build #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrottenberg wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Extra ENV breaking build #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c40b99
Extra ENV breaking build
jrottenberg Mar 2, 2025
5fda98b
7.1.1
jrottenberg Mar 19, 2025
7c459c6
pre-commit
jrottenberg Apr 7, 2025
1dc0a0f
Merge branch 'main' into fix_419
jrottenberg Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repos: # pre-commit autoupdate
- repo: https://github.com/pycqa/flake8
rev: "7.1.1"
rev: "7.2.0"
hooks:
- id: flake8

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: check-added-large-files
Expand All @@ -29,12 +29,12 @@ repos: # pre-commit autoupdate
[--in-place, --remove-all-unused-imports, --remove-unused-variables]

- repo: https://github.com/pycqa/isort
rev: 5.13.2
rev: 6.0.1
hooks:
- id: isort

- repo: https://github.com/psf/black
rev: 24.8.0
rev: 25.1.0
hooks:
- id: black
language_version: python3
Expand Down
2 changes: 1 addition & 1 deletion docker-images/7.0/nvidia2404/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir
COPY build_source.sh /tmp/workdir
COPY install_ffmpeg.sh /tmp/workdir

ENV ENV FFMPEG_VERSION=7.0.2
ENV FFMPEG_VERSION=7.0.2

ENV NVIDIA_HEADERS_VERSION=11.1.5.3

Expand Down
3 changes: 2 additions & 1 deletion docker-images/7.1/nvidia2404/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ COPY download_tarballs.sh /tmp/workdir
COPY build_source.sh /tmp/workdir
COPY install_ffmpeg.sh /tmp/workdir

ENV ENV FFMPEG_VERSION=7.1.1

ENV FFMPEG_VERSION=7.1.1

ENV NVIDIA_HEADERS_VERSION=11.1.5.3

Expand Down
2 changes: 1 addition & 1 deletion templates/Dockerfile-template.nvidia2204
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=11.1.5.3

ENV %%ENV%%
%%ENV%%

RUN buildDeps="autoconf \
automake \
Expand Down
2 changes: 1 addition & 1 deletion templates/Dockerfile-template.nvidia2404
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir
COPY build_source.sh /tmp/workdir
COPY install_ffmpeg.sh /tmp/workdir

ENV %%ENV%%
%%ENV%%

# Note: I don't think we need 'ca-certificates'
ARG DEBIAN_FRONTEND=noninteractive
Expand Down
Loading