Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d48980e85b | |||
| 80d3fcc40b | |||
| 2e92706ead | |||
| d4fa9db432 | |||
| a28559777f | |||
| f6531627d4 | |||
| 535215833d | |||
| 666b09ad3b | |||
| c4a1243af9 | |||
| 305d0d2da0 | |||
| 9af9b70f3e | |||
| e4605d990d | |||
| 768697157c | |||
| d3086da139 | |||
| 95894e8047 | |||
| 81de55fedd | |||
| 84827b8782 | |||
| fa38af5d81 | |||
| 1b82b450d7 | |||
| b78d804881 | |||
| 51b72c12f9 | |||
| 58c04bdbe3 | |||
| a6320d5222 | |||
| cb4b4a43e6 | |||
| 1e5a1d5bdd | |||
| 5ed0d21c39 | |||
| 2972dbeafb |
@@ -4,7 +4,6 @@ about: Create a bug report
|
|||||||
title: ''
|
title: ''
|
||||||
labels: bug/need-confirmation, kind/bug
|
labels: bug/need-confirmation, kind/bug
|
||||||
assignees: ''
|
assignees: ''
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ about: Ask us a question about Portainer usage or deployment
|
|||||||
title: ''
|
title: ''
|
||||||
labels: ''
|
labels: ''
|
||||||
assignees: ''
|
assignees: ''
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
Before you start, we need a little bit more information from you:
|
Before you start, we need a little bit more information from you:
|
||||||
|
|
||||||
Use Case (delete as appropriate): Using Portainer at Home, Using Portainer in a Commerical setup.
|
Use Case (delete as appropriate): Using Portainer at Home, Using Portainer in a Commerical setup.
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
<div style="margin: 15px;">
|
<div style="margin: 15px;">
|
||||||
<span class="btn btn-primary btn-sm" ng-click="$ctrl.copyYAML()"><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy to clipboard</span>
|
<span class="btn btn-primary btn-sm" ng-click="$ctrl.copyYAML()"><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy to clipboard</span>
|
||||||
<span class="btn btn-primary btn-sm space-left" ng-click="$ctrl.toggleYAMLInspectorExpansion()">
|
<span class="btn btn-primary btn-sm space-left" ng-click="$ctrl.toggleYAMLInspectorExpansion()">
|
||||||
<i class="fa fa-{{ $ctrl.expanded ? 'minus' : 'plus' }} space-right" aria-hidden="true"></i>{{ $ctrl.expanded ? 'Collapse' : 'Expand' }}</span>
|
<i class="fa fa-{{ $ctrl.expanded ? 'minus' : 'plus' }} space-right" aria-hidden="true"></i>{{ $ctrl.expanded ? 'Collapse' : 'Expand' }}</span
|
||||||
|
>
|
||||||
<span id="copyNotificationYAML" style="margin-left: 7px; display: none; color: #23ae89;" class="small"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
|
<span id="copyNotificationYAML" style="margin-left: 7px; display: none; color: #23ae89;" class="small"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+4
-4
@@ -191,7 +191,7 @@ function shell_download_docker_binary(p, a) {
|
|||||||
var ip = ps[p] === undefined ? p : ps[p];
|
var ip = ps[p] === undefined ? p : ps[p];
|
||||||
var ia = as[a] === undefined ? a : as[a];
|
var ia = as[a] === undefined ? a : as[a];
|
||||||
var binaryVersion = p === 'windows' ? '<%= binaries.dockerWindowsVersion %>' : '<%= binaries.dockerLinuxVersion %>';
|
var binaryVersion = p === 'windows' ? '<%= binaries.dockerWindowsVersion %>' : '<%= binaries.dockerLinuxVersion %>';
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'if [ -f dist/docker ] || [ -f dist/docker.exe ]; then',
|
'if [ -f dist/docker ] || [ -f dist/docker.exe ]; then',
|
||||||
'echo "docker binary exists";',
|
'echo "docker binary exists";',
|
||||||
@@ -207,7 +207,7 @@ function shell_download_docker_compose_binary(p, a) {
|
|||||||
var ip = ps[p] || p;
|
var ip = ps[p] || p;
|
||||||
var ia = as[a] || a;
|
var ia = as[a] || a;
|
||||||
var binaryVersion = p === 'windows' ? '<%= binaries.dockerWindowsComposeVersion %>' : '<%= binaries.dockerLinuxComposeVersion %>';
|
var binaryVersion = p === 'windows' ? '<%= binaries.dockerWindowsComposeVersion %>' : '<%= binaries.dockerLinuxComposeVersion %>';
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'if [ -f dist/docker-compose ] || [ -f dist/docker-compose.exe ]; then',
|
'if [ -f dist/docker-compose ] || [ -f dist/docker-compose.exe ]; then',
|
||||||
'echo "Docker Compose binary exists";',
|
'echo "Docker Compose binary exists";',
|
||||||
@@ -219,7 +219,7 @@ function shell_download_docker_compose_binary(p, a) {
|
|||||||
|
|
||||||
function shell_download_kompose_binary(p, a) {
|
function shell_download_kompose_binary(p, a) {
|
||||||
var binaryVersion = '<%= binaries.komposeVersion %>';
|
var binaryVersion = '<%= binaries.komposeVersion %>';
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'if [ -f dist/kompose ] || [ -f dist/kompose.exe ]; then',
|
'if [ -f dist/kompose ] || [ -f dist/kompose.exe ]; then',
|
||||||
'echo "kompose binary exists";',
|
'echo "kompose binary exists";',
|
||||||
@@ -231,7 +231,7 @@ function shell_download_kompose_binary(p, a) {
|
|||||||
|
|
||||||
function shell_download_kubectl_binary(p, a) {
|
function shell_download_kubectl_binary(p, a) {
|
||||||
var binaryVersion = '<%= binaries.kubectlVersion %>';
|
var binaryVersion = '<%= binaries.kubectlVersion %>';
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'if [ -f dist/kubectl ] || [ -f dist/kubectl.exe ]; then',
|
'if [ -f dist/kubectl ] || [ -f dist/kubectl.exe ]; then',
|
||||||
'echo "kubectl binary exists";',
|
'echo "kubectl binary exists";',
|
||||||
|
|||||||
Reference in New Issue
Block a user