Compare commits

...

31 Commits

Author SHA1 Message Date
Robert Kaussow c9b8ea3c6a
chore: add deprecation notice 2023-01-15 21:58:39 +01:00
renovate[bot] 2c152cce3c chore(docker): update docker digests 2023-01-10 07:30:19 +00:00
Robert Kaussow 63baa5cc0d
ci: bump docker plugin to v20 (#76) 2023-01-08 15:44:10 +01:00
renovate[bot] e35e3f6208
chore(deps): update arm64v8/docker docker tag to v20 (#17) 2023-01-07 17:42:26 +01:00
renovate[bot] 9bef137ed6
chore(deps): update docker docker tag to v20 (#24) 2023-01-07 17:42:18 +01:00
Robert Kaussow fbc9427cda
chore: remove support for arm32 (#75) 2023-01-07 17:36:00 +01:00
Robert Kaussow 5303f6a5ca
docs: add example for custom registires (#74) 2022-12-21 10:49:07 +01:00
renovate[bot] dd6fc6ce42
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.2.1 (#73) 2022-12-21 08:45:23 +01:00
renovate[bot] dd65477400
fix(deps): update module github.com/urfave/cli/v2 to v2.23.7 (#72) 2022-12-20 21:06:38 +01:00
Robert Kaussow 5848ea5719
docs: fix properties file syntax due to changes in the theme (#71) 2022-11-24 15:09:19 +01:00
renovate[bot] 9b558675eb
fix(deps): update module github.com/urfave/cli/v2 to v2.23.5 (#69) 2022-11-24 09:45:56 +01:00
Robert Kaussow 81094ee3c5
ci: create symlink for xgo source directory (#70) 2022-11-24 09:43:43 +01:00
renovate[bot] 0e88134cab
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.2.0 (#68) 2022-10-31 19:59:29 +01:00
renovate[bot] d9a5ee9d4f
fix(deps): update module github.com/urfave/cli/v2 to v2.23.0 (#63) 2022-10-31 12:44:42 +01:00
renovate[bot] afe0ab1105 chore(deps): update dependency golangci/golangci-lint to v1.50.1 2022-10-24 04:56:18 +00:00
renovate[bot] c77d8d07b7 chore(deps): update dependency golangci/golangci-lint to v1.50.0 2022-10-10 04:57:50 +00:00
renovate[bot] 76e1cc61ec chore(deps): update dependency mvdan/gofumpt to v0.4.0 2022-10-03 04:28:36 +00:00
renovate[bot] 15da7b71db chore(deps): update dependency golangci/golangci-lint to v1.49.0 2022-08-29 05:46:08 +00:00
renovate[bot] afaaed742d chore(deps): update dependency golangci/golangci-lint to v1.48.0 2022-08-08 04:30:50 +00:00
renovate[bot] 3409c7c2ac
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.1.0 (#61) 2022-08-05 16:56:28 +02:00
renovate[bot] 17da5790a1
fix(deps): update module github.com/urfave/cli/v2 to v2.11.1 (#57) 2022-08-05 13:19:19 +02:00
Robert Kaussow 992117783a
chore: switch to go1.19 (#60) 2022-08-05 13:18:17 +02:00
renovate[bot] 7482633d35 chore(deps): update dependency golangci/golangci-lint to v1.47.2 2022-07-25 03:34:54 +00:00
renovate[bot] 59800776fc
fix(deps): update module github.com/sirupsen/logrus to v1.9.0 (#56) 2022-07-21 09:57:18 +02:00
Robert Kaussow d6219f41df
fix worind in readme and adjust repo config 2022-07-21 09:47:54 +02:00
Robert Kaussow 2932e7c616
ci: switch alpine-tools image 2022-07-17 20:45:22 +02:00
renovate[bot] f323347239
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.0.2 (#55) 2022-07-12 16:38:15 +02:00
Robert Kaussow 78691a84db
docs: fix spelling in readme 2022-07-12 09:12:30 +02:00
renovate[bot] ce9cd29b46
fix(deps): update module github.com/urfave/cli/v2 to v2.11.0 (#54) 2022-07-11 08:51:26 +02:00
renovate[bot] 64c662d7c0
fix(deps): update module github.com/thegeeklab/drone-plugin-lib/v2 to v2.0.1 (#53) 2022-06-20 21:04:08 +02:00
renovate[bot] 9450ca4416
fix(deps): update module github.com/urfave/cli/v2 to v2.10.1 (#52) 2022-06-20 10:26:14 +02:00
17 changed files with 128 additions and 203 deletions

View File

@ -10,3 +10,4 @@ json
config
host:ip
multiarch
DockerHub

View File

@ -8,7 +8,7 @@ local PipelineTest = {
steps: [
{
name: 'deps',
image: 'golang:1.18',
image: 'golang:1.19',
commands: [
'make deps',
],
@ -21,7 +21,7 @@ local PipelineTest = {
},
{
name: 'lint',
image: 'golang:1.18',
image: 'golang:1.19',
commands: [
'make lint',
],
@ -34,7 +34,7 @@ local PipelineTest = {
},
{
name: 'test',
image: 'golang:1.18',
image: 'golang:1.19',
commands: [
'make test',
],
@ -68,8 +68,9 @@ local PipelineBuildBinaries = {
steps: [
{
name: 'build',
image: 'techknowlogick/xgo:go-1.18.x',
image: 'techknowlogick/xgo:go-1.19.x',
commands: [
'ln -s /drone/src /source',
'make release',
],
},
@ -133,14 +134,14 @@ local PipelineBuildContainer(arch='amd64') = {
steps: [
{
name: 'build',
image: 'golang:1.18',
image: 'golang:1.19',
commands: [
'make build',
],
},
{
name: 'dryrun',
image: 'thegeeklab/drone-docker:19',
image: 'thegeeklab/drone-docker:20',
settings: {
dry_run: true,
dockerfile: 'docker/Dockerfile.' + arch,
@ -153,7 +154,7 @@ local PipelineBuildContainer(arch='amd64') = {
},
{
name: 'publish-dockerhub',
image: 'thegeeklab/drone-docker:19',
image: 'thegeeklab/drone-docker:20',
settings: {
auto_tag: true,
auto_tag_suffix: arch,
@ -169,7 +170,7 @@ local PipelineBuildContainer(arch='amd64') = {
},
{
name: 'publish-quay',
image: 'thegeeklab/drone-docker:19',
image: 'thegeeklab/drone-docker:20',
settings: {
auto_tag: true,
auto_tag_suffix: arch,
@ -213,9 +214,8 @@ local PipelineDocs = {
},
{
name: 'spellcheck',
image: 'node:lts-alpine',
image: 'thegeeklab/alpine-tools',
commands: [
'npm install -g spellchecker-cli',
"spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions",
],
environment: {
@ -241,7 +241,6 @@ local PipelineDocs = {
'build-binaries',
'build-container-amd64',
'build-container-arm64',
'build-container-arm',
],
trigger: {
ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
@ -345,7 +344,6 @@ local PipelineNotifications = {
PipelineBuildBinaries,
PipelineBuildContainer(arch='amd64'),
PipelineBuildContainer(arch='arm64'),
PipelineBuildContainer(arch='arm'),
PipelineDocs,
PipelineNotifications,
]

View File

@ -8,7 +8,7 @@ platform:
steps:
- name: deps
image: golang:1.18
image: golang:1.19
commands:
- make deps
volumes:
@ -16,7 +16,7 @@ steps:
path: /go
- name: lint
image: golang:1.18
image: golang:1.19
commands:
- make lint
volumes:
@ -24,7 +24,7 @@ steps:
path: /go
- name: test
image: golang:1.18
image: golang:1.19
commands:
- make test
volumes:
@ -51,8 +51,9 @@ platform:
steps:
- name: build
image: techknowlogick/xgo:go-1.18.x
image: techknowlogick/xgo:go-1.19.x
commands:
- ln -s /drone/src /source
- make release
- name: executable
@ -105,12 +106,12 @@ platform:
steps:
- name: build
image: golang:1.18
image: golang:1.19
commands:
- make build
- name: dryrun
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
dockerfile: docker/Dockerfile.amd64
dry_run: true
@ -122,7 +123,7 @@ steps:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
auto_tag: true
auto_tag_suffix: amd64
@ -140,7 +141,7 @@ steps:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
auto_tag: true
auto_tag_suffix: amd64
@ -177,12 +178,12 @@ platform:
steps:
- name: build
image: golang:1.18
image: golang:1.19
commands:
- make build
- name: dryrun
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
dockerfile: docker/Dockerfile.arm64
dry_run: true
@ -194,7 +195,7 @@ steps:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
auto_tag: true
auto_tag_suffix: arm64
@ -212,7 +213,7 @@ steps:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker:19
image: thegeeklab/drone-docker:20
settings:
auto_tag: true
auto_tag_suffix: arm64
@ -239,78 +240,6 @@ trigger:
depends_on:
- test
---
kind: pipeline
name: build-container-arm
platform:
os: linux
arch: arm
steps:
- name: build
image: golang:1.18
commands:
- make build
- name: dryrun
image: thegeeklab/drone-docker:19
settings:
dockerfile: docker/Dockerfile.arm
dry_run: true
repo: thegeeklab/${DRONE_REPO_NAME}
when:
ref:
- refs/pull/**
depends_on:
- build
- name: publish-dockerhub
image: thegeeklab/drone-docker:19
settings:
auto_tag: true
auto_tag_suffix: arm
dockerfile: docker/Dockerfile.arm
password:
from_secret: docker_password
repo: thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: docker_username
when:
ref:
- refs/heads/main
- refs/tags/**
depends_on:
- dryrun
- name: publish-quay
image: thegeeklab/drone-docker:19
settings:
auto_tag: true
auto_tag_suffix: arm
dockerfile: docker/Dockerfile.arm
password:
from_secret: quay_password
registry: quay.io
repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
username:
from_secret: quay_username
when:
ref:
- refs/heads/main
- refs/tags/**
depends_on:
- dryrun
trigger:
ref:
- refs/heads/main
- refs/tags/**
- refs/pull/**
depends_on:
- test
---
kind: pipeline
name: docs
@ -329,9 +258,8 @@ steps:
- markdownlint 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md'
- name: spellcheck
image: node:lts-alpine
image: thegeeklab/alpine-tools
commands:
- npm install -g spellchecker-cli
- spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions
environment:
FORCE_COLOR: true
@ -360,7 +288,6 @@ depends_on:
- build-binaries
- build-container-amd64
- build-container-arm64
- build-container-arm
---
kind: pipeline
@ -454,6 +381,6 @@ depends_on:
---
kind: signature
hmac: 9272f58ad1c23c3d09fe6d4c61d4f6343c9fc70229826a55c45179182b6e5f49
hmac: 2678272f471334df973c0b9c0e8886dcf0941f5581b460b116fb48c88e7a14ba
...

View File

@ -52,14 +52,17 @@ branches:
strict: false
contexts:
- continuous-integration/drone/pr
enforce_admins: null
enforce_admins: true
required_linear_history: true
restrictions: null
- name: docs
protection:
required_pull_request_reviews: null
required_status_checks: null
enforce_admins: true
required_linear_history: true
restrictions:
apps: []
users: []
teams:
- bot

View File

@ -1,7 +1,7 @@
# renovate: datasource=github-releases depName=mvdan/gofumpt
GOFUMPT_PACKAGE_VERSION := v0.3.1
GOFUMPT_PACKAGE_VERSION := v0.4.0
# renovate: datasource=github-releases depName=golangci/golangci-lint
GOLANGCI_LINT_PACKAGE_VERSION := v1.46.2
GOLANGCI_LINT_PACKAGE_VERSION := v1.50.1
EXECUTABLE := drone-docker
@ -19,8 +19,8 @@ GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(G
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
GENERATE ?=
XGO_VERSION := go-1.18.x
XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64
XGO_VERSION := go-1.19.x
XGO_TARGETS ?= linux/amd64,linux/arm64
TAGS ?= netgo

View File

@ -1,5 +1,7 @@
# drone-docker
> DISCONTINUED: This image is no longer maintained and will be removed in the future.
Drone plugin to build multiarch Docker images
[![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-docker?logo=drone&server=https%3A%2F%2Fdrone.thegeeklab.de)](https://drone.thegeeklab.de/thegeeklab/drone-docker)
@ -10,15 +12,15 @@ Drone plugin to build multiarch Docker images
[![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/drone-docker)
[![License: Apache-2.0](https://img.shields.io/github/license/thegeeklab/drone-docker)](https://github.com/thegeeklab/drone-docker/blob/main/LICENSE)
Drone plugin to build multiarch Docker images. This plugin is a fork of [drone-plugins/drone-docker](https://github.com/drone-plugins/drone-docker). You can find the full documentation at You can find the full documentation at [https://drone-plugin-index.geekdocs.de](https://drone-plugin-index.geekdocs.de/plugins/drone-docker).
Drone plugin to build multiarch Docker images. This plugin is a fork of [drone-plugins/drone-docker](https://github.com/drone-plugins/drone-docker). You can find the full documentation at [https://drone-plugin-index.geekdocs.de](https://drone-plugin-index.geekdocs.de/plugins/drone-docker).
## Versioning
The tags follow the major version of Docker, e.g. `19`, the minor and patch part reflects the "version" of the plugin. A full example would be `19.6.5`. Minor versions may introduce breaking changes, while patch versions may be considered non-breaking.
The tags follow the major version of Docker, e.g. `19`, and the minor and patch parts reflect the `version` of the plugin. A full example would be `19.6.5`. Minor versions can introduce breaking changes, while patch versions can be considered non-breaking.
## Contributors
Special thanks goes to all [contributors](https://github.com/thegeeklab/drone-docker/graphs/contributors). If you would like to contribute, please see the [instructions](https://github.com/thegeeklab/drone-docker/blob/main/CONTRIBUTING.md).
Special thanks to all [contributors](https://github.com/thegeeklab/drone-docker/graphs/contributors). If you would like to contribute, please see the [instructions](https://github.com/thegeeklab/drone-docker/blob/main/CONTRIBUTING.md).
## License

View File

@ -19,7 +19,7 @@ Drone plugin to build and publish multiarch Docker images.
## Versioning
The tags follow the major version of Docker, e.g. `19`, the minor and patch part reflects the "version" of the plugin. A full example would be `19.6.5`. Minor versions may introduce breaking changes, while patch versions may be considered non-breaking.
The tags follow the major version of Docker, e.g. `19`, and the minor and patch parts reflect the `version` of the plugin. A full example would be `19.6.5`. Minor versions can introduce breaking changes, while patch versions can be considered non-breaking.
## Usage
@ -46,10 +46,32 @@ steps:
<!-- prettier-ignore-start -->
<!-- spellchecker-disable -->
{{< propertylist name=drone-docker.data >}}
{{< propertylist name=drone-docker.data sort=name >}}
<!-- spellchecker-enable -->
<!-- prettier-ignore-end -->
### Examples
**Push to other registries than DockerHub:**
If the created image is to be pushed to registries other than the default DockerHub, it is necessary to set `registry` and `repo` as fully-qualified name.
```YAML
kind: pipeline
name: default
steps:
- name: docker
image: thegeeklab/drone-docker
privileged: true
settings:
registry: ghcr.io
username: octocat
password: secret-access-token
repo: ghcr.io/octocat/example
tags: latest
```
## Build
Build the binary with the following command:

View File

@ -1,95 +1,95 @@
---
properties:
dry_run:
- name: dry_run
description: Disable docker push.
type: bool
required: false
mirror:
- name: mirror
description: Use a registry mirror to pull images.
type: string
required: false
storage_driver:
- name: storage_driver
description: The docker daemon storage driver.
type: string
required: false
storage_path:
- name: storage_path
description: The docker daemon storage path.
defaultValue: /var/lib/docker
type: string
required: false
bip:
- name: bip
description: Allows the docker daemon to bride IP address.
type: string
required: false
mtu:
- name: mtu
description: A docker daemon custom MTU.
type: string
required: false
custom_dns:
- name: custom_dns
description: Custom docker daemon DNS server.
type: list
required: false
custom_dns_search:
- name: custom_dns_search
description: Custom docker daemon DNS search domain.
type: list
required: false
insecure:
- name: insecure
description: Enable the usage of insecure registries.
type: bool
defaultValue: false
required: false
ipv6:
- name: ipv6
description: Enable docker daemon IPv6 support.
type: bool
defaultValue: false
required: false
experimental:
- name: experimental
description: Enable docker daemon experimental mode.
type: bool
defaultValue: false
required: false
daemon_debug:
- name: daemon_debug
description: Enable verbose debug mode for the docker daemon.
type: string
defaultValue: false
required: false
daemon_off:
- name: daemon_off
description: Disable the startup of the docker daemon.
type: string
defaultValue: false
required: false
dockerfile:
- name: dockerfile
description: Set dockerfile to use for the image build.
defaultValue: Dockerfile
type: string
required: false
context:
- name: context
description: Set the path of the build context to use.
defaultValue: .
type: string
required: false
tags:
- name: tags
description: Set repository tags to use for the image. Tags can also be loaded from a `.tags` file.
defaultValue: latest
type: list
required: false
auto_tag:
- name: auto_tag
description: |
Generate tag names automatically based on git branch and git tag. When this feature is enabled and the event type is `tag`,
the plugin will automatically tag the image using the standard semVer convention. For example:
@ -103,93 +103,95 @@ properties:
type: bool
required: false
auto_tag_suffix:
- name: auto_tag_suffix
description: Generate tag names with the given suffix.
type: string
required: false
build_args:
- name: build_args
description: Ccustom build arguments to pass to the build.
type: list
required: false
build_args_from_env:
- name: build_args_from_env
description: Forward environment variables as custom arguments to the build.
type: list
required: false
quiet:
- name: quiet
description: Enable suppression of the build output.
defaultValue: false
type: bool
required: false
target:
- name: target
description: The docker build target.
type: string
required: false
cache_from:
- name: cache_from
description: Images to consider as cache sources.
type: list
required: false
pull_image:
- name: pull_image
description: Enforce to pull the base image at build time.
defaultValue: true
type: bool
required: false
compress:
- name: compress
description: Enable compression of the build context using gzip.
defaultValue: false
type: bool
required: false
repo:
description: Repository name for the image.
- name: repo
description: |
Repository name for the image. If the image is to be pushed to registries other than the default DockerHub,
it is necessary to set `repo` as fully-qualified name.
type: string
required: false
registry:
- name: registry
description: Docker registry to upload images.
defaultValue: https://index.docker.io/v1/
type: string
required: false
username:
- name: username
description: Username for authentication with the registry.
type: string
required: false
password:
- name: password
description: Password for authentication with the registry.
type: string
required: false
email:
- name: email
description: E-Mail address for authentication with the registry.
type: string
required: false
config:
- name: config
description: Content of the docker daemon json config.
type: string
required: false
purge:
- name: purge
description: Enable cleanup of the docker environment at the end of a build.
defaultValue: true
type: bool
required: false
no_cache:
- name: no_cache
description: Disable the usage of cached intermediate containers.
defaultValue: false
type: string
required: false
add_host:
- name: add_host
description: Additional `host:ip` mapping.
type: list
required: false

View File

@ -1,4 +1,4 @@
FROM amd64/docker:19.03-dind@sha256:1875a3437d87a2fa8ec5e6fcd3233a98d571fa9692516b1e7d8eb18b7dca87a4
FROM amd64/docker:20.10-dind@sha256:56a2d342dd7f25fd604f71513f765526bd522f3c256bead83b6d30c5a8006fa6
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"

View File

@ -1,23 +0,0 @@
FROM arm32v7/docker:19.03-dind@sha256:f998921d365053bf7e3f98794f6c23ca44e6809832d78105bc4d2da6bb8521ed
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.title="drone-docker"
LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-docker"
LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-docker"
LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-docker"
ENV DOCKER_HOST=unix:///var/run/docker.sock
RUN apk --update add --virtual .build-deps curl && \
mkdir -p /etc/docker/ && \
curl -SsL -o /etc/docker/default.json https://raw.githubusercontent.com/moby/moby/19.03/profiles/seccomp/default.json && \
sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /etc/docker/default.json && \
chmod 600 /etc/docker/default.json && \
apk del .build-deps && \
rm -rf /var/cache/apk/* && \
rm -rf /tmp/*
ADD dist/drone-docker /bin/
ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "drone-docker"]

View File

@ -1,4 +1,4 @@
FROM arm64v8/docker:19.03-dind@sha256:81f35202223dcd33991fcb0e12d287f854dfb63b0b47e0c805ed87c0dfc4c9b3
FROM arm64v8/docker:20.10-dind@sha256:26c7da097331ba685a7314fcfc0eb608b86b4074bab5e1beaeb57d744c5c060a
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"

View File

@ -16,9 +16,3 @@ manifests:
architecture: arm64
os: linux
variant: v8
- image: quay.io/thegeeklab/drone-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
platform:
architecture: arm
os: linux
variant: v7

View File

@ -16,9 +16,3 @@ manifests:
architecture: arm64
os: linux
variant: v8
- image: thegeeklab/drone-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
platform:
architecture: arm
os: linux
variant: v7

11
go.mod
View File

@ -1,18 +1,19 @@
module github.com/thegeeklab/drone-docker
go 1.18
go 1.19
require (
github.com/coreos/go-semver v0.3.0
github.com/joho/godotenv v1.4.0
github.com/sirupsen/logrus v1.8.1
github.com/thegeeklab/drone-plugin-lib/v2 v2.0.0
github.com/urfave/cli/v2 v2.8.1
github.com/sirupsen/logrus v1.9.0
github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1
github.com/urfave/cli/v2 v2.23.7
)
require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

27
go.sum
View File

@ -2,6 +2,7 @@ github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmf
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
@ -10,17 +11,21 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/thegeeklab/drone-plugin-lib/v2 v2.0.0 h1:ejM1fIkGhn9sy7HTidRiQhZJuEfUNF6sO9ko090PYvM=
github.com/thegeeklab/drone-plugin-lib/v2 v2.0.0/go.mod h1:cXNc+dmGLA748rAnXVBsTFG1UO+A/0XlV5jUEf/ahgk=
github.com/urfave/cli/v2 v2.8.1 h1:CGuYNZF9IKZY/rfBe3lJpccSoIY1ytfvmgQT90cNOl4=
github.com/urfave/cli/v2 v2.8.1/go.mod h1:Z41J9TPoffeoqP0Iza0YbAhGvymRdZAd2uPmZ5JxRdY=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1 h1:fta32M+y6aHG/BX+Kwxo9DQAcYpTyCBHn7sAm2qjfL0=
github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1/go.mod h1:Bu++VS6GXEWCHQdzR65dPsGtBGOMuqAQPiRVBaa+HrY=
github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY=
github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

View File

@ -1,7 +1,7 @@
package plugin
import (
"io/ioutil"
"io"
"os"
)
@ -17,8 +17,8 @@ func (p Plugin) startDaemon() {
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
} else {
cmd.Stdout = ioutil.Discard
cmd.Stderr = ioutil.Discard
cmd.Stdout = io.Discard
cmd.Stderr = io.Discard
}
go func() {
trace(cmd)

View File

@ -2,7 +2,6 @@ package plugin
import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
@ -129,7 +128,7 @@ func (p *Plugin) Execute() error {
}
path := filepath.Join(dockerHome, "config.json")
err := ioutil.WriteFile(path, []byte(p.settings.Login.Config), 0o600)
err := os.WriteFile(path, []byte(p.settings.Login.Config), 0o600)
if err != nil {
return fmt.Errorf("error writing config.json: %s", err)
}