Skip to content

Commit bd04ae3

Browse files
authored
Merge pull request kubero-dev#7 from kubero-dev/feature/remove-docker-from-pipeline
add gogs logo, remove docker from pipeline
2 parents 15d19e0 + 7e2f44e commit bd04ae3

File tree

2 files changed

+25
-59
lines changed

2 files changed

+25
-59
lines changed

client/public/img/icons/gogs.svg

+1
Loading

client/src/components/pipelines/new.vue

+24-59
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,13 @@
3535
<v-tab href="#gitea" :disabled="this.repositoriesList.gitea == false">Gitea <v-icon class="gitea"></v-icon></v-tab>
3636
<v-tab href="#gitlab" :disabled="this.repositoriesList.gitlab == false">Gitlab <v-icon>mdi-gitlab</v-icon></v-tab>
3737
<v-tab href="#bitbucket" disabled>oneDev <v-icon class="onedev"></v-icon></v-tab>
38+
<v-tab href="#gogs" disabled>Gogs <v-icon class="gogs"></v-icon></v-tab>
3839
<v-tab href="#bitbucket" disabled>Bitbucket <v-icon>mdi-bitbucket</v-icon></v-tab>
39-
<v-tab href="#docker" :disabled="this.repositoriesList.gitlab == false">Docker <v-icon>mdi-docker</v-icon></v-tab>
4040
</v-tabs>
4141
</v-col>
4242
</v-row>
4343

44-
<v-row
45-
v-if="repotab && repotab=='docker'">
46-
<v-col
47-
cols="12"
48-
md="6"
49-
>
50-
<v-text-field
51-
v-model="dockerimage"
52-
:rules="imageRules"
53-
:counter="60"
54-
label="Image"
55-
required
56-
></v-text-field>
57-
</v-col>
58-
</v-row>
59-
60-
<v-row
61-
v-if="repotab && repotab!='docker'">
44+
<v-row>
6245
<v-col
6346
cols="12"
6447
md="6"
@@ -168,8 +151,9 @@
168151
elevation="2"
169152
@click="saveForm()"
170153
:disabled="!valid
171-
|| (repotab=='docker' && !dockerimage)
172-
|| (repotab!='docker' && !gitrepo)"
154+
|| !gitrepo
155+
|| !repository_status.connected
156+
|| !buildpack"
173157
>Sumbit</v-btn>
174158
</v-col>
175159
</v-row>
@@ -183,9 +167,7 @@ export default {
183167
data: () => ({
184168
repotab: 'github', //selected tab
185169
buildpack: undefined,
186-
buildpackList: [
187-
"Docker",
188-
],
170+
buildpackList: [],
189171
valid: false, // final form validation
190172
pipelineName: '',
191173
reviewapps: true,
@@ -194,8 +176,6 @@ export default {
194176
gitrepo: '',
195177
/*gitrepoItems: ['[email protected]:johnpapa/node-hello.git', '[email protected]:kubero-dev/template-nodeapp.git'],*/
196178
gitrepoItems: [],
197-
/*dockerimage: 'ghcr.io/kubero-dev/template-nodeapp', // docker image to pull from*/
198-
dockerimage: '',
199179
contextList: [], // a list of kubernets contexts in the kubeconfig to select from
200180
repositoriesList: { // a list of available repositories to connect with
201181
github: false,
@@ -339,32 +319,6 @@ export default {
339319
this.repositoriesList.docker = false;
340320
break;
341321
*/
342-
case 'docker':
343-
this.repositoriesList.github = false;
344-
this.repositoriesList.gitea = false;
345-
this.repositoriesList.gitlab = false;
346-
this.repositoriesList.bitbucket = false;
347-
this.repositoriesList.docker = true;
348-
this.buildpack = {
349-
name: "Docker",
350-
language: "unknown",
351-
repositories: {
352-
fetch: {
353-
image: "ghcr.io/kubero-dev/docker-images/base",
354-
tag: "main"
355-
},
356-
build: {
357-
image: "node",
358-
tag: "latest"
359-
},
360-
run: {
361-
image: "node",
362-
tag: "latest"
363-
}
364-
}
365-
}
366-
this.repository_status.connected = true;
367-
break;
368322
default:
369323
break;
370324
}
@@ -427,20 +381,15 @@ export default {
427381
});
428382
},
429383
saveForm() {
430-
let deploymentstrategy = "git"
431-
432-
if (this.repotab == 'docker') {
433-
deploymentstrategy = "docker"
434-
}
435384
436385
axios.post(`/api/pipelines`, {
437386
pipelineName: this.pipelineName,
438387
gitrepo: this.gitrepo,
439388
phases: this.phases,
440389
reviewapps: this.reviewapps,
441390
git: this.git,
442-
dockerimage: this.dockerimage,
443-
deploymentstrategy: deploymentstrategy,
391+
dockerimage: '',
392+
deploymentstrategy: "git",
444393
buildpack: this.buildpack,
445394
})
446395
.then(response => {
@@ -461,6 +410,22 @@ export default {
461410
color: white !important;
462411
}
463412
413+
.gogs{
414+
background-image: url('./../../../public/img/icons/gogs.svg');
415+
background-size: contain;
416+
background-repeat: no-repeat;
417+
filter: invert(39%) sepia(47%) saturate(584%) hue-rotate(228deg) brightness(95%) contrast(80%);
418+
/*filter: invert(93%) sepia(49%) saturate(7411%) hue-rotate(184deg) brightness(87%) contrast(90%);*/
419+
}
420+
421+
.gogs::before {
422+
height: 23px;
423+
width: 23px;
424+
visibility: hidden;
425+
content: "";
426+
}
427+
428+
464429
.onedev{
465430
background-image: url('./../../../public/img/icons/onedev.svg');
466431
background-size: contain;

0 commit comments

Comments
 (0)