Browse Source

fix docker again

pull/1700/head
Jason Dove 1 year ago
parent
commit
50a6ed4cea
No known key found for this signature in database
  1. 1
      docker/Dockerfile
  2. 1
      docker/arm32v7/Dockerfile
  3. 1
      docker/arm64/Dockerfile
  4. 8
      docker/docker-compose.nvidia.yml
  5. 4
      docker/docker-compose.vaapi.yml
  6. 4
      docker/docker-compose.yml
  7. 1
      docker/nvidia/Dockerfile
  8. 1
      docker/vaapi/Dockerfile

1
docker/Dockerfile

@ -10,7 +10,6 @@ WORKDIR /source @@ -10,7 +10,6 @@ WORKDIR /source
# copy csproj and restore as distinct layers
COPY *.sln .
COPY lib/nuget/* ./lib/nuget/
COPY artwork/* ./artwork/
COPY ErsatzTV/*.csproj ./ErsatzTV/
COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/

1
docker/arm32v7/Dockerfile

@ -10,7 +10,6 @@ WORKDIR /source @@ -10,7 +10,6 @@ WORKDIR /source
# copy csproj and restore as distinct layers
COPY *.sln .
COPY lib/nuget/* ./lib/nuget/
COPY artwork/* ./artwork/
COPY ErsatzTV/*.csproj ./ErsatzTV/
COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/

1
docker/arm64/Dockerfile

@ -10,7 +10,6 @@ WORKDIR /source @@ -10,7 +10,6 @@ WORKDIR /source
# copy csproj and restore as distinct layers
COPY *.sln .
COPY lib/nuget/* ./lib/nuget/
COPY artwork/* ./artwork/
COPY ErsatzTV/*.csproj ./ErsatzTV/
COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/

8
docker/docker-compose.nvidia.yml

@ -1,6 +1,4 @@ @@ -1,6 +1,4 @@
version: "3.1"
services:
services:
ersatztv:
privileged: true
build:
@ -13,4 +11,6 @@ services: @@ -13,4 +11,6 @@ services:
resources:
reservations:
devices:
- capabilities: [ gpu ]
- driver: nvidia
count: 1
capabilities: [gpu]

4
docker/docker-compose.vaapi.yml

@ -1,6 +1,4 @@ @@ -1,6 +1,4 @@
version: "3.1"
services:
services:
ersatztv:
build:
dockerfile: docker/vaapi/Dockerfile

4
docker/docker-compose.yml

@ -1,6 +1,4 @@ @@ -1,6 +1,4 @@
version: "3.1"
services:
services:
ersatztv:
build:
context: ..

1
docker/nvidia/Dockerfile

@ -16,7 +16,6 @@ WORKDIR /source @@ -16,7 +16,6 @@ WORKDIR /source
# copy csproj and restore as distinct layers
COPY *.sln .
COPY lib/nuget/* ./lib/nuget/
COPY artwork/* ./artwork/
COPY ErsatzTV/*.csproj ./ErsatzTV/
COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/

1
docker/vaapi/Dockerfile

@ -10,7 +10,6 @@ WORKDIR /source @@ -10,7 +10,6 @@ WORKDIR /source
# copy csproj and restore as distinct layers
COPY *.sln .
COPY lib/nuget/* ./lib/nuget/
COPY artwork/* ./artwork/
COPY ErsatzTV/*.csproj ./ErsatzTV/
COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/

Loading…
Cancel
Save