dapp 0.8.0 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/dapp +5 -5
- data/config/en/common.yml +6 -4
- data/config/en/net_status.yml +8 -7
- data/lib/dapp.rb +157 -139
- data/lib/dapp/cli.rb +6 -16
- data/lib/dapp/cli/base.rb +3 -5
- data/lib/dapp/config/base.rb +19 -7
- data/lib/dapp/config/directive/base.rb +0 -1
- data/lib/dapp/config/error/config.rb +7 -0
- data/lib/dapp/core_ext/hash.rb +0 -2
- data/lib/dapp/core_ext/pathname.rb +1 -3
- data/lib/dapp/{project.rb → dapp.rb} +2 -21
- data/lib/dapp/{project → dapp}/chef.rb +2 -4
- data/lib/dapp/{project → dapp}/dappfile.rb +5 -7
- data/lib/dapp/{project → dapp}/deps/base.rb +3 -6
- data/lib/dapp/{project → dapp}/deps/gitartifact.rb +2 -5
- data/lib/dapp/{project → dapp}/git_artifact.rb +2 -4
- data/lib/dapp/{project → dapp}/lock.rb +3 -5
- data/lib/dapp/{project → dapp}/logging/base.rb +2 -5
- data/lib/dapp/{project → dapp}/logging/i18n.rb +2 -3
- data/lib/dapp/{project → dapp}/logging/paint.rb +2 -4
- data/lib/dapp/{project → dapp}/logging/process.rb +2 -5
- data/lib/dapp/{project → dapp}/shellout/base.rb +2 -4
- data/lib/dapp/{project → dapp}/shellout/streaming.rb +3 -8
- data/lib/dapp/{project → dapp}/ssh_agent.rb +6 -9
- data/lib/dapp/dimg.rb +1 -192
- data/lib/dapp/dimg/artifact.rb +24 -0
- data/lib/dapp/dimg/build/stage/after_install_artifact.rb +14 -0
- data/lib/dapp/dimg/build/stage/after_setup_artifact.rb +18 -0
- data/lib/dapp/dimg/build/stage/artifact_base.rb +80 -0
- data/lib/dapp/dimg/build/stage/artifact_default.rb +63 -0
- data/lib/dapp/dimg/build/stage/base.rb +210 -0
- data/lib/dapp/dimg/build/stage/before_install.rb +33 -0
- data/lib/dapp/dimg/build/stage/before_install_artifact.rb +14 -0
- data/lib/dapp/dimg/build/stage/before_setup.rb +31 -0
- data/lib/dapp/dimg/build/stage/before_setup_artifact.rb +14 -0
- data/lib/dapp/dimg/build/stage/build_artifact.rb +31 -0
- data/lib/dapp/dimg/build/stage/docker_instructions.rb +25 -0
- data/lib/dapp/dimg/build/stage/from.rb +50 -0
- data/lib/dapp/dimg/build/stage/ga_archive.rb +28 -0
- data/lib/dapp/dimg/build/stage/ga_archive_dependencies.rb +27 -0
- data/lib/dapp/dimg/build/stage/ga_artifact_patch.rb +22 -0
- data/lib/dapp/dimg/build/stage/ga_base.rb +80 -0
- data/lib/dapp/dimg/build/stage/ga_dependencies_base.rb +20 -0
- data/lib/dapp/dimg/build/stage/ga_latest_patch.rb +54 -0
- data/lib/dapp/dimg/build/stage/import_artifact.rb +64 -0
- data/lib/dapp/dimg/build/stage/install/ga_post_install_patch.rb +22 -0
- data/lib/dapp/dimg/build/stage/install/ga_post_install_patch_dependencies.rb +22 -0
- data/lib/dapp/dimg/build/stage/install/ga_pre_install_patch.rb +22 -0
- data/lib/dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies.rb +22 -0
- data/lib/dapp/dimg/build/stage/install/install.rb +35 -0
- data/lib/dapp/dimg/build/stage/mod/group.rb +42 -0
- data/lib/dapp/dimg/build/stage/mod/logging.rb +101 -0
- data/lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb +22 -0
- data/lib/dapp/dimg/build/stage/setup/ga_post_setup_patch_dependencies.rb +32 -0
- data/lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch.rb +22 -0
- data/lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch_dependencies.rb +22 -0
- data/lib/dapp/dimg/build/stage/setup/setup.rb +35 -0
- data/lib/dapp/dimg/builder.rb +6 -0
- data/lib/dapp/{builder → dimg/builder}/base.rb +4 -5
- data/lib/dapp/{builder → dimg/builder}/chef.rb +41 -33
- data/lib/dapp/dimg/builder/chef/berksfile.rb +121 -0
- data/lib/dapp/dimg/builder/chef/cookbook.rb +285 -0
- data/lib/dapp/dimg/builder/chef/cookbook_metadata.rb +106 -0
- data/lib/dapp/{builder → dimg/builder}/none.rb +4 -5
- data/lib/dapp/{builder → dimg/builder}/shell.rb +5 -6
- data/lib/dapp/dimg/cli/base.rb +16 -0
- data/lib/dapp/dimg/cli/bp.rb +37 -0
- data/lib/dapp/dimg/cli/build.rb +64 -0
- data/lib/dapp/dimg/cli/build_context.rb +18 -0
- data/lib/dapp/dimg/cli/build_context/export.rb +26 -0
- data/lib/dapp/dimg/cli/build_context/import.rb +17 -0
- data/lib/dapp/dimg/cli/cleanup.rb +22 -0
- data/lib/dapp/dimg/cli/cli.rb +1 -0
- data/lib/dapp/dimg/cli/dimg.rb +30 -0
- data/lib/dapp/dimg/cli/list.rb +17 -0
- data/lib/dapp/dimg/cli/mrproper.rb +26 -0
- data/lib/dapp/dimg/cli/push.rb +61 -0
- data/lib/dapp/dimg/cli/run.rb +59 -0
- data/lib/dapp/{cli → dimg/cli}/spush.rb +7 -7
- data/lib/dapp/dimg/cli/stage_image.rb +24 -0
- data/lib/dapp/dimg/cli/stages.rb +22 -0
- data/lib/dapp/dimg/cli/stages/cleanup_local.rb +44 -0
- data/lib/dapp/dimg/cli/stages/cleanup_repo.rb +26 -0
- data/lib/dapp/dimg/cli/stages/flush_local.rb +23 -0
- data/lib/dapp/dimg/cli/stages/flush_repo.rb +24 -0
- data/lib/dapp/dimg/cli/stages/pull.rb +28 -0
- data/lib/dapp/dimg/cli/stages/push.rb +24 -0
- data/lib/dapp/dimg/cli/tag.rb +24 -0
- data/lib/dapp/dimg/config/artifact_dimg.rb +17 -0
- data/lib/dapp/dimg/config/artifact_group.rb +47 -0
- data/lib/dapp/dimg/config/base.rb +7 -0
- data/lib/dapp/dimg/config/dimg.rb +24 -0
- data/lib/dapp/dimg/config/dimg/instance_methods.rb +177 -0
- data/lib/dapp/dimg/config/dimg/validation.rb +126 -0
- data/lib/dapp/dimg/config/dimg_group.rb +61 -0
- data/lib/dapp/dimg/config/dimg_group_base.rb +54 -0
- data/lib/dapp/dimg/config/dimg_group_main.rb +22 -0
- data/lib/dapp/dimg/config/directive/artifact.rb +70 -0
- data/lib/dapp/dimg/config/directive/artifact_base.rb +97 -0
- data/lib/dapp/dimg/config/directive/base.rb +9 -0
- data/lib/dapp/dimg/config/directive/chef.rb +68 -0
- data/lib/dapp/dimg/config/directive/docker/artifact.rb +15 -0
- data/lib/dapp/dimg/config/directive/docker/base.rb +22 -0
- data/lib/dapp/dimg/config/directive/docker/dimg.rb +82 -0
- data/lib/dapp/dimg/config/directive/git_artifact_local.rb +47 -0
- data/lib/dapp/dimg/config/directive/git_artifact_remote.rb +58 -0
- data/lib/dapp/dimg/config/directive/mount.rb +27 -0
- data/lib/dapp/dimg/config/directive/shell/artifact.rb +18 -0
- data/lib/dapp/dimg/config/directive/shell/dimg.rb +65 -0
- data/lib/dapp/dimg/dapp/command.rb +21 -0
- data/lib/dapp/dimg/dapp/command/bp.rb +20 -0
- data/lib/dapp/dimg/dapp/command/build.rb +22 -0
- data/lib/dapp/dimg/dapp/command/build_context/common.rb +27 -0
- data/lib/dapp/dimg/dapp/command/build_context/export.rb +55 -0
- data/lib/dapp/dimg/dapp/command/build_context/import.rb +71 -0
- data/lib/dapp/dimg/dapp/command/cleanup.rb +23 -0
- data/lib/dapp/dimg/dapp/command/common.rb +96 -0
- data/lib/dapp/dimg/dapp/command/list.rb +19 -0
- data/lib/dapp/dimg/dapp/command/mrproper.rb +75 -0
- data/lib/dapp/dimg/dapp/command/push.rb +27 -0
- data/lib/dapp/dimg/dapp/command/run.rb +15 -0
- data/lib/dapp/dimg/dapp/command/spush.rb +17 -0
- data/lib/dapp/dimg/dapp/command/stage_image.rb +14 -0
- data/lib/dapp/dimg/dapp/command/stages/cleanup_local.rb +137 -0
- data/lib/dapp/dimg/dapp/command/stages/cleanup_repo.rb +124 -0
- data/lib/dapp/dimg/dapp/command/stages/common.rb +85 -0
- data/lib/dapp/dimg/dapp/command/stages/flush_local.rb +21 -0
- data/lib/dapp/dimg/dapp/command/stages/flush_repo.rb +21 -0
- data/lib/dapp/dimg/dapp/command/stages/pull.rb +26 -0
- data/lib/dapp/dimg/dapp/command/stages/push.rb +22 -0
- data/lib/dapp/dimg/dapp/command/tag.rb +17 -0
- data/lib/dapp/dimg/dimg.rb +192 -0
- data/lib/dapp/dimg/dimg/git_artifact.rb +26 -0
- data/lib/dapp/dimg/dimg/path.rb +37 -0
- data/lib/dapp/dimg/dimg/stages.rb +60 -0
- data/lib/dapp/dimg/dimg/tags.rb +65 -0
- data/lib/dapp/dimg/docker_registry.rb +37 -0
- data/lib/dapp/dimg/docker_registry/base.rb +109 -0
- data/lib/dapp/dimg/docker_registry/base/authorization.rb +63 -0
- data/lib/dapp/dimg/docker_registry/base/request.rb +34 -0
- data/lib/dapp/dimg/docker_registry/default.rb +18 -0
- data/lib/dapp/dimg/error/base.rb +7 -0
- data/lib/dapp/dimg/error/build.rb +7 -0
- data/lib/dapp/dimg/error/chef.rb +11 -0
- data/lib/dapp/dimg/error/command.rb +7 -0
- data/lib/dapp/dimg/error/config.rb +7 -0
- data/lib/dapp/dimg/error/dimg.rb +7 -0
- data/lib/dapp/dimg/error/lock.rb +7 -0
- data/lib/dapp/dimg/error/registry.rb +7 -0
- data/lib/dapp/dimg/error/rugged.rb +7 -0
- data/lib/dapp/dimg/error/shellout.rb +7 -0
- data/lib/dapp/dimg/error/tar_writer.rb +7 -0
- data/lib/dapp/dimg/exception/base.rb +7 -0
- data/lib/dapp/dimg/exception/introspect_image.rb +7 -0
- data/lib/dapp/dimg/exception/registry.rb +7 -0
- data/lib/dapp/dimg/filelock.rb +43 -0
- data/lib/dapp/dimg/git_artifact.rb +241 -18
- data/lib/dapp/dimg/git_repo/base.rb +90 -0
- data/lib/dapp/dimg/git_repo/own.rb +39 -0
- data/lib/dapp/dimg/git_repo/remote.rb +50 -0
- data/lib/dapp/dimg/image/argument.rb +143 -0
- data/lib/dapp/dimg/image/docker.rb +127 -0
- data/lib/dapp/dimg/image/scratch.rb +32 -0
- data/lib/dapp/dimg/image/stage.rb +95 -0
- data/lib/dapp/dimg/lock/base.rb +51 -0
- data/lib/dapp/dimg/lock/file.rb +48 -0
- data/lib/dapp/error/base.rb +0 -1
- data/lib/dapp/error/dapp.rb +5 -0
- data/lib/dapp/error/dappfile.rb +0 -1
- data/lib/dapp/error/shellout.rb +0 -1
- data/lib/dapp/exception/base.rb +0 -1
- data/lib/dapp/helper/cli.rb +5 -6
- data/lib/dapp/helper/net_status.rb +0 -1
- data/lib/dapp/helper/sha256.rb +0 -1
- data/lib/dapp/helper/trivia.rb +0 -1
- data/lib/dapp/prctl.rb +0 -1
- data/lib/dapp/version.rb +1 -2
- metadata +172 -140
- data/lib/dapp/artifact.rb +0 -23
- data/lib/dapp/build/stage/after_install_artifact.rb +0 -13
- data/lib/dapp/build/stage/after_setup_artifact.rb +0 -17
- data/lib/dapp/build/stage/artifact_base.rb +0 -80
- data/lib/dapp/build/stage/artifact_default.rb +0 -63
- data/lib/dapp/build/stage/base.rb +0 -203
- data/lib/dapp/build/stage/before_install.rb +0 -32
- data/lib/dapp/build/stage/before_install_artifact.rb +0 -13
- data/lib/dapp/build/stage/before_setup.rb +0 -30
- data/lib/dapp/build/stage/before_setup_artifact.rb +0 -13
- data/lib/dapp/build/stage/build_artifact.rb +0 -36
- data/lib/dapp/build/stage/docker_instructions.rb +0 -24
- data/lib/dapp/build/stage/from.rb +0 -34
- data/lib/dapp/build/stage/ga_archive.rb +0 -27
- data/lib/dapp/build/stage/ga_archive_dependencies.rb +0 -26
- data/lib/dapp/build/stage/ga_artifact_patch.rb +0 -21
- data/lib/dapp/build/stage/ga_base.rb +0 -79
- data/lib/dapp/build/stage/ga_dependencies_base.rb +0 -19
- data/lib/dapp/build/stage/ga_latest_patch.rb +0 -53
- data/lib/dapp/build/stage/import_artifact.rb +0 -65
- data/lib/dapp/build/stage/install/ga_post_install_patch.rb +0 -21
- data/lib/dapp/build/stage/install/ga_post_install_patch_dependencies.rb +0 -21
- data/lib/dapp/build/stage/install/ga_pre_install_patch.rb +0 -21
- data/lib/dapp/build/stage/install/ga_pre_install_patch_dependencies.rb +0 -21
- data/lib/dapp/build/stage/install/install.rb +0 -40
- data/lib/dapp/build/stage/mod/group.rb +0 -42
- data/lib/dapp/build/stage/mod/logging.rb +0 -104
- data/lib/dapp/build/stage/setup/ga_post_setup_patch.rb +0 -21
- data/lib/dapp/build/stage/setup/ga_post_setup_patch_dependencies.rb +0 -31
- data/lib/dapp/build/stage/setup/ga_pre_setup_patch.rb +0 -21
- data/lib/dapp/build/stage/setup/ga_pre_setup_patch_dependencies.rb +0 -21
- data/lib/dapp/build/stage/setup/setup.rb +0 -40
- data/lib/dapp/builder/chef/berksfile.rb +0 -78
- data/lib/dapp/builder/chef/cookbook.rb +0 -257
- data/lib/dapp/builder/chef/cookbook_metadata.rb +0 -54
- data/lib/dapp/builder/chef/error.rb +0 -12
- data/lib/dapp/cli/bp.rb +0 -37
- data/lib/dapp/cli/build.rb +0 -60
- data/lib/dapp/cli/cleanup.rb +0 -22
- data/lib/dapp/cli/list.rb +0 -17
- data/lib/dapp/cli/mrproper.rb +0 -26
- data/lib/dapp/cli/push.rb +0 -61
- data/lib/dapp/cli/run.rb +0 -53
- data/lib/dapp/cli/stage_image.rb +0 -24
- data/lib/dapp/cli/stages.rb +0 -23
- data/lib/dapp/cli/stages/cleanup_local.rb +0 -44
- data/lib/dapp/cli/stages/cleanup_repo.rb +0 -26
- data/lib/dapp/cli/stages/flush_local.rb +0 -23
- data/lib/dapp/cli/stages/flush_repo.rb +0 -24
- data/lib/dapp/cli/stages/pull.rb +0 -28
- data/lib/dapp/cli/stages/push.rb +0 -24
- data/lib/dapp/cli/tag.rb +0 -24
- data/lib/dapp/config/artifact_dimg.rb +0 -20
- data/lib/dapp/config/artifact_group.rb +0 -56
- data/lib/dapp/config/dimg.rb +0 -23
- data/lib/dapp/config/dimg/instance_methods.rb +0 -194
- data/lib/dapp/config/dimg/validation.rb +0 -125
- data/lib/dapp/config/dimg_group.rb +0 -60
- data/lib/dapp/config/dimg_group_base.rb +0 -53
- data/lib/dapp/config/dimg_group_main.rb +0 -21
- data/lib/dapp/config/directive/artifact.rb +0 -69
- data/lib/dapp/config/directive/artifact_base.rb +0 -93
- data/lib/dapp/config/directive/chef.rb +0 -57
- data/lib/dapp/config/directive/docker/artifact.rb +0 -15
- data/lib/dapp/config/directive/docker/base.rb +0 -20
- data/lib/dapp/config/directive/docker/dimg.rb +0 -81
- data/lib/dapp/config/directive/git_artifact_local.rb +0 -13
- data/lib/dapp/config/directive/git_artifact_remote.rb +0 -57
- data/lib/dapp/config/directive/mount.rb +0 -26
- data/lib/dapp/config/directive/shell/artifact.rb +0 -17
- data/lib/dapp/config/directive/shell/dimg.rb +0 -65
- data/lib/dapp/dimg/path.rb +0 -37
- data/lib/dapp/dimg/stages.rb +0 -59
- data/lib/dapp/dimg/tags.rb +0 -65
- data/lib/dapp/docker_registry.rb +0 -36
- data/lib/dapp/docker_registry/base.rb +0 -109
- data/lib/dapp/docker_registry/default.rb +0 -18
- data/lib/dapp/docker_registry/mod/authorization.rb +0 -63
- data/lib/dapp/docker_registry/mod/request.rb +0 -32
- data/lib/dapp/error/build.rb +0 -6
- data/lib/dapp/error/config.rb +0 -6
- data/lib/dapp/error/dimg.rb +0 -6
- data/lib/dapp/error/image.rb +0 -6
- data/lib/dapp/error/project.rb +0 -6
- data/lib/dapp/error/registry.rb +0 -6
- data/lib/dapp/error/rugged.rb +0 -6
- data/lib/dapp/error/tar_writer.rb +0 -6
- data/lib/dapp/exception/introspect_image.rb +0 -6
- data/lib/dapp/exception/registry.rb +0 -6
- data/lib/dapp/filelock.rb +0 -43
- data/lib/dapp/git_artifact.rb +0 -241
- data/lib/dapp/git_repo/base.rb +0 -88
- data/lib/dapp/git_repo/own.rb +0 -38
- data/lib/dapp/git_repo/remote.rb +0 -49
- data/lib/dapp/image/argument.rb +0 -134
- data/lib/dapp/image/docker.rb +0 -115
- data/lib/dapp/image/scratch.rb +0 -32
- data/lib/dapp/image/stage.rb +0 -94
- data/lib/dapp/lock/base.rb +0 -51
- data/lib/dapp/lock/error.rb +0 -14
- data/lib/dapp/lock/file.rb +0 -45
- data/lib/dapp/project/command/bp.rb +0 -21
- data/lib/dapp/project/command/build.rb +0 -20
- data/lib/dapp/project/command/cleanup.rb +0 -24
- data/lib/dapp/project/command/common.rb +0 -96
- data/lib/dapp/project/command/list.rb +0 -20
- data/lib/dapp/project/command/mrproper.rb +0 -69
- data/lib/dapp/project/command/push.rb +0 -28
- data/lib/dapp/project/command/run.rb +0 -15
- data/lib/dapp/project/command/spush.rb +0 -18
- data/lib/dapp/project/command/stage_image.rb +0 -15
- data/lib/dapp/project/command/stages/cleanup_local.rb +0 -138
- data/lib/dapp/project/command/stages/cleanup_repo.rb +0 -125
- data/lib/dapp/project/command/stages/common.rb +0 -86
- data/lib/dapp/project/command/stages/flush_local.rb +0 -22
- data/lib/dapp/project/command/stages/flush_repo.rb +0 -22
- data/lib/dapp/project/command/stages/pull.rb +0 -27
- data/lib/dapp/project/command/stages/push.rb +0 -23
- data/lib/dapp/project/command/tag.rb +0 -18
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b271036c334fe79c99ce01ca4cf6c57eca96365e
|
4
|
+
data.tar.gz: 1a8ca762beb959623aef34758c8b161971e56127
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2464e9192669f2d8d8c21bd82e36a9c2e8aece267acd540092603a00c54990221200ff61cd321455f85dce1b36be95b30e2cc1a427fd90cc9bc1dfc4488f0793
|
7
|
+
data.tar.gz: 2b923fc112fdf5a35898c457186af28412a446822854bbc3e52a92441c9e2255b164f63a3462d4cb3b1b1db26b35dee5b1786c5ea02d1039c7b41579f3a8eda0
|
data/bin/dapp
CHANGED
@@ -8,11 +8,11 @@ require 'dapp'
|
|
8
8
|
def check_docker_version
|
9
9
|
required_docker_version = '1.10.0'
|
10
10
|
if Gem::Version.new(required_docker_version) >= Gem::Version.new(`docker --version`[/(\d+\.)+\d+/])
|
11
|
-
$stderr.puts(Dapp::
|
11
|
+
$stderr.puts(Dapp::Dapp.paint_string("Required docker version: >= #{required_docker_version}!", :warning))
|
12
12
|
exit 1
|
13
13
|
end
|
14
14
|
rescue Errno::ENOENT => e
|
15
|
-
$stderr.puts(Dapp::
|
15
|
+
$stderr.puts(Dapp::Dapp.paint_string(e.message, :warning))
|
16
16
|
exit 1
|
17
17
|
end
|
18
18
|
|
@@ -37,12 +37,12 @@ rescue Dapp::Error::Shellout => e
|
|
37
37
|
$stderr.puts(Dapp::Helper::NetStatus.message(e))
|
38
38
|
exit 1
|
39
39
|
rescue Dapp::Error::Base, NetStatus::Exception => e
|
40
|
-
$stderr.puts(Dapp::
|
40
|
+
$stderr.puts(Dapp::Dapp.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
|
41
41
|
exit 1
|
42
42
|
rescue Interrupt => _e
|
43
|
-
$stderr.puts(Dapp::
|
43
|
+
$stderr.puts(Dapp::Dapp.paint_string('Interrupted', :warning))
|
44
44
|
exit 1
|
45
45
|
rescue Errno::EACCES => _e
|
46
|
-
$stderr.puts(Dapp::
|
46
|
+
$stderr.puts(Dapp::Dapp.paint_string('Permission denied!', :warning))
|
47
47
|
exit 1
|
48
48
|
end
|
data/config/en/common.yml
CHANGED
@@ -22,6 +22,7 @@ en:
|
|
22
22
|
chefdk_container_creating: 'creating dappdeps/chefdk container'
|
23
23
|
image_pull: "pulling image `%{name}`"
|
24
24
|
image_push: "pushing image `%{name}`"
|
25
|
+
image_save: "saving image `%{name}`"
|
25
26
|
status:
|
26
27
|
process:
|
27
28
|
pushing: '[PUSHING]'
|
@@ -52,9 +53,10 @@ en:
|
|
52
53
|
dimg_not_found_in_registry: "WARNING: Dimg not found in registry."
|
53
54
|
stage_artifact_rewritten: "WARNING: Artifact stage rewritten from %{conflict_stage} to %{stage}."
|
54
55
|
recipe_does_not_used: "WARNING: Recipe `%{recipe}` doesn't used in any stage."
|
56
|
+
context_archive_not_found: "WARNING: context archive `%{path}` not found!"
|
55
57
|
group:
|
56
|
-
|
57
|
-
|
58
|
+
install: 'Install group'
|
59
|
+
setup: 'Setup group'
|
58
60
|
stage:
|
59
61
|
from: 'From'
|
60
62
|
import_artifact: 'Import Artifact'
|
@@ -62,7 +64,7 @@ en:
|
|
62
64
|
before_install_artifact: 'Before install artifact'
|
63
65
|
g_a_archive_dependencies: 'Git artifacts dependencies'
|
64
66
|
g_a_archive: 'Git artifacts: create archive'
|
65
|
-
|
67
|
+
install:
|
66
68
|
g_a_pre_install_patch_dependencies: 'Git artifacts dependencies'
|
67
69
|
g_a_pre_install_patch: 'Git artifacts: apply patches (before install)'
|
68
70
|
install: 'Install'
|
@@ -71,7 +73,7 @@ en:
|
|
71
73
|
after_install_artifact: 'After install artifact'
|
72
74
|
before_setup: 'Before setup'
|
73
75
|
before_setup_artifact: 'Before setup artifact'
|
74
|
-
|
76
|
+
setup:
|
75
77
|
g_a_pre_setup_patch_dependencies: 'Git artifacts dependencies'
|
76
78
|
g_a_pre_setup_patch: 'Git artifacts: apply patches (before setup)'
|
77
79
|
setup: 'Setup'
|
data/config/en/net_status.yml
CHANGED
@@ -18,16 +18,19 @@ en:
|
|
18
18
|
built_id_not_defined: '`from.built_id` not defined!'
|
19
19
|
from_image_not_found: 'Image `%{name}` not found!'
|
20
20
|
unsupported_patch_format: "Unsupported patch format:\n\n%{patch}"
|
21
|
-
|
21
|
+
command:
|
22
22
|
command_unexpected_dimgs_number: "Command can process only one dimg!\nAmbiguous dimg pattern: `%{dimgs_names}`!"
|
23
|
-
|
23
|
+
mrproper_required_option: "Expected command option `--improper-dev-mode-cache`, `--improper-cache-version-stages` or `--all`!"
|
24
|
+
stages_cleanup_required_option: "Expected command option `--improper-cache-version`, `--improper-git-commit` or `--improper-repo-cache`!"
|
24
25
|
tag_command_incorrect_tag: "Incorrect tag (`%{name}`) given!"
|
25
26
|
repo_name_incorrect: "Incorrect repo (`%{name}`) given!"
|
27
|
+
context_directory_not_found: "Context directory `%{path}` not found!"
|
28
|
+
stored_build_dir_already_exist: "Cannot store current build_dir `%{path}`: restore or delete old build_dir!"
|
29
|
+
dapp:
|
30
|
+
no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
|
26
31
|
dappfile_not_found: "Dappfile not found!"
|
27
32
|
cannot_run_ssh_agent: "Cannot run ssh-agent"
|
28
33
|
ssh_key_not_found: "Ssh key `%{path}` not exist!"
|
29
|
-
mrproper_required_option: "Expected command option `--improper-dev-mode-cache`, `--improper-cache-version-stages` or `--all`!"
|
30
|
-
stages_cleanup_required_option: "Expected command option `--improper-cache-version`, `--improper-git-commit` or `--improper-repo-cache`!"
|
31
34
|
config:
|
32
35
|
dimg_name_required: 'Dimg name required!'
|
33
36
|
dimg_name_incorrect: "Dimg has incorrect name `%{name}`: doesn't match regex `%{reg}`!"
|
@@ -36,6 +39,7 @@ en:
|
|
36
39
|
export_to_absolute_path_required: "Export: given `to` path must be absolute!"
|
37
40
|
export_include_paths_relative_path_required: "Export: given `include_paths` path must be relative!"
|
38
41
|
export_exclude_paths_relative_path_required: "Export: given `exclude_paths` path must be relative!"
|
42
|
+
stages_dependencies_paths_relative_path_required: "stage_dependencies: given dependencies for stage `%{stage}` must be relative!"
|
39
43
|
mount_from_absolute_path_required: "Mount: given `from` path must be absolute!"
|
40
44
|
mount_from_type_required: "Mount: `from` directive expect `build_dir` or `tmp_dir` type!"
|
41
45
|
builder_type_conflict: 'Conflict between builder types!'
|
@@ -54,9 +58,6 @@ en:
|
|
54
58
|
chef:
|
55
59
|
stage_path_overlap: "Cannot install `%{cookbook}` cookbook's path %{from} into %{to}: already exists"
|
56
60
|
builder_cookbook_not_found: "Dapp cookbook directory not found at %{path}"
|
57
|
-
builder_cookbook_berksfile_not_found: "Dapp local cookbook Berksfile not found at %{path}"
|
58
|
-
builder_cookbook_metadata_not_found: "Dapp local cookbook metadata.rb file not found at %{path}"
|
59
|
-
cookbook_not_specified_in_berksfile: "Dapp cookbook `%{name}` not specified in Berksfile at %{path}"
|
60
61
|
berksfile_absolute_path_forbidden: "Absolute paths in Berksfile are not allowed (cookbook `%{cookbook}`, path: `%{path}`)"
|
61
62
|
registry:
|
62
63
|
no_such_dimg: 'Registry `%{registry}`: no such dimg in registry!'
|
data/lib/dapp.rb
CHANGED
@@ -29,154 +29,172 @@ require 'dapp/helper/sha256'
|
|
29
29
|
require 'dapp/helper/net_status'
|
30
30
|
require 'dapp/prctl'
|
31
31
|
require 'dapp/error/base'
|
32
|
-
require 'dapp/error/
|
32
|
+
require 'dapp/error/dapp'
|
33
33
|
require 'dapp/error/dappfile'
|
34
|
-
require 'dapp/error/build'
|
35
|
-
require 'dapp/error/config'
|
36
|
-
require 'dapp/error/project'
|
37
34
|
require 'dapp/error/shellout'
|
38
|
-
require 'dapp/error/registry'
|
39
|
-
require 'dapp/error/rugged'
|
40
|
-
require 'dapp/error/tar_writer'
|
41
35
|
require 'dapp/exception/base'
|
42
|
-
require 'dapp/exception/introspect_image'
|
43
|
-
require 'dapp/exception/registry'
|
44
|
-
require 'dapp/lock/error'
|
45
|
-
require 'dapp/lock/base'
|
46
|
-
require 'dapp/lock/file'
|
47
36
|
require 'dapp/cli'
|
48
37
|
require 'dapp/cli/base'
|
49
|
-
require 'dapp/cli/build'
|
50
|
-
require 'dapp/cli/push'
|
51
|
-
require 'dapp/cli/spush'
|
52
|
-
require 'dapp/cli/tag'
|
53
|
-
require 'dapp/cli/list'
|
54
|
-
require 'dapp/cli/stages'
|
55
|
-
require 'dapp/cli/stages/flush_local'
|
56
|
-
require 'dapp/cli/stages/flush_repo'
|
57
|
-
require 'dapp/cli/stages/cleanup_local'
|
58
|
-
require 'dapp/cli/stages/cleanup_repo'
|
59
|
-
require 'dapp/cli/stages/push'
|
60
|
-
require 'dapp/cli/stages/pull'
|
61
|
-
require 'dapp/cli/run'
|
62
|
-
require 'dapp/cli/cleanup'
|
63
|
-
require 'dapp/cli/bp'
|
64
|
-
require 'dapp/cli/mrproper'
|
65
|
-
require 'dapp/cli/stage_image'
|
66
|
-
require 'dapp/filelock'
|
67
38
|
require 'dapp/config/base'
|
68
39
|
require 'dapp/config/directive/base'
|
69
|
-
require 'dapp/config/
|
70
|
-
require 'dapp/
|
71
|
-
require 'dapp/
|
72
|
-
require 'dapp/
|
73
|
-
require 'dapp/
|
74
|
-
require 'dapp/
|
75
|
-
require 'dapp/
|
76
|
-
require 'dapp/
|
77
|
-
require 'dapp/
|
78
|
-
require 'dapp/
|
79
|
-
require 'dapp/
|
80
|
-
require 'dapp/
|
81
|
-
require 'dapp/
|
82
|
-
require 'dapp/
|
83
|
-
require 'dapp/
|
84
|
-
require 'dapp/config/directive/docker/base'
|
85
|
-
require 'dapp/config/directive/docker/dimg'
|
86
|
-
require 'dapp/config/directive/docker/artifact'
|
87
|
-
require 'dapp/config/directive/mount'
|
88
|
-
require 'dapp/builder/base'
|
89
|
-
require 'dapp/builder/chef'
|
90
|
-
require 'dapp/builder/chef/error'
|
91
|
-
require 'dapp/builder/chef/cookbook_metadata'
|
92
|
-
require 'dapp/builder/chef/berksfile'
|
93
|
-
require 'dapp/builder/chef/cookbook'
|
94
|
-
require 'dapp/builder/shell'
|
95
|
-
require 'dapp/builder/none'
|
96
|
-
require 'dapp/build/stage/mod/logging'
|
97
|
-
require 'dapp/build/stage/mod/group'
|
98
|
-
require 'dapp/build/stage/base'
|
99
|
-
require 'dapp/build/stage/ga_base'
|
100
|
-
require 'dapp/build/stage/ga_dependencies_base'
|
101
|
-
require 'dapp/build/stage/artifact_base'
|
102
|
-
require 'dapp/build/stage/artifact_default'
|
103
|
-
require 'dapp/build/stage/from'
|
104
|
-
require 'dapp/build/stage/import_artifact'
|
105
|
-
require 'dapp/build/stage/before_install'
|
106
|
-
require 'dapp/build/stage/before_install_artifact'
|
107
|
-
require 'dapp/build/stage/ga_archive_dependencies'
|
108
|
-
require 'dapp/build/stage/ga_archive'
|
109
|
-
require 'dapp/build/stage/install/ga_pre_install_patch_dependencies'
|
110
|
-
require 'dapp/build/stage/install/ga_pre_install_patch'
|
111
|
-
require 'dapp/build/stage/install/install'
|
112
|
-
require 'dapp/build/stage/install/ga_post_install_patch_dependencies'
|
113
|
-
require 'dapp/build/stage/install/ga_post_install_patch'
|
114
|
-
require 'dapp/build/stage/after_install_artifact'
|
115
|
-
require 'dapp/build/stage/before_setup'
|
116
|
-
require 'dapp/build/stage/before_setup_artifact'
|
117
|
-
require 'dapp/build/stage/setup/ga_pre_setup_patch_dependencies'
|
118
|
-
require 'dapp/build/stage/setup/ga_pre_setup_patch'
|
119
|
-
require 'dapp/build/stage/setup/setup'
|
120
|
-
require 'dapp/build/stage/setup/ga_post_setup_patch_dependencies'
|
121
|
-
require 'dapp/build/stage/setup/ga_post_setup_patch'
|
122
|
-
require 'dapp/build/stage/after_setup_artifact'
|
123
|
-
require 'dapp/build/stage/ga_latest_patch'
|
124
|
-
require 'dapp/build/stage/docker_instructions'
|
125
|
-
require 'dapp/build/stage/ga_artifact_patch'
|
126
|
-
require 'dapp/build/stage/build_artifact'
|
127
|
-
require 'dapp/project/lock'
|
128
|
-
require 'dapp/project/ssh_agent'
|
129
|
-
require 'dapp/project/git_artifact'
|
130
|
-
require 'dapp/project/dappfile'
|
131
|
-
require 'dapp/project/chef'
|
132
|
-
require 'dapp/project/command/common'
|
133
|
-
require 'dapp/project/command/build'
|
134
|
-
require 'dapp/project/command/bp'
|
135
|
-
require 'dapp/project/command/cleanup'
|
136
|
-
require 'dapp/project/command/mrproper'
|
137
|
-
require 'dapp/project/command/stage_image'
|
138
|
-
require 'dapp/project/command/list'
|
139
|
-
require 'dapp/project/command/push'
|
140
|
-
require 'dapp/project/command/run'
|
141
|
-
require 'dapp/project/command/spush'
|
142
|
-
require 'dapp/project/command/tag'
|
143
|
-
require 'dapp/project/command/stages/common'
|
144
|
-
require 'dapp/project/command/stages/cleanup_local'
|
145
|
-
require 'dapp/project/command/stages/cleanup_repo'
|
146
|
-
require 'dapp/project/command/stages/flush_local'
|
147
|
-
require 'dapp/project/command/stages/flush_repo'
|
148
|
-
require 'dapp/project/command/stages/push'
|
149
|
-
require 'dapp/project/command/stages/pull'
|
150
|
-
require 'dapp/project/logging/base'
|
151
|
-
require 'dapp/project/logging/process'
|
152
|
-
require 'dapp/project/logging/paint'
|
153
|
-
require 'dapp/project/logging/i18n'
|
154
|
-
require 'dapp/project/deps/base'
|
155
|
-
require 'dapp/project/deps/gitartifact'
|
156
|
-
require 'dapp/project/shellout/streaming'
|
157
|
-
require 'dapp/project/shellout/base'
|
158
|
-
require 'dapp/project'
|
159
|
-
require 'dapp/docker_registry'
|
160
|
-
require 'dapp/docker_registry/mod/request'
|
161
|
-
require 'dapp/docker_registry/mod/authorization'
|
162
|
-
require 'dapp/docker_registry/base'
|
163
|
-
require 'dapp/docker_registry/default'
|
164
|
-
require 'dapp/dimg/git_artifact'
|
165
|
-
require 'dapp/dimg/path'
|
166
|
-
require 'dapp/dimg/tags'
|
167
|
-
require 'dapp/dimg/stages'
|
40
|
+
require 'dapp/config/error/config'
|
41
|
+
require 'dapp/dapp/lock'
|
42
|
+
require 'dapp/dapp/ssh_agent'
|
43
|
+
require 'dapp/dapp/git_artifact'
|
44
|
+
require 'dapp/dapp/dappfile'
|
45
|
+
require 'dapp/dapp/chef'
|
46
|
+
require 'dapp/dapp/logging/base'
|
47
|
+
require 'dapp/dapp/logging/process'
|
48
|
+
require 'dapp/dapp/logging/paint'
|
49
|
+
require 'dapp/dapp/logging/i18n'
|
50
|
+
require 'dapp/dapp/deps/base'
|
51
|
+
require 'dapp/dapp/deps/gitartifact'
|
52
|
+
require 'dapp/dapp/shellout/streaming'
|
53
|
+
require 'dapp/dapp/shellout/base'
|
54
|
+
require 'dapp/dapp'
|
168
55
|
require 'dapp/dimg'
|
169
|
-
require 'dapp/
|
170
|
-
require 'dapp/
|
171
|
-
require 'dapp/
|
172
|
-
require 'dapp/
|
173
|
-
require 'dapp/
|
174
|
-
require 'dapp/
|
175
|
-
require 'dapp/
|
176
|
-
require 'dapp/
|
177
|
-
require 'dapp/
|
56
|
+
require 'dapp/dimg/builder'
|
57
|
+
require 'dapp/dimg/builder/base'
|
58
|
+
require 'dapp/dimg/builder/chef'
|
59
|
+
require 'dapp/dimg/builder/chef/cookbook_metadata'
|
60
|
+
require 'dapp/dimg/builder/chef/berksfile'
|
61
|
+
require 'dapp/dimg/builder/chef/cookbook'
|
62
|
+
require 'dapp/dimg/builder/shell'
|
63
|
+
require 'dapp/dimg/builder/none'
|
64
|
+
require 'dapp/dimg/build/stage/mod/logging'
|
65
|
+
require 'dapp/dimg/build/stage/mod/group'
|
66
|
+
require 'dapp/dimg/build/stage/base'
|
67
|
+
require 'dapp/dimg/build/stage/ga_base'
|
68
|
+
require 'dapp/dimg/build/stage/ga_dependencies_base'
|
69
|
+
require 'dapp/dimg/build/stage/artifact_base'
|
70
|
+
require 'dapp/dimg/build/stage/artifact_default'
|
71
|
+
require 'dapp/dimg/build/stage/from'
|
72
|
+
require 'dapp/dimg/build/stage/import_artifact'
|
73
|
+
require 'dapp/dimg/build/stage/before_install'
|
74
|
+
require 'dapp/dimg/build/stage/before_install_artifact'
|
75
|
+
require 'dapp/dimg/build/stage/ga_archive_dependencies'
|
76
|
+
require 'dapp/dimg/build/stage/ga_archive'
|
77
|
+
require 'dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies'
|
78
|
+
require 'dapp/dimg/build/stage/install/ga_pre_install_patch'
|
79
|
+
require 'dapp/dimg/build/stage/install/install'
|
80
|
+
require 'dapp/dimg/build/stage/install/ga_post_install_patch_dependencies'
|
81
|
+
require 'dapp/dimg/build/stage/install/ga_post_install_patch'
|
82
|
+
require 'dapp/dimg/build/stage/after_install_artifact'
|
83
|
+
require 'dapp/dimg/build/stage/before_setup'
|
84
|
+
require 'dapp/dimg/build/stage/before_setup_artifact'
|
85
|
+
require 'dapp/dimg/build/stage/setup/ga_pre_setup_patch_dependencies'
|
86
|
+
require 'dapp/dimg/build/stage/setup/ga_pre_setup_patch'
|
87
|
+
require 'dapp/dimg/build/stage/setup/setup'
|
88
|
+
require 'dapp/dimg/build/stage/setup/ga_post_setup_patch_dependencies'
|
89
|
+
require 'dapp/dimg/build/stage/setup/ga_post_setup_patch'
|
90
|
+
require 'dapp/dimg/build/stage/after_setup_artifact'
|
91
|
+
require 'dapp/dimg/build/stage/ga_latest_patch'
|
92
|
+
require 'dapp/dimg/build/stage/docker_instructions'
|
93
|
+
require 'dapp/dimg/build/stage/ga_artifact_patch'
|
94
|
+
require 'dapp/dimg/build/stage/build_artifact'
|
95
|
+
require 'dapp/dimg/cli/base'
|
96
|
+
require 'dapp/dimg/cli/dimg'
|
97
|
+
require 'dapp/dimg/cli/build'
|
98
|
+
require 'dapp/dimg/cli/push'
|
99
|
+
require 'dapp/dimg/cli/spush'
|
100
|
+
require 'dapp/dimg/cli/tag'
|
101
|
+
require 'dapp/dimg/cli/list'
|
102
|
+
require 'dapp/dimg/cli/build_context'
|
103
|
+
require 'dapp/dimg/cli/build_context/export'
|
104
|
+
require 'dapp/dimg/cli/build_context/import'
|
105
|
+
require 'dapp/dimg/cli/stages'
|
106
|
+
require 'dapp/dimg/cli/stages/flush_local'
|
107
|
+
require 'dapp/dimg/cli/stages/flush_repo'
|
108
|
+
require 'dapp/dimg/cli/stages/cleanup_local'
|
109
|
+
require 'dapp/dimg/cli/stages/cleanup_repo'
|
110
|
+
require 'dapp/dimg/cli/stages/push'
|
111
|
+
require 'dapp/dimg/cli/stages/pull'
|
112
|
+
require 'dapp/dimg/cli/run'
|
113
|
+
require 'dapp/dimg/cli/cleanup'
|
114
|
+
require 'dapp/dimg/cli/bp'
|
115
|
+
require 'dapp/dimg/cli/mrproper'
|
116
|
+
require 'dapp/dimg/cli/stage_image'
|
117
|
+
require 'dapp/dimg/cli/cli'
|
118
|
+
require 'dapp/dimg/config/base'
|
119
|
+
require 'dapp/dimg/config/directive/base'
|
120
|
+
require 'dapp/dimg/config/dimg/instance_methods'
|
121
|
+
require 'dapp/dimg/config/dimg/validation'
|
122
|
+
require 'dapp/dimg/config/dimg'
|
123
|
+
require 'dapp/dimg/config/artifact_dimg'
|
124
|
+
require 'dapp/dimg/config/dimg_group_base'
|
125
|
+
require 'dapp/dimg/config/dimg_group_main'
|
126
|
+
require 'dapp/dimg/config/dimg_group'
|
127
|
+
require 'dapp/dimg/config/artifact_group'
|
128
|
+
require 'dapp/dimg/config/directive/artifact_base'
|
129
|
+
require 'dapp/dimg/config/directive/git_artifact_local'
|
130
|
+
require 'dapp/dimg/config/directive/git_artifact_remote'
|
131
|
+
require 'dapp/dimg/config/directive/artifact'
|
132
|
+
require 'dapp/dimg/config/directive/chef'
|
133
|
+
require 'dapp/dimg/config/directive/shell/dimg'
|
134
|
+
require 'dapp/dimg/config/directive/shell/artifact'
|
135
|
+
require 'dapp/dimg/config/directive/docker/base'
|
136
|
+
require 'dapp/dimg/config/directive/docker/dimg'
|
137
|
+
require 'dapp/dimg/config/directive/docker/artifact'
|
138
|
+
require 'dapp/dimg/config/directive/mount'
|
139
|
+
require 'dapp/dimg/dapp/command/common'
|
140
|
+
require 'dapp/dimg/dapp/command/build'
|
141
|
+
require 'dapp/dimg/dapp/command/bp'
|
142
|
+
require 'dapp/dimg/dapp/command/cleanup'
|
143
|
+
require 'dapp/dimg/dapp/command/mrproper'
|
144
|
+
require 'dapp/dimg/dapp/command/stage_image'
|
145
|
+
require 'dapp/dimg/dapp/command/list'
|
146
|
+
require 'dapp/dimg/dapp/command/push'
|
147
|
+
require 'dapp/dimg/dapp/command/run'
|
148
|
+
require 'dapp/dimg/dapp/command/spush'
|
149
|
+
require 'dapp/dimg/dapp/command/tag'
|
150
|
+
require 'dapp/dimg/dapp/command/stages/common'
|
151
|
+
require 'dapp/dimg/dapp/command/stages/cleanup_local'
|
152
|
+
require 'dapp/dimg/dapp/command/stages/cleanup_repo'
|
153
|
+
require 'dapp/dimg/dapp/command/stages/flush_local'
|
154
|
+
require 'dapp/dimg/dapp/command/stages/flush_repo'
|
155
|
+
require 'dapp/dimg/dapp/command/stages/push'
|
156
|
+
require 'dapp/dimg/dapp/command/stages/pull'
|
157
|
+
require 'dapp/dimg/dapp/command/build_context/export'
|
158
|
+
require 'dapp/dimg/dapp/command/build_context/import'
|
159
|
+
require 'dapp/dimg/dapp/command/build_context/common'
|
160
|
+
require 'dapp/dimg/dapp/command'
|
161
|
+
require 'dapp/dimg/docker_registry'
|
162
|
+
require 'dapp/dimg/docker_registry/base/request'
|
163
|
+
require 'dapp/dimg/docker_registry/base/authorization'
|
164
|
+
require 'dapp/dimg/docker_registry/base'
|
165
|
+
require 'dapp/dimg/docker_registry/default'
|
166
|
+
require 'dapp/dimg/error/base'
|
167
|
+
require 'dapp/dimg/error/dimg'
|
168
|
+
require 'dapp/dimg/error/build'
|
169
|
+
require 'dapp/dimg/error/tar_writer'
|
170
|
+
require 'dapp/dimg/error/rugged'
|
171
|
+
require 'dapp/dimg/error/registry'
|
172
|
+
require 'dapp/dimg/error/chef'
|
173
|
+
require 'dapp/dimg/error/shellout'
|
174
|
+
require 'dapp/dimg/error/lock'
|
175
|
+
require 'dapp/dimg/error/config'
|
176
|
+
require 'dapp/dimg/error/command'
|
177
|
+
require 'dapp/dimg/exception/base'
|
178
|
+
require 'dapp/dimg/exception/introspect_image'
|
179
|
+
require 'dapp/dimg/exception/registry'
|
180
|
+
require 'dapp/dimg/lock/base'
|
181
|
+
require 'dapp/dimg/lock/file'
|
182
|
+
require 'dapp/dimg/filelock'
|
183
|
+
require 'dapp/dimg/git_repo/base'
|
184
|
+
require 'dapp/dimg/git_repo/own'
|
185
|
+
require 'dapp/dimg/git_repo/remote'
|
186
|
+
require 'dapp/dimg/git_artifact'
|
187
|
+
require 'dapp/dimg/image/argument'
|
188
|
+
require 'dapp/dimg/image/docker'
|
189
|
+
require 'dapp/dimg/image/stage'
|
190
|
+
require 'dapp/dimg/image/scratch'
|
191
|
+
require 'dapp/dimg/dimg/git_artifact'
|
192
|
+
require 'dapp/dimg/dimg/path'
|
193
|
+
require 'dapp/dimg/dimg/tags'
|
194
|
+
require 'dapp/dimg/dimg/stages'
|
195
|
+
require 'dapp/dimg/dimg'
|
196
|
+
require 'dapp/dimg/artifact'
|
178
197
|
|
179
|
-
# Dapp
|
180
198
|
module Dapp
|
181
199
|
def self.root
|
182
200
|
File.expand_path('../..', __FILE__)
|
data/lib/dapp/cli.rb
CHANGED
@@ -1,28 +1,18 @@
|
|
1
1
|
module Dapp
|
2
|
-
# CLI
|
3
2
|
class CLI
|
4
|
-
extend Helper::Cli
|
5
3
|
include Mixlib::CLI
|
4
|
+
|
5
|
+
extend Helper::Cli
|
6
6
|
include Helper::Trivia
|
7
7
|
|
8
|
-
SUBCOMMANDS = ['
|
8
|
+
SUBCOMMANDS = ['dimg'].freeze
|
9
9
|
|
10
10
|
banner <<BANNER.freeze
|
11
11
|
Usage: dapp [options] sub-command [sub-command options]
|
12
12
|
|
13
13
|
Available subcommands: (for details, dapp SUB-COMMAND --help)
|
14
14
|
|
15
|
-
dapp
|
16
|
-
dapp bp [options] [DIMG ...] REPO
|
17
|
-
dapp push [options] [DIMG ...] REPO
|
18
|
-
dapp spush [options] [DIMG] REPO
|
19
|
-
dapp tag [options] [DIMG] TAG
|
20
|
-
dapp list [options] [DIMG ...]
|
21
|
-
dapp run [options] [DIMG] [DOCKER ARGS]
|
22
|
-
dapp cleanup [options] [DIMG ...]
|
23
|
-
dapp mrproper [options]
|
24
|
-
dapp stage image [options] [DIMG]
|
25
|
-
dapp stages
|
15
|
+
dapp dimg
|
26
16
|
|
27
17
|
Options:
|
28
18
|
BANNER
|
@@ -32,7 +22,7 @@ BANNER
|
|
32
22
|
description: 'Show version',
|
33
23
|
on: :tail,
|
34
24
|
boolean: true,
|
35
|
-
proc: proc { puts "dapp: #{Dapp::VERSION}" },
|
25
|
+
proc: proc { puts "dapp: #{::Dapp::VERSION}" },
|
36
26
|
exit: 0
|
37
27
|
|
38
28
|
option :help,
|
@@ -48,7 +38,7 @@ BANNER
|
|
48
38
|
super(*args)
|
49
39
|
|
50
40
|
opt_parser.program_name = 'dapp'
|
51
|
-
opt_parser.version = Dapp::VERSION
|
41
|
+
opt_parser.version = ::Dapp::VERSION
|
52
42
|
end
|
53
43
|
|
54
44
|
def run(argv = ARGV)
|