瀏覽代碼

Merge pull request #41147 from thaJeztah/remove_unmaintained_examples

contrib: remove outdated examples and files
Tibor Vass 5 年之前
父節點
當前提交
7f96a9a35b

+ 0 - 1
contrib/REVIEWERS

@@ -1 +0,0 @@
-Tianon Gravi <admwiggin@gmail.com> (@tianon)

+ 0 - 11
contrib/desktop-integration/README.md

@@ -1,11 +0,0 @@
-Desktop Integration
-===================
-
-The ./contrib/desktop-integration contains examples of typical dockerized
-desktop applications.
-
-Examples
-========
-
-* Chromium: ./chromium/Dockerfile shows a way to dockerize a common application
-* Gparted: ./gparted/Dockerfile shows a way to dockerize a common application w devices

+ 0 - 36
contrib/desktop-integration/chromium/Dockerfile

@@ -1,36 +0,0 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create chromium container with its dependencies
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
-# COMMENTS:
-#   This file describes how to build a Chromium container with all
-#   dependencies installed. It uses native X11 unix socket.
-#   Tested on Debian Jessie
-# USAGE:
-#   # Download Chromium Dockerfile
-#   wget http://raw.githubusercontent.com/docker/docker/master/contrib/desktop-integration/chromium/Dockerfile
-#
-#   # Build chromium image
-#   docker build -t chromium .
-#
-#   # Run stateful data-on-host chromium. For ephemeral, remove -v /data/chromium:/data
-#   docker run -v /data/chromium:/data -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY chromium
-
-#   # To run stateful dockerized data containers
-#   docker run --volumes-from chromium-data -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY chromium
-
-# Base docker image
-FROM debian:jessie
-LABEL maintainer Jessica Frazelle <jess@docker.com>
-
-# Install Chromium
-RUN apt-get update && apt-get install -y \
-    chromium \
-    chromium-l10n \
-    libcanberra-gtk-module \
-    libexif-dev \
-    --no-install-recommends
-
-# Autorun chromium
-CMD ["/usr/bin/chromium", "--no-sandbox", "--user-data-dir=/data"]

+ 0 - 31
contrib/desktop-integration/gparted/Dockerfile

@@ -1,31 +0,0 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create gparted container with its dependencies
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
-# COMMENTS:
-#   This file describes how to build a gparted container with all
-#   dependencies installed. It uses native X11 unix socket.
-#   Tested on Debian Jessie
-# USAGE:
-#   # Download gparted Dockerfile
-#   wget http://raw.githubusercontent.com/docker/docker/master/contrib/desktop-integration/gparted/Dockerfile
-#
-#   # Build gparted image
-#   docker build -t gparted .
-#
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     --device=/dev/sda:/dev/sda \
-#     -e DISPLAY=unix$DISPLAY gparted
-#
-
-# Base docker image
-FROM debian:jessie
-LABEL maintainer Jessica Frazelle <jess@docker.com>
-
-# Install Gparted and its dependencies
-RUN apt-get update && apt-get install -y \
-    gparted \
-    libcanberra-gtk-module \
-    --no-install-recommends
-
-# Autorun gparted
-CMD ["/usr/sbin/gparted"]

+ 0 - 3
contrib/init/systemd/REVIEWERS

@@ -1,3 +0,0 @@
-Lokesh Mandvekar <lsm5@fedoraproject.org> (@lsm5)
-Brandon Philips <brandon.philips@coreos.com> (@philips)
-Jessie Frazelle <jess@docker.com> (@jfrazelle)

+ 0 - 2
contrib/init/upstart/REVIEWERS

@@ -1,2 +0,0 @@
-Tianon Gravi <admwiggin@gmail.com> (@tianon)
-Jessie Frazelle <jess@docker.com> (@jfrazelle)

+ 0 - 50
contrib/vagrant-docker/README.md

@@ -1,50 +0,0 @@
-# Vagrant integration
-
-Currently there are at least 4 different projects that we are aware of that deals
-with integration with [Vagrant](http://vagrantup.com/) at different levels. One
-approach is to use Docker as a [provisioner](http://docs.vagrantup.com/v2/provisioning/index.html)
-which means you can create containers and pull base images on VMs using Docker's
-CLI and the other is to use Docker as a [provider](http://docs.vagrantup.com/v2/providers/index.html),
-meaning you can use Vagrant to control Docker containers.
-
-
-### Provisioners
-
-* [Vocker](https://github.com/fgrehm/vocker)
-* [Ventriloquist](https://github.com/fgrehm/ventriloquist)
-
-### Providers
-
-* [docker-provider](https://github.com/fgrehm/docker-provider)
-* [vagrant-shell](https://github.com/destructuring/vagrant-shell)
-
-## Setting up Vagrant-docker with the Engine API
-
-The initial Docker upstart script will not work because it runs on `127.0.0.1`, which is not accessible to the host machine. Instead, we need to change the script to connect to `0.0.0.0`. To do this, modify `/etc/init/docker.conf` to look like this:
-
-```
-description     "Docker daemon"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-
-script
-    /usr/bin/dockerd -H=tcp://0.0.0.0:2375
-end script
-```
-
-Once that's done, you need to set up an SSH tunnel between your host machine and the vagrant machine that's running Docker. This can be done by running the following command in a host terminal:
-
-```
-ssh -L 2375:localhost:2375 -p 2222 vagrant@localhost
-```
-
-(The first 2375 is what your host can connect to, the second 2375 is what port Docker is running on in the vagrant machine, and the 2222 is the port Vagrant is providing for SSH. If VirtualBox is the VM you're using, you can see what value "2222" should be by going to: Network > Adapter 1 > Advanced > Port Forwarding in the VirtualBox GUI.)
-
-Note that because the port has been changed, to run docker commands from within the command line you must run them like this:
-
-```
-sudo docker -H 0.0.0.0:2375 < commands for docker >
-```