Compare commits
3 Commits
10a286b345
...
d94a6f262e
Author | SHA1 | Date |
---|---|---|
elee | d94a6f262e | |
elee | 2518c42f31 | |
elee | 1c0071281b |
|
@ -61,7 +61,7 @@ local task_build_push_images(name, target, push) =
|
||||||
* file not found errors when doing COPY commands.
|
* file not found errors when doing COPY commands.
|
||||||
* Workaround this buy putting all files inside /kaniko
|
* Workaround this buy putting all files inside /kaniko
|
||||||
*/
|
*/
|
||||||
local options = if !push then '--no-push' else '--destination sorintlab/%s:$AGOLA_GIT_TAG' % [target];
|
local options = if !push then '--no-push' else '--destination $DOCKERURL/tux/%s:$AGOLA_GIT_TAG' % [target];
|
||||||
{
|
{
|
||||||
name: name,
|
name: name,
|
||||||
runtime: {
|
runtime: {
|
||||||
|
@ -73,7 +73,8 @@ local task_build_push_images(name, target, push) =
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
environment: {
|
environment: {
|
||||||
DOCKERAUTH: { from_variable: 'dockerauth' },
|
DOCKERAUTH: { from_variable: 'harbor-auth' },
|
||||||
|
DOCKERURL: { from_variable: 'harbor-url' },
|
||||||
},
|
},
|
||||||
shell: '/busybox/sh',
|
shell: '/busybox/sh',
|
||||||
working_dir: '/kaniko',
|
working_dir: '/kaniko',
|
||||||
|
@ -87,14 +88,14 @@ local task_build_push_images(name, target, push) =
|
||||||
cat << EOF > /kaniko/.docker/config.json
|
cat << EOF > /kaniko/.docker/config.json
|
||||||
{
|
{
|
||||||
"auths": {
|
"auths": {
|
||||||
"https://index.docker.io/v1/": { "auth" : "$DOCKERAUTH" }
|
"$DOCKERURL": { "auth" : "$DOCKERAUTH" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|||,
|
|||,
|
||||||
},
|
},
|
||||||
]) + [
|
]) + [
|
||||||
{ type: 'run', command: '/kaniko/executor --context=dir:///kaniko/agola --build-arg AGOLAWEB_IMAGE=sorintlab/agola-web:v0.6.0 --target %s %s' % [target, options] },
|
{ type: 'run', command: '/kaniko/executor --context=dir:///kaniko/agola --build-arg AGOLAWEB_IMAGE=harbor.tuxpa.in/tux/agola-web:v0.6.1 --target %s %s' % [target, options] },
|
||||||
],
|
],
|
||||||
depends: ['checkout code and save to workspace', 'integration tests', 'test docker driver'],
|
depends: ['checkout code and save to workspace', 'integration tests', 'test docker driver'],
|
||||||
};
|
};
|
||||||
|
@ -107,7 +108,7 @@ local task_build_push_images(name, target, push) =
|
||||||
[
|
[
|
||||||
task_build_go(version, arch),
|
task_build_go(version, arch),
|
||||||
]
|
]
|
||||||
for version in ['1.15', '1.16']
|
for version in ['1.16']
|
||||||
for arch in ['amd64' /*, 'arm64' */]
|
for arch in ['amd64' /*, 'arm64' */]
|
||||||
]) + [
|
]) + [
|
||||||
{
|
{
|
||||||
|
|
|
@ -314,6 +314,7 @@ func (c *Client) listUserRepos(fromOptions gitlab.ListProjectsOptions) ([]*gitso
|
||||||
}
|
}
|
||||||
if pageResp.TotalPages != 0 {
|
if pageResp.TotalPages != 0 {
|
||||||
if pageResp.TotalPages >= pageResp.CurrentPage {
|
if pageResp.TotalPages >= pageResp.CurrentPage {
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue