From 4fd1dbbfb77b784c8e61fa0d795a96f3a1fe064d Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Tue, 3 Mar 2020 19:09:15 +0100
Subject: [PATCH] Misc
---
ubuntu-18.04/Dockerfile | 1 +
windows-1809/base/Dockerfile | 4 +++-
windows-1809/cuda-devel/Dockerfile | 4 +++-
windows-1809/devel/Dockerfile | 4 +++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ubuntu-18.04/Dockerfile b/ubuntu-18.04/Dockerfile
index 9919f32..1e37882 100644
--- a/ubuntu-18.04/Dockerfile
+++ b/ubuntu-18.04/Dockerfile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
FROM nvidia/cudagl:10.0-runtime-ubuntu18.04
LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
diff --git a/windows-1809/base/Dockerfile b/windows-1809/base/Dockerfile
index e5c5be5..60556d2 100644
--- a/windows-1809/base/Dockerfile
+++ b/windows-1809/base/Dockerfile
@@ -1,7 +1,9 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
-
FROM microsoft/dotnet-framework:3.5-runtime-windowsservercore-ltsc2019
+LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
+LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
RUN mkdir $PSHome/profile.d | out-null
ADD powershell/Profile.ps1 /Windows/System32/WindowsPowerShell/v1.0/Profile.ps1
diff --git a/windows-1809/cuda-devel/Dockerfile b/windows-1809/cuda-devel/Dockerfile
index 80e199d..5f3ad99 100644
--- a/windows-1809/cuda-devel/Dockerfile
+++ b/windows-1809/cuda-devel/Dockerfile
@@ -1,7 +1,9 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
-
FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows1809
+LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
+LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
+
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
(New-Object Net.WebClient).DownloadFile('https://developer.download.nvidia.com/compute/cuda/10.1/Prod/network_installers/cuda_10.1.243_win10_network.exe', 'C:/cuda_10.1.243_win10_network.exe'); \
(New-Object Net.WebClient).DownloadFile('https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.1/cudnn-10.1-windows10-x64-v7.6.1.34.zip', 'C:/cudnn-10.1-windows10-x64-v7.6.1.34.zip'); \
diff --git a/windows-1809/devel/Dockerfile b/windows-1809/devel/Dockerfile
index 7d7b0e0..3b610e6 100644
--- a/windows-1809/devel/Dockerfile
+++ b/windows-1809/devel/Dockerfile
@@ -1,7 +1,9 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
-
FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows1809
+LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
+LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
+
COPY opengl32.dll C:/Windows/System32/opengl32.dll
COPY glu32.dll C:/Windows/System32/glu32.dll
COPY ddraw.dll C:/Windows/System32/ddraw.dll
--
GitLab