summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2018-08-08 12:40:42 (GMT)
committerChristian Pointner <equinox@helsinki.at>2018-08-08 12:40:42 (GMT)
commitcab67196dc458c84a3445173a15a4e1c184e9eaa (patch)
tree4e1e48aa704a407dd8f58b2136a5d782f85e32ca
parent021b7e925b605539b1deb201d43959995223ead4 (diff)
added ffmpeg app image
-rwxr-xr-x_build.sh (renamed from build.sh)0
-rwxr-xr-xbuild-app-images.sh26
-rwxr-xr-xbuild-os-images.sh2
-rw-r--r--ffmpeg/bionic/Dockerfile7
4 files changed, 34 insertions, 1 deletions
diff --git a/build.sh b/_build.sh
index 35da7a3..35da7a3 100755
--- a/build.sh
+++ b/_build.sh
diff --git a/build-app-images.sh b/build-app-images.sh
new file mode 100755
index 0000000..a4368c9
--- /dev/null
+++ b/build-app-images.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+BASE_D="${BASH_SOURCE%/*}"
+
+function run_build {
+ local img_name="$1"
+ local img_name_helsinki="docker.helsinki.at/$img_name"
+ local build_dir="$2"
+
+ echo -e "\033[1m****************\033[0m"
+ echo -e " \033[1mbuilding: $img_name\033[0m"
+ echo ""
+
+ "$BASE_D/_build.sh" "$img_name_helsinki" "$BASE_D/$build_dir"
+ result=$?
+
+ echo ""
+ if [ "$result" -ne 0 ]; then
+ echo -e " \033[1;31m*** FAILED ***\033[0m";
+ else
+ echo -e " \033[1;32m*** Success ***\033[0m";
+ fi
+ echo ""
+}
+
+run_build "ffmpeg:bionic" "ffmpeg/bionic"
diff --git a/build-os-images.sh b/build-os-images.sh
index 9e3421d..a148081 100755
--- a/build-os-images.sh
+++ b/build-os-images.sh
@@ -20,7 +20,7 @@ function run_build {
if [ $result -eq 0 ]; then
echo ""
- "$BASE_D/build.sh" "$img_name_helsinki" "$BASE_D/$build_dir"
+ "$BASE_D/_build.sh" "$img_name_helsinki" "$BASE_D/$build_dir"
result=$?
fi
diff --git a/ffmpeg/bionic/Dockerfile b/ffmpeg/bionic/Dockerfile
new file mode 100644
index 0000000..aa04dda
--- /dev/null
+++ b/ffmpeg/bionic/Dockerfile
@@ -0,0 +1,7 @@
+FROM docker.helsinki.at/ubuntu:bionic
+MAINTAINER Christian Pointner <equinox@helsinki.at>
+
+RUN set -x \
+ && apt-get update -q \
+ && apt-get install -y -q ffmpeg \
+ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*