Skip to content

Commit 2b07add

Browse files
Feat: Docker build config api modification (#1240)
* added registry type in docker min listing api * fix
1 parent 55d85ed commit 2b07add

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

internal/sql/repository/DockerArtifactStoreRepository.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (impl DockerArtifactStoreRepositoryImpl) FindAllActiveForAutocomplete() ([]
104104
var providers []DockerArtifactStore
105105
err := impl.dbConnection.Model(&providers).
106106
Where("active = ?", true).
107-
Column("id", "registry_url", "is_default").
107+
Column("id", "registry_url", "registry_type", "is_default").
108108
Select()
109109
return providers, err
110110
}
@@ -154,10 +154,10 @@ func (impl DockerArtifactStoreRepositoryImpl) Delete(storeId string) error {
154154
return impl.dbConnection.Delete(artifactStore)
155155
}
156156

157-
func (impl DockerArtifactStoreRepositoryImpl) MarkRegistryDeleted(deleteReq *DockerArtifactStore) error{
157+
func (impl DockerArtifactStoreRepositoryImpl) MarkRegistryDeleted(deleteReq *DockerArtifactStore) error {
158158
if deleteReq.IsDefault {
159159
return errors.New("default registry can't be deleted")
160160
}
161161
deleteReq.Active = false
162162
return impl.dbConnection.Update(deleteReq)
163-
}
163+
}

pkg/pipeline/DockerRegistryConfig.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,10 @@ func (impl DockerRegistryConfigImpl) ListAllActive() ([]DockerArtifactStoreBean,
112112
var storeBeans []DockerArtifactStoreBean
113113
for _, store := range stores {
114114
storeBean := DockerArtifactStoreBean{
115-
Id: store.Id,
116-
RegistryURL: store.RegistryURL,
117-
IsDefault: store.IsDefault,
115+
Id: store.Id,
116+
RegistryURL: store.RegistryURL,
117+
IsDefault: store.IsDefault,
118+
RegistryType: store.RegistryType,
118119
}
119120
storeBeans = append(storeBeans, storeBean)
120121
}

0 commit comments

Comments
 (0)