diff options
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 7 | ||||
| -rw-r--r-- | images/basic/hostoverlaytest/Dockerfile (renamed from images/hostoverlaytest/Dockerfile) | 0 | ||||
| -rw-r--r-- | images/basic/hostoverlaytest/test.c (renamed from images/hostoverlaytest/test.c) | 0 | ||||
| -rw-r--r-- | images/basic/hostoverlaytest/testfile.txt (renamed from images/hostoverlaytest/testfile.txt) | 0 | ||||
| -rw-r--r-- | images/basic/tmpfile/Dockerfile (renamed from images/tmpfile/Dockerfile) | 0 | ||||
| -rw-r--r-- | images/benchmarks/ffmpeg/Dockerfile | 9 | ||||
| -rw-r--r-- | images/benchmarks/redis/Dockerfile | 1 | ||||
| -rw-r--r-- | images/default/Dockerfile | 2 |
8 files changed, 18 insertions, 1 deletions
diff --git a/images/Makefile b/images/Makefile index 1485607bd..9de359a28 100644 --- a/images/Makefile +++ b/images/Makefile @@ -34,8 +34,15 @@ list-all-images: @for image in $(ALL_IMAGES); do echo $${image}; done .PHONY: list-build-images +# Handy wrapper to allow load-all-images, push-all-images, etc. %-all-images: @$(MAKE) $(patsubst %,$*-%,$(ALL_IMAGES)) +load-all-images: + @$(MAKE) $(patsubst %,load-%,$(ALL_IMAGES)) + +# Handy wrapper to load specified "groups", e.g. load-basic-images, etc. +load-%-images: + @$(MAKE) $(patsubst %,load-%,$(subst /,_,$(subst ./,,$(shell find ./$* -name Dockerfile -exec dirname {} \;)))) # tag is a function that returns the tag name, given an image. # diff --git a/images/hostoverlaytest/Dockerfile b/images/basic/hostoverlaytest/Dockerfile index d83439e9c..d83439e9c 100644 --- a/images/hostoverlaytest/Dockerfile +++ b/images/basic/hostoverlaytest/Dockerfile diff --git a/images/hostoverlaytest/test.c b/images/basic/hostoverlaytest/test.c index 088f90746..088f90746 100644 --- a/images/hostoverlaytest/test.c +++ b/images/basic/hostoverlaytest/test.c diff --git a/images/hostoverlaytest/testfile.txt b/images/basic/hostoverlaytest/testfile.txt index e4188c841..e4188c841 100644 --- a/images/hostoverlaytest/testfile.txt +++ b/images/basic/hostoverlaytest/testfile.txt diff --git a/images/tmpfile/Dockerfile b/images/basic/tmpfile/Dockerfile index e3816c8cb..e3816c8cb 100644 --- a/images/tmpfile/Dockerfile +++ b/images/basic/tmpfile/Dockerfile diff --git a/images/benchmarks/ffmpeg/Dockerfile b/images/benchmarks/ffmpeg/Dockerfile new file mode 100644 index 000000000..7108df64f --- /dev/null +++ b/images/benchmarks/ffmpeg/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:18.04 + +RUN set -x \ + && apt-get update \ + && apt-get install -y \ + ffmpeg \ + && rm -rf /var/lib/apt/lists/* +WORKDIR /media +ADD https://samples.ffmpeg.org/MPEG-4/video.mp4 video.mp4 diff --git a/images/benchmarks/redis/Dockerfile b/images/benchmarks/redis/Dockerfile new file mode 100644 index 000000000..0f17249af --- /dev/null +++ b/images/benchmarks/redis/Dockerfile @@ -0,0 +1 @@ +FROM redis:5.0.4 diff --git a/images/default/Dockerfile b/images/default/Dockerfile index 397082b02..2b38e6c58 100644 --- a/images/default/Dockerfile +++ b/images/default/Dockerfile @@ -1,7 +1,7 @@ FROM fedora:31 # Install bazel. RUN dnf install -y dnf-plugins-core && dnf copr enable -y vbatts/bazel -RUN dnf install -y git gcc make golang gcc-c++ glibc-devel python3 which python3-pip python3-devel libffi-devel openssl-devel pkg-config glibc-static libstdc++-static patch +RUN dnf install -y git gcc make golang gcc-c++ glibc-devel python3 which python3-pip python3-devel libffi-devel openssl-devel pkg-config glibc-static libstdc++-static patch diffutils RUN pip install pycparser RUN dnf install -y bazel3 # Install gcloud. |