From 44513f1a8bd733b2795905669d6f7b2ba81f4d6b Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 22 Feb 2019 13:59:16 -0800 Subject: [PATCH] adding the terminal containers to landing page --- .gitlab-ci.yml | 18 ------------------ public/index.html | 3 +++ public/js/gateway.js | 9 +++++++++ 3 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 4952ecb..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -image: docker:latest - -services: - - docker:dind - -stages: - - build - -job1: - tags: - - docker - stage: build - script: - - docker build -t taisun/gateway:$CI_BUILD_REF . - - docker tag taisun/gateway:$CI_BUILD_REF taisun/gateway:latest - - echo $DOCKERPASS | docker login -u taisun --password-stdin - - docker push taisun/gateway:$CI_BUILD_REF - - docker push taisun/gateway:latest diff --git a/public/index.html b/public/index.html index 06b060d..13104eb 100644 --- a/public/index.html +++ b/public/index.html @@ -16,6 +16,9 @@

Stacks:

VDI:


+

Terminals:

+
+

Development:


diff --git a/public/js/gateway.js b/public/js/gateway.js index d5a7040..7e56110 100644 --- a/public/js/gateway.js +++ b/public/js/gateway.js @@ -25,6 +25,15 @@ $( document ).ready(function() { \ '); } + else if (labels.stacktype && container.State == 'running' && labels.stacktype == 'terminal'){ + var linkurl = window.location.href.replace('taisun-gateway', 'user:' + pass + '@' + taisunport) + '/terminal/' + container.Id; + $('#term').append('\ +
\ +
\ +

'+ labels.stackname + '

\ +
\ + '); + } else if (labels.devport && container.State == 'running'){ var linkurl = window.location.href.replace('taisun-gateway', 'user:' + pass + '@' + labels.devport); $('#dev').append('\