default.yml in takelage-0.10.0

- old
+ new

@@ -1,9 +1,9 @@
 ---
 bit_dev_user: 'takelage'
 bit_remote: ''
-bit_scope_root: '/bit'
+bit_root: '/bit'
 bit_ssh: ''
 cmd_bit_check_workspace_bit_list: 'bit list'
 cmd_bit_check_workspace_pwd: 'pwd'
 cmd_bit_clipboard_copy_bit_list_scope: 'bit list --skip-update --json %{scope}'
 cmd_bit_clipboard_copy_bit_list_remotes: 'bit remote --skip-update'
@@ -21,40 +21,39 @@
 cmd_bit_scope_remove_scope: 'rm --force --recursive %{root}/%{scope}'
 cmd_docker_check_running_docker_info: 'docker info'
 cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
 cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
 cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
-cmd_docker_create_container_docker_run: 'docker run --detach --env GEOSPIN_PROJECT_BASE_DIR=%{workdir} --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_DAYNIGHT=%{daynight} --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}/.config/gcloud:/srv/gcloud --volume %{homedir}/.google:/srv/google --volume %{homedir}:/homedir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} %{entrypoint_options}'
-cmd_docker_create_network_docker_network: 'docker network create %{network}'
-cmd_docker_enter_container_docker_exec: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
-cmd_docker_get_container_name_by_id: 'docker ps --filter id=%{container} --format "{{.Names}}"'
-cmd_docker_get_containers: 'docker ps --all --filter name=^%{docker_repo}_ --quiet'
-cmd_docker_remove_network: 'docker network rm %{network}'
-cmd_docker_run_command_in_container: 'docker exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
-cmd_docker_stop_container: 'docker stop %{container}'
+cmd_docker_container_create: 'docker run --detach --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}/.config/gcloud:/srv/gcloud --volume %{homedir}/.google:/srv/google --volume %{homedir}:/homedir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} %{entrypoint_options}'
+cmd_docker_container_create_network: 'docker network create %{network}'
+cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
+cmd_docker_container_get_container_name: 'docker ps --filter id=%{container} --format "{{.Names}}"'
+cmd_docker_container_get_containers: 'docker ps --all --filter name=^%{docker_repo}_ --quiet'
+cmd_docker_container_remove_network: 'docker network rm %{network}'
+cmd_docker_container_docker_exec: 'docker exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
+cmd_docker_container_stop_container: 'docker stop %{container}'
 cmd_docker_image_tag_check_local_docker_images: 'docker images --quiet %{image}'
 cmd_docker_image_tag_list_local_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
 cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:%{tag_latest_remote}'
 cmd_docker_socket_stop_docker_socket_ps: 'sudo ps a -o pid,command'
 cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
-cmd_docker_get_socket_start_commands_docker_socket_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
-cmd_docker_get_socket_paths_docker_socket_gpgconf: 'gpgconf --list-dirs'
+cmd_docker_socket_get_socket_socat: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
+cmd_docker_socket_get_socket_gpgconf: 'gpgconf --list-dirs'
 cmd_docker_socket_start_sudo_true: 'sudo true'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
 cmd_git_check_clean_git_status: 'git status --porcelain'
 cmd_git_check_master_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
-docker_daynight: 'night'
 docker_debug: 'ansible/roles/takel-takelage/files/pyscripts'
 docker_entrypoint_options: ''
+docker_registry: 'https://registry.hub.docker.com'
 docker_repo: 'takelage'
-docker_user: 'takelage'
 docker_socket_agent_port: 20000
 docker_socket_agent_ssh_port: 20001
 docker_socket_agent_extra_port: 20002
 docker_socket_agent_browser_port: 20003
 docker_tag: 'latest'
-docker_tagsurl: 'https://hub.docker.com/v2/repositories/takelage/takelage/tags'
+docker_user: 'takelage'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'