takeltau 0.46.5 → 0.46.8

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2fa413fce38decec349a0a54d57c156761d0f0c4ac7d11ec1720473bcca29185
4
- data.tar.gz: 5384d0bb2fb3170a7d97690d74336e5cc12844c2c6495e59a77d057e2427b16f
3
+ metadata.gz: 9fe37e7329840c9723abde222442ab252059232cc423a733acc3f03c7abbbe74
4
+ data.tar.gz: d1e143df8a89722c8f4c889acc2ac56e90747e49fdce87b81cafabd423787574
5
5
  SHA512:
6
- metadata.gz: 679be9d7716ec65b590cc9898a14e10192ecf47e7586edc5b5ff5610196ad86933187686f59d02d51cdaee3c78fa66b8d06c00c9de92773d79748967b9c30e29
7
- data.tar.gz: a76c4d7283a1ac1d6162c0e955c9c3ce48d91c014c3e6e2a108c443e6affc9407368b02d44f8896989a9b0f544c4458995cc6a79e0582d57fb28f015e48cf27f
6
+ metadata.gz: 81c6dd6e2594f48b89ff3d2fd0a97faffe5d22e5a2339a4778a2554822a3ce720e3cd4c619740d82dde0404b95b5362d1b892cdf602df138568369c23d321c1f
7
+ data.tar.gz: 1aee73d5985734da480edfbebd9358abe3ed46396f5e54954eb308b91d7d6fb723aba9ae4a814aded45d321ab17bedfbe9c566b1e7c3deb87b2148635fc56fbb
@@ -100,6 +100,7 @@ ship_podman_localhost: '127.0.0.1'
100
100
  ship_repo: 'takelship'
101
101
  ship_run_args_nonprivileged: ''
102
102
  ship_run_args_privileged: ''
103
+ ship_run_args_teamcity: '--volume /opt/buildagent/plugins:/opt/buildagent/plugins --volume /opt/buildagent/system:/opt/buildagent/system --volume /opt/buildagent/work:/opt/buildagent/work --volume /opt/buildagent/temp:/opt/buildagent/temp --volume /opt/buildagent/tools:/opt/buildagent/tools'
103
104
  ship_tag: 'latest'
104
105
  ship_takelship_yml: '%{pwd}/%{ship_data_dir}/compose/takelship.yml'
105
106
  ship_update: true
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  # tau ship project start
4
+ # rubocop:disable Metrics/AbcSize
4
5
  module ShipProjectStart
5
6
  # Start a takelship
6
7
  def ship_project_start(project, mute: false)
@@ -22,7 +23,7 @@ module ShipProjectStart
22
23
  _ship_ports_lib_write_ports(ports, project)
23
24
 
24
25
  log.debug "Starting takelship project \"#{project}\""
25
- args = project == 'teamcity' ? '--volume /opt/buildagent:/opt/buildagent' : ''
26
+ args = _ship_project_start_get_args project
26
27
  ship_status = _ship_container_lib_docker_privileged ports, project, args: args
27
28
  return false unless _ship_container_lib_started?(ship_status, mute)
28
29
 
@@ -31,6 +32,7 @@ module ShipProjectStart
31
32
  _ship_project_start_print_ports ports
32
33
  true
33
34
  end
35
+ # rubocop:enable Metrics/AbcSize
34
36
 
35
37
  private
36
38
 
@@ -89,6 +91,13 @@ module ShipProjectStart
89
91
  say
90
92
  end
91
93
 
94
+ # get additional volume arguments for the teamcity project
95
+ def _ship_project_start_get_args(project)
96
+ return '' unless project == 'teamcity'
97
+
98
+ config.active['ship_run_args_teamcity']
99
+ end
100
+
92
101
  # get a sortable list of port numbers and strings describing the ports
93
102
  def _ship_project_start_get_ports_list(ports, max_length)
94
103
  ports_list = []
data/lib/takeltau/version CHANGED
@@ -1 +1 @@
1
- 0.46.5
1
+ 0.46.8
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: takeltau
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.46.5
4
+ version: 0.46.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Takelwerk