container
/
molecule
1
0
Fork 0
Code Issues 1 Pull Requests Releases 92 Activity

fix some naming errors
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Robert Kaussow 2019-03-18 14:49:39 +01:00
parent 22571374e2
commit 1ee5b8aea6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.drone.jsonnet
View File

@ -1,8 +1,9 @@
local PipelineBuild(os='linux', arch='amd64', version='gce') = { local PipelineBuild(os='linux', arch='amd64', version='gce') = {
local tag = version + '-' + os + '-' + arch, local tag = os + '-' + arch,
local file_suffix = std.strReplace(tag, '-', '.'), local version_tag = version + '-' + os + '-' + arch,
local file_suffix = std.strReplace(version_tag, '-', '.'),
kind: "pipeline", kind: "pipeline",
name: tag, name: version_tag,
platform: { platform: {
os: os, os: os,
arch: arch, arch: arch,
@ -14,7 +15,7 @@ local PipelineBuild(os='linux', arch='amd64', version='gce') = {
pull: 'always', pull: 'always',
settings: { settings: {
dry_run: true, dry_run: true,
tags: tag, tags: version_tag,
dockerfile: 'docker/Dockerfile.' + file_suffix, dockerfile: 'docker/Dockerfile.' + file_suffix,
repo: ' xoxys/molecule', repo: ' xoxys/molecule',
username: { from_secret: "docker_username" }, username: { from_secret: "docker_username" },
@ -27,7 +28,7 @@ local PipelineBuild(os='linux', arch='amd64', version='gce') = {
pull: 'always', pull: 'always',
settings: { settings: {
auto_tag: true, auto_tag: true,
auto_tag_suffix: tag, auto_tag_suffix: version_tag,
dockerfile: 'docker/Dockerfile.' + file_suffix, dockerfile: 'docker/Dockerfile.' + file_suffix,
repo: ' xoxys/molecule', repo: ' xoxys/molecule',
username: { from_secret: "docker_username" }, username: { from_secret: "docker_username" },
@ -95,6 +96,6 @@ local PipelineNotifications(depends_on=[]) = {
[ [
PipelineBuild(os='linux', arch='amd64', version='gce'), PipelineBuild(os='linux', arch='amd64', version='gce'),
PipelineNotifications(depends_on=[ PipelineNotifications(depends_on=[
"linux-amd64" "gce-linux-amd64"
]) ])
] ]

6
.drone.yml
View File

@ -9,7 +9,7 @@ platform:
steps: steps:
- name: dryrun - name: dryrun
pull: always pull: always
image: plugins/docker:gce-linux-amd64 image: plugins/docker:linux-amd64
settings: settings:
dockerfile: docker/Dockerfile.gce.linux.amd64 dockerfile: docker/Dockerfile.gce.linux.amd64
dry_run: true dry_run: true
@ -22,7 +22,7 @@ steps:
- name: publish - name: publish
pull: always pull: always
image: plugins/docker:gce-linux-amd64 image: plugins/docker:linux-amd64
settings: settings:
auto_tag: true auto_tag: true
auto_tag_suffix: gce-linux-amd64 auto_tag_suffix: gce-linux-amd64
@ -88,6 +88,6 @@ trigger:
- failure - failure
depends_on: depends_on:
- linux-amd64 - gce-linux-amd64
... ...