Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes required for Configuration As Code (and plugin install) #136

Closed
wants to merge 37 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a4e6e3f
I like my desktop notifications
Jul 2, 2018
09a9687
Additional state checking
Jul 2, 2018
2becb1c
Merge branch 'patch-3' into mymerge
Jul 13, 2018
1005c8a
New componenets
Aug 3, 2018
b2a5967
Changes.
Aug 3, 2018
54f4ac7
Next
Aug 3, 2018
7f4a30f
Which test for aws added... Tests for awscli.
Aug 24, 2018
5313c77
Lets try this.
Aug 24, 2018
a1d04ba
Deploys okay
Aug 24, 2018
3dd0f5d
Insertation fix
Aug 26, 2018
c454026
Better delete handle logic
Aug 27, 2018
72d3e20
Stack deleted
Aug 27, 2018
aac8633
Watch_notify now takes into account deleting too
Aug 27, 2018
708e7f8
Manual revert
Aug 27, 2018
ad9cc6c
Break not exit 0
Aug 27, 2018
bb308c6
Break not exit 0
Aug 27, 2018
ab4f5ab
Added 'a'
Aug 27, 2018
7e8ce5d
Path change
Aug 27, 2018
f225f49
Overlay
Aug 27, 2018
3efbc4a
Overlay url fix
Aug 27, 2018
f6c860c
URL fix, better doesn't mess with overlay
Aug 27, 2018
b915ef4
Better mesage
Aug 27, 2018
85e5f2b
My mistake
Aug 27, 2018
dc46d03
I have to remove this, as Configuration As Code can load in plugins, …
Sep 7, 2018
7d7f49c
Configuration as code refresh to configuration-as-code-support-1.0-rc…
Sep 11, 2018
62cf332
1.0RC1
Sep 12, 2018
5ba7b8c
Plugin generation. CAC now in repo no need to bundle into ciinabox-ecs.
Sep 21, 2018
4e76eb9
Fixed var init
Sep 21, 2018
8f5974f
Suppress whitespaces
Sep 21, 2018
9b84155
Generation script
Sep 26, 2018
3d839b3
Indent
Sep 26, 2018
e8bccc3
Should be break
Sep 26, 2018
18366a7
Corrected file names x2
Sep 26, 2018
765757e
Don't require a restart
Sep 26, 2018
16bc195
get correct IP address
Sep 26, 2018
63c6d16
One liner mode
Sep 26, 2018
562f8f0
Removal of a couple of unnecessary output
Oct 4, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Insertation fix
Arran Ubels committed Aug 26, 2018
commit 3dd0f5da7aa14dca8fc686d9a600f0c4fdc74c60
20 changes: 8 additions & 12 deletions templates/services/jenkins.rb
Original file line number Diff line number Diff line change
@@ -104,6 +104,14 @@
}
]

# If docker outside of docker slave is enabled
if has_cac
container_definitions[0][:Environment] << {
Name: 'SRCTAR',
Value: cac_tar_url(source_bucket, ciinabox_version),
}
end

# If docker in docker slave is enabled
if defined? include_diind_slave and include_diind_slave
container_definitions[0][:Links] << 'jenkins-docker-dind-slave'
@@ -135,18 +143,6 @@

end

# If docker outside of docker slave is enabled
if has_cac
jenkins_env = {
:Environment => []
}
jenkins_env[:Environment] << {
Name: 'SRCTAR',
Value: cac_tar_url(source_bucket, ciinabox_version),
}
container_definitions << jenkins_env
end

# If docker outside of docker slave is enabled
if defined? include_dood_slave and include_dood_slave
container_definitions[0][:Links] << 'jenkins-docker-dood-slave'