From 5b53e7ce1c20b679070d474e845dc032fd553ba3 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Tue, 10 Dec 2019 16:09:41 +0100
Subject: [PATCH] misc
---
COPYING => LICENSE | 0
centos-7/Dockerfile | 6 +++---
centos-7/{ => bash}/gcc-8.sh | 0
centos-7/{ => bash}/ld-library-path.sh | 0
windows1809/base/Dockerfile | 2 +-
windows1809/base/powershell/00-Must-Run.ps1 | 2 +-
windows1809/base/powershell/10-VSDevEnv.ps1 | 2 +-
windows1809/base/powershell/20-MSVC-15.9.ps1 | 2 +-
windows1809/base/powershell/30-vcpkg-cmake.ps1 | 2 +-
windows1809/base/powershell/Profile.ps1 | 3 ++-
windows1809/cuda-devel/Dockerfile | 2 ++
windows1809/devel/Dockerfile | 2 ++
12 files changed, 14 insertions(+), 9 deletions(-)
rename COPYING => LICENSE (100%)
rename centos-7/{ => bash}/gcc-8.sh (100%)
rename centos-7/{ => bash}/ld-library-path.sh (100%)
diff --git a/COPYING b/LICENSE
similarity index 100%
rename from COPYING
rename to LICENSE
diff --git a/centos-7/Dockerfile b/centos-7/Dockerfile
index 9f85712..c6167ef 100644
--- a/centos-7/Dockerfile
+++ b/centos-7/Dockerfile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: AGPL-3.0-or-later
FROM centos:7
LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
@@ -10,8 +10,8 @@ RUN yum install -y centos-release-scl && \
yum install -y epel-release && \
yum install -y devtoolset-8 && \
yum clean all
-ADD gcc-8.sh /etc/profile.d/gcc-8.sh
-ADD ld-library-path.sh /etc/profile.d/ld-library-path.sh
+ADD bash/gcc-8.sh /etc/profile.d/gcc-8.sh
+ADD bash/ld-library-path.sh /etc/profile.d/ld-library-path.sh
# CMake
RUN version=3.15.5 && \
diff --git a/centos-7/gcc-8.sh b/centos-7/bash/gcc-8.sh
similarity index 100%
rename from centos-7/gcc-8.sh
rename to centos-7/bash/gcc-8.sh
diff --git a/centos-7/ld-library-path.sh b/centos-7/bash/ld-library-path.sh
similarity index 100%
rename from centos-7/ld-library-path.sh
rename to centos-7/bash/ld-library-path.sh
diff --git a/windows1809/base/Dockerfile b/windows1809/base/Dockerfile
index 72bc1aa..b34fd69 100644
--- a/windows1809/base/Dockerfile
+++ b/windows1809/base/Dockerfile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: AGPL-3.0-or-later
FROM microsoft/dotnet-framework:3.5-runtime-windowsservercore-ltsc2019
diff --git a/windows1809/base/powershell/00-Must-Run.ps1 b/windows1809/base/powershell/00-Must-Run.ps1
index 34d631c..7aec54e 100644
--- a/windows1809/base/powershell/00-Must-Run.ps1
+++ b/windows1809/base/powershell/00-Must-Run.ps1
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: AGPL-3.0-or-later
#
# Sets exit to error when the command fails
diff --git a/windows1809/base/powershell/10-VSDevEnv.ps1 b/windows1809/base/powershell/10-VSDevEnv.ps1
index 8dbd927..b82158c 100644
--- a/windows1809/base/powershell/10-VSDevEnv.ps1
+++ b/windows1809/base/powershell/10-VSDevEnv.ps1
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: AGPL-3.0-or-later
#
# Sets up Visual Studio Development environment
diff --git a/windows1809/base/powershell/20-MSVC-15.9.ps1 b/windows1809/base/powershell/20-MSVC-15.9.ps1
index 3bfbf4b..06cbbd6 100644
--- a/windows1809/base/powershell/20-MSVC-15.9.ps1
+++ b/windows1809/base/powershell/20-MSVC-15.9.ps1
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: AGPL-3.0-or-later
VSDevEnv -arch='amd64' -vcvars_ver='14.16'
diff --git a/windows1809/base/powershell/30-vcpkg-cmake.ps1 b/windows1809/base/powershell/30-vcpkg-cmake.ps1
index de628e9..482c7e3 100644
--- a/windows1809/base/powershell/30-vcpkg-cmake.ps1
+++ b/windows1809/base/powershell/30-vcpkg-cmake.ps1
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: AGPL-3.0-or-later
#
# Executes CMake with vcpkg toolchain file
diff --git a/windows1809/base/powershell/Profile.ps1 b/windows1809/base/powershell/Profile.ps1
index 961a6ed..dc2087f 100644
--- a/windows1809/base/powershell/Profile.ps1
+++ b/windows1809/base/powershell/Profile.ps1
@@ -1,2 +1,3 @@
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
ls "$pshome/profile.d/*.ps1" | % { . $_.FullName }
diff --git a/windows1809/cuda-devel/Dockerfile b/windows1809/cuda-devel/Dockerfile
index 76c2434..ce5e06a 100644
--- a/windows1809/cuda-devel/Dockerfile
+++ b/windows1809/cuda-devel/Dockerfile
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows1809
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/windows1809/devel/Dockerfile b/windows1809/devel/Dockerfile
index 68eb25a..a254705 100644
--- a/windows1809/devel/Dockerfile
+++ b/windows1809/devel/Dockerfile
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows1809
COPY opengl32.dll C:/Windows/System32/opengl32.dll
--
GitLab