mirror
/
rd-blender-docker
kopia lustrzana https://github.com/nytimes/rd-blender-docker
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix bug where xz-utils dependency populated multipule times 🐛

pull/14/head
juniorxsound 2020-06-15 20:20:16 -04:00
rodzic dab3412e28
commit 2103c8e1f9
9 zmienionych plików z 13 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
dist/2.80-cpu-ubuntu18.04/Dockerfile vendored
Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 06/15/2020, 17:03:56 by juniorxsound
# Dockerfile autogenerated on 06/15/2020, 20:19:12 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

2
dist/2.80-gpu-ubuntu18.04/Dockerfile vendored
Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 06/15/2020, 17:03:56 by juniorxsound
# Dockerfile autogenerated on 06/15/2020, 20:19:12 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04

2
dist/2.81-cpu-ubuntu18.04/Dockerfile vendored
Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 06/15/2020, 17:03:56 by juniorxsound
# Dockerfile autogenerated on 06/15/2020, 20:19:12 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

2
dist/2.81-gpu-ubuntu18.04/Dockerfile vendored
Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 06/15/2020, 17:03:56 by juniorxsound
# Dockerfile autogenerated on 06/15/2020, 20:19:12 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04

2
dist/2.82-cpu-ubuntu18.04/Dockerfile vendored
Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 06/15/2020, 17:03:56 by juniorxsound
# Dockerfile autogenerated on 06/15/2020, 20:19:12 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

3
dist/2.82-gpu-ubuntu18.04/Dockerfile vendored
Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 06/15/2020, 17:03:56 by juniorxsound
# Dockerfile autogenerated on 06/15/2020, 20:19:12 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04
@ -29,7 +29,6 @@ RUN apt-get update && apt-get install -y \
libfontconfig1 \
libxrender1 \
libgl1-mesa-glx \
xz-utils \
xz-utils
# Download and install Blender

4
dist/2.83-cpu-ubuntu18.04/Dockerfile vendored
Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 06/15/2020, 17:03:56 by juniorxsound
# Dockerfile autogenerated on 06/15/2020, 20:19:12 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04
@ -29,8 +29,6 @@ RUN apt-get update && apt-get install -y \
libfontconfig1 \
libxrender1 \
libgl1-mesa-glx \
xz-utils \
xz-utils \
xz-utils
# Download and install Blender

5
dist/2.83-gpu-ubuntu18.04/Dockerfile vendored
Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 06/15/2020, 17:03:56 by juniorxsound
# Dockerfile autogenerated on 06/15/2020, 20:19:12 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04
@ -29,9 +29,6 @@ RUN apt-get update && apt-get install -y \
libfontconfig1 \
libxrender1 \
libgl1-mesa-glx \
xz-utils \
xz-utils \
xz-utils \
xz-utils
# Download and install Blender

5
generate.py
Wyświetl plik

@ -68,6 +68,11 @@ def create_dockerfile(base_os: str,
for dependency, has_more in lookahead(deps):
is_multiline = " \ " if has_more else ""
dockerfile += "\u0009{}{}\n".format(dependency, is_multiline)
# Needed so xz-utils doesn't accumalate
if archivetype == "xz":
deps.pop()
dockerfile += "\n"
dockerfile += "# Download and install Blender\n"