vidar 1.9.0 → 1.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/Gemfile.lock +2 -2
- data/README.md +0 -10
- data/lib/vidar/cli.rb +15 -4
- data/lib/vidar/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 275f65747a60ad6ad3e5598cf903fbe9a0ebe789e1c44b439191287f1d1f7bb6
|
|
4
|
+
data.tar.gz: 729e0e0ff95bfa27fb89b6807931119e409926127795b3a56e0e23279463124d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 33690ec3566ce4fb78cfb55fe176375a2b75215aaaf01214ecfce3319ed406c4a9d91a36b02c15ca32a14cfe7415026761e5371dc9b43e60e735cb9fef05dbcb
|
|
7
|
+
data.tar.gz: 3763d95df379a0e36972621092fcd9eb713ca8d07a840e56644042dafd0d6e0db4308c70a608033f3e3abc5b2cf6fb53b69625e38e41892d040f9f2c722082c5
|
data/CHANGELOG.md
CHANGED
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
vidar (1.9.
|
|
4
|
+
vidar (1.9.2)
|
|
5
5
|
colorize
|
|
6
6
|
faraday
|
|
7
7
|
thor (~> 1.0)
|
|
@@ -54,7 +54,7 @@ GEM
|
|
|
54
54
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
55
55
|
rspec-support (~> 3.12.0)
|
|
56
56
|
rspec-support (3.12.1)
|
|
57
|
-
rubocop (1.
|
|
57
|
+
rubocop (1.59.0)
|
|
58
58
|
json (~> 2.3)
|
|
59
59
|
language_server-protocol (>= 3.17.0)
|
|
60
60
|
parallel (~> 1.10)
|
data/README.md
CHANGED
|
@@ -37,11 +37,6 @@ services:
|
|
|
37
37
|
dockerfile: Dockerfile
|
|
38
38
|
context: .
|
|
39
39
|
target: base
|
|
40
|
-
cache_from:
|
|
41
|
-
- [docker-registry-url]:base-master
|
|
42
|
-
- [docker-registry-url]:base
|
|
43
|
-
- [docker-registry-url]:release
|
|
44
|
-
- [docker-registry-url]:$REVISION
|
|
45
40
|
env_file:
|
|
46
41
|
- .env
|
|
47
42
|
environment:
|
|
@@ -55,11 +50,6 @@ services:
|
|
|
55
50
|
target: release
|
|
56
51
|
args:
|
|
57
52
|
- REVISION=${REVISION:?err}
|
|
58
|
-
cache_from:
|
|
59
|
-
- [docker-registry-url]:base-${CURRENT_BRANCH:?err}
|
|
60
|
-
- [docker-registry-url]:base-master
|
|
61
|
-
- [docker-registry-url]:base
|
|
62
|
-
- [docker-registry-url]:$REVISION
|
|
63
53
|
```
|
|
64
54
|
|
|
65
55
|
* `vidar.yml` file to the project root directory, which following content:
|
data/lib/vidar/cli.rb
CHANGED
|
@@ -22,14 +22,25 @@ module Vidar
|
|
|
22
22
|
desc "pull", "Pull existing docker images to leverage docker caching"
|
|
23
23
|
def pull
|
|
24
24
|
Log.info "Pulling #{Config.get!(:image)} tags"
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
if Config.default_branch?
|
|
26
|
+
Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}} 2> /dev/null || true"
|
|
27
27
|
Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:default_branch)} 2> /dev/null || true"
|
|
28
|
+
else
|
|
29
|
+
Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)} 2> /dev/null || true"
|
|
28
30
|
end
|
|
29
31
|
Log.info "Docker images:"
|
|
30
32
|
Run.docker("images")
|
|
31
33
|
end
|
|
32
34
|
|
|
35
|
+
desc "build_and_cache_base", "Build and caches base stage"
|
|
36
|
+
def build_and_cache_base
|
|
37
|
+
Log.info "Building #{Config.get!(:base_stage_name)} image"
|
|
38
|
+
Run.docker_compose "build #{Config.get!(:base_stage_name)}"
|
|
39
|
+
|
|
40
|
+
Log.info "Publishing #{Config.get!(:base_stage_name)} image"
|
|
41
|
+
Run.docker "push #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)}"
|
|
42
|
+
end
|
|
43
|
+
|
|
33
44
|
desc "build", "Build docker stages"
|
|
34
45
|
def build
|
|
35
46
|
Log.info "Building #{Config.get!(:base_stage_name)} image"
|
|
@@ -122,8 +133,8 @@ module Vidar
|
|
|
122
133
|
def release
|
|
123
134
|
Log.info "Build and release #{Config.get!(:image)}:#{Config.get!(:revision)}"
|
|
124
135
|
pull
|
|
125
|
-
|
|
126
|
-
|
|
136
|
+
Log.info "Building #{Config.get!(:release_stage_name)} image"
|
|
137
|
+
Run.docker_compose "build #{Config.get!(:release_stage_name)}"
|
|
127
138
|
publish
|
|
128
139
|
end
|
|
129
140
|
|
data/lib/vidar/version.rb
CHANGED