From 94117575159f8f2b1f17b785be4da1919069e980 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 4 Mar 2019 12:01:22 +0100 Subject: [PATCH] Corrected main gitignore so that build.sh scripts for Docker are added to git --- .gitignore | 2 +- docker/base/build.sh | 4 ++++ docker/base/gui/build.sh | 4 ++++ docker/base/gui/linux/nvidia/build.sh | 12 ++++++++++++ docker/base/gui/vanilla/build.sh | 4 ++++ docker/base/server/build.sh | 4 ++++ 6 files changed, 29 insertions(+), 1 deletion(-) create mode 100755 docker/base/build.sh create mode 100755 docker/base/gui/build.sh create mode 100755 docker/base/gui/linux/nvidia/build.sh create mode 100755 docker/base/gui/vanilla/build.sh create mode 100644 docker/base/server/build.sh diff --git a/.gitignore b/.gitignore index 48b21d85d..c00a34bf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ CMakeLists.txt.user* -build* +build*/ qtbuild/* sdriq/* presets/* diff --git a/docker/base/build.sh b/docker/base/build.sh new file mode 100755 index 000000000..682d64ba1 --- /dev/null +++ b/docker/base/build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +IMAGE_NAME=sdrangel/bionic:base +docker build -t ${IMAGE_NAME} . diff --git a/docker/base/gui/build.sh b/docker/base/gui/build.sh new file mode 100755 index 000000000..fe3bfa945 --- /dev/null +++ b/docker/base/gui/build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +IMAGE_NAME=sdrangel/bionic:gui +docker build -t ${IMAGE_NAME} . diff --git a/docker/base/gui/linux/nvidia/build.sh b/docker/base/gui/linux/nvidia/build.sh new file mode 100755 index 000000000..e6b9984a5 --- /dev/null +++ b/docker/base/gui/linux/nvidia/build.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +IMAGE_NAME=sdrangel/bionic:linux_nvidia +NVIDIA_VER=$(nvidia-smi --query-gpu=driver_version --format=csv,noheader) #410.78 +NVIDIA_DRIVER=NVIDIA-Linux-x86_64-${NVIDIA_VER}.run # path to nvidia driver + +if [ ! -f ${NVIDIA_DRIVER} ]; then + wget http://us.download.nvidia.com/XFree86/Linux-x86_64/${NVIDIA_VER}/NVIDIA-Linux-x86_64-${NVIDIA_VER}.run + cp ${NVIDIA_DRIVER} NVIDIA-DRIVER.run +fi + +docker build -t ${IMAGE_NAME} . diff --git a/docker/base/gui/vanilla/build.sh b/docker/base/gui/vanilla/build.sh new file mode 100755 index 000000000..2380a5772 --- /dev/null +++ b/docker/base/gui/vanilla/build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +IMAGE_NAME=sdrangel/bionic:vanilla +docker build -t ${IMAGE_NAME} . diff --git a/docker/base/server/build.sh b/docker/base/server/build.sh new file mode 100644 index 000000000..3734c3e5f --- /dev/null +++ b/docker/base/server/build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +IMAGE_NAME=sdrangel/bionic:server +docker build -t ${IMAGE_NAME} .