@@ -217,6 +217,75 @@ _docker_cp()

 	fi

 }

+_docker_create()

+{

+	case "$prev" in

+		-a|--attach)

+			COMPREPLY=( $( compgen -W 'stdin stdout stderr' -- "$cur" ) )

+			return

+			;;

+		--cidfile|--env-file)

+			_filedir

+			return

+			;;

+		--volumes-from)

+			__docker_containers_all

+			return

+			;;

+		-v|--volume)

+			case "$cur" in

+				*:*)

+					# TODO somehow do _filedir for stuff inside the image, if it's already specified (which is also somewhat difficult to determine)

+					;;

+				'')

+					COMPREPLY=( $( compgen -W '/' -- "$cur" ) )

+					compopt -o nospace

+					;;

+				/*)

+					_filedir

+					compopt -o nospace

+					;;

+			esac

+			return

+			;;

+		-e|--env)

+			COMPREPLY=( $( compgen -e -- "$cur" ) )

+			compopt -o nospace

+			return

+			;;

+		--link)

+			case "$cur" in

+				*:*)

+					;;

+				*)

+					__docker_containers_running

+					COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )

+					compopt -o nospace

+					;;

+			esac

+			return

+			;;

+		--entrypoint|-h|--hostname|-m|--memory|-u|--user|-w|--workdir|-c|--cpu-shares|-n|--name|-p|--publish|--expose|--dns|--lxc-conf)

+			return

+			;;

+		*)

+			;;

+	esac

+

+	case "$cur" in

+		-*)

+			COMPREPLY=( $( compgen -W "-n --networking --privileged -P --publish-all -i --interactive -t --tty --cidfile --entrypoint -h --hostname -m --memory -u --user -w --workdir -c --cpu-shares --name -a --attach -v --volume --link -e --env -p --publish --expose --dns --volumes-from --lxc-conf" -- "$cur" ) )

+			;;

+		*)

+			local counter=$(__docker_pos_first_nonflag '--cidfile|--volumes-from|-v|--volume|-e|--env|--entrypoint|-h|--hostname|-m|--memory|-u|--user|-w|--workdir|-c|--cpu-shares|-n|--name|-a|--attach|--link|-p|--publish|--expose|--dns|--lxc-conf')

+

+			if [ $cword -eq $counter ]; then

+				__docker_image_repos_and_tags_and_ids

+			fi

+			;;

+	esac

+}

+

 _docker_diff()

 {

 	local counter=$(__docker_pos_first_nonflag)

@@ -670,6 +739,7 @@ _docker()

 			build

 			commit

 			cp

+			create

 			diff

 			events

 			exec

@@ -16,7 +16,7 @@

 function __fish_docker_no_subcommand --description 'Test if docker has yet to be given the subcommand'

     for i in (commandline -opc)

-        if contains -- $i attach build commit cp diff events export history images import info insert inspect kill load login logs port ps pull push restart rm rmi run save search start stop tag top version wait

+        if contains -- $i attach build commit cp create diff events export history images import info insert inspect kill load login logs port ps pull push restart rm rmi run save search start stop tag top version wait

             return 1

         end

     end

@@ -88,6 +88,33 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -a '(__fish_pri

 # cp

 complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d "Copy files/folders from a container's filesystem to the host path"

+# create

+complete -c docker -f -n '__fish_docker_no_subcommand' -a run -d 'Run a command in a new container'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s P -l publish-all -d 'Publish all exposed ports to the host interfaces'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s a -l attach -d 'Attach to stdin, stdout or stderr.'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s c -l cpu-shares -d 'CPU shares (relative weight)'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cidfile -d 'Write the container ID to the file'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns -d 'Set custom dns servers'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s e -l env -d 'Set environment variables'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l entrypoint -d 'Overwrite the default entrypoint of the image'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l expose -d 'Expose a port from the container without publishing it to your host'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s h -l hostname -d 'Container host name'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s i -l interactive -d 'Keep stdin open even if not attached'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l link -d 'Add link to another container (name:alias)'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l lxc-conf -d 'Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s m -l memory -d 'Memory limit (format: <number><optional unit>, where unit = b, k, m or g)'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s n -l networking -d 'Enable networking for this container'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l name -d 'Assign a name to the container'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s p -l publish -d "Publish a container's port to the host (format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort) (use 'docker port' to see the actual mapping)"

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l privileged -d 'Give extended privileges to this container'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s t -l tty -d 'Allocate a pseudo-tty'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s u -l user -d 'Username or UID'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s v -l volume -d 'Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l volumes-from -d 'Mount volumes from the specified container(s)'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s w -l workdir -d 'Working directory inside the container'

+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -a '(__fish_print_docker_images)' -d "Image"

+

+

 # diff

 complete -c docker -f -n '__fish_docker_no_subcommand' -a diff -d "Inspect changes on a container's filesystem"

 complete -c docker -A -f -n '__fish_seen_subcommand_from diff' -a '(__fish_print_docker_containers all)' -d "Container"

@@ -224,6 +224,32 @@ __docker_subcommand () {

                     ;;

             esac

             ;;

+        (create)

+            _arguments \

+                '-P[Publish all exposed ports to the host]' \

+                '-a[Attach to stdin, stdout or stderr]' \

+                '-c=-[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)' \

+                '--cidfile=-[Write the container ID to the file]:CID file:_files' \

+                '*--dns=-[Set custom dns servers]:dns server: ' \

+                '*-e=-[Set environment variables]:environment variable: ' \

+                '--entrypoint=-[Overwrite the default entrypoint of the image]:entry point: ' \

+                '*--expose=-[Expose a port from the container without publishing it]: ' \

+                '-h=-[Container host name]:hostname:_hosts' \

+                '-i[Keep stdin open even if not attached]' \

+                '--link=-[Add link to another container]:link:->link' \

+                '--lxc-conf=-[Add custom lxc options]:lxc options: ' \

+                '-m=-[Memory limit (in bytes)]:limit: ' \

+                '--name=-[Container name]:name: ' \

+                '*-p=-[Expose a container'"'"'s port to the host]:port:_ports' \

+                '--privileged[Give extended privileges to this container]' \

+                '-t[Allocate a pseudo-tty]' \

+                '-u=-[Username or UID]:user:_users' \

+                '*-v=-[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]:volume: '\

+                '--volumes-from=-[Mount volumes from the specified container]:volume: ' \

+                '-w=-[Working directory inside the container]:directory:_directories' \

+                '(-):images:__docker_images' \

+                '(-):command: _command_names -e' \

+                '*::arguments: _normal'

         (diff|export)

             _arguments '*:containers:__docker_containers'

             ;;