github/wp-docker-buildx
0
0
Fork 0
mirror of https://github.com/thegeeklab/wp-docker-buildx.git synced 2024-11-24 12:50:41 +00:00
Code Issues Releases Activity

refactor: rename parameter dockerfile to containerfile

Browse Source
This commit is contained in:
Robert Kaussow 2023-08-14 09:39:28 +02:00
parent 829d5cc6e9
commit fdf9b22e08
Signed by: xoxys
GPG Key ID: 4E692A2EAECC03C0
9 changed files with 68 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dictionary
View File

@ -6,7 +6,7 @@ ipv6
buildkit buildkit
json json
config config
dockerfile containerfile
og og
gzip gzip
toml toml

26
.github/settings.yml vendored
View File

@ -43,3 +43,29 @@ labels:
- name: wontfix - name: wontfix
color: ffffff color: ffffff
description: This will not be worked on description: This will not be worked on
branches:
- name: main
protection:
required_pull_request_reviews: null
required_status_checks:
strict: false
contexts:
- ci/woodpecker/pr/test
- ci/woodpecker/pr/build-binary
- ci/woodpecker/pr/build-container
- ci/woodpecker/pr/docs
enforce_admins: false
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

6
.woodpecker/build-container.yml
View File

@ -9,7 +9,7 @@ steps:
dryrun: dryrun:
image: quay.io/thegeeklab/drone-docker-buildx:latest image: quay.io/thegeeklab/drone-docker-buildx:latest
settings: settings:
dockerfile: Dockerfile.multiarch containerfile: Containerfile.multiarch
dry_run: true dry_run: true
platforms: platforms:
- linux/amd64 - linux/amd64
@ -24,7 +24,7 @@ steps:
image: quay.io/thegeeklab/drone-docker-buildx:latest image: quay.io/thegeeklab/drone-docker-buildx:latest
settings: settings:
auto_tag: true auto_tag: true
dockerfile: Dockerfile.multiarch containerfile: Containerfile.multiarch
password: password:
from_secret: docker_password from_secret: docker_password
platforms: platforms:
@ -45,7 +45,7 @@ steps:
image: quay.io/thegeeklab/drone-docker-buildx:latest image: quay.io/thegeeklab/drone-docker-buildx:latest
settings: settings:
auto_tag: true auto_tag: true
dockerfile: Dockerfile.multiarch containerfile: Containerfile.multiarch
password: password:
from_secret: quay_password from_secret: quay_password
platforms: platforms:

0
Dockerfile.multiarch → Containerfile.multiarch
View File

11
_docs/content/_index.md
View File

@ -100,18 +100,13 @@ steps:
Build the binary with the following command: Build the binary with the following command:
```shell ```shell
export GOOS=linux
export GOARCH=amd64
export CGO_ENABLED=0
export GO111MODULE=on
make build make build
``` ```
Build the Docker image with the following command: Build the Docker image with the following command:
```shell ```shell
docker build --file docker/Dockerfile.amd64 --tag thegeeklab/wp-docker-buildx . docker build --file docker/Containerfile.multiarch --tag thegeeklab/wp-docker-buildx .
``` ```
## Test ## Test
@ -121,8 +116,8 @@ docker run --rm \
-e PLUGIN_TAG=latest \ -e PLUGIN_TAG=latest \
-e PLUGIN_REPO=octocat/hello-world \ -e PLUGIN_REPO=octocat/hello-world \
-e CI_COMMIT_SHA=00000000 \ -e CI_COMMIT_SHA=00000000 \
-v $(pwd):$(pwd) \ -v $(pwd):/build:z \
-w $(pwd) \ -w /build \
--privileged \ --privileged \
thegeeklab/wp-docker-buildx --dry-run thegeeklab/wp-docker-buildx --dry-run
``` ```

6
_docs/data/data.yaml
View File

@ -90,9 +90,9 @@ properties:
defaultValue: false defaultValue: false
required: false required: false
- name: dockerfile - name: containerfile
description: Set dockerfile to use for the image build. description: Set the containerfile to use for the image build.
defaultValue: Dockerfile defaultValue: Containerfile
type: string type: string
required: false required: false

10
cmd/wp-docker-buildx/config.go
View File

@ -116,11 +116,11 @@ func settingsFlags(settings *plugin.Settings, category string) []cli.Flag {
Category: category, Category: category,
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "dockerfile", Name: "containerfile",
EnvVars: []string{"PLUGIN_DOCKERFILE"}, EnvVars: []string{"PLUGIN_CONTAINERFILE"},
Usage: "dockerfile to use for the image build", Usage: "containerfile to use for the image build",
Value: "Dockerfile", Value: "Containerfile",
Destination: &settings.Build.Dockerfile, Destination: &settings.Build.Containerfile,
Category: category, Category: category,
}, },
&cli.StringFlag{ &cli.StringFlag{

2
plugin/docker.go
View File

@ -76,7 +76,7 @@ func commandBuild(build Build, dryrun bool) *execabs.Cmd {
"buildx", "buildx",
"build", "build",
"--rm=true", "--rm=true",
"-f", build.Dockerfile, "-f", build.Containerfile,
} }
defaultBuildArgs := []string{ defaultBuildArgs := []string{

52
plugin/plugin.go
View File

@ -48,32 +48,32 @@ type Login struct {
// Build defines Docker build parameters. // Build defines Docker build parameters.
type Build struct { type Build struct {
Ref string // Git commit ref Ref string // Git commit ref
Branch string // Git repository branch Branch string // Git repository branch
Dockerfile string // Docker build Dockerfile Containerfile string // Docker build Containerfile
Context string // Docker build context Context string // Docker build context
TagsAuto bool // Docker build auto tag TagsAuto bool // Docker build auto tag
TagsSuffix string // Docker build tags with suffix TagsSuffix string // Docker build tags with suffix
Tags cli.StringSlice // Docker build tags Tags cli.StringSlice // Docker build tags
ExtraTags cli.StringSlice // Docker build tags including registry ExtraTags cli.StringSlice // Docker build tags including registry
Platforms cli.StringSlice // Docker build target platforms Platforms cli.StringSlice // Docker build target platforms
Args cli.StringSlice // Docker build args Args cli.StringSlice // Docker build args
ArgsEnv cli.StringSlice // Docker build args from env ArgsEnv cli.StringSlice // Docker build args from env
Target string // Docker build target Target string // Docker build target
Pull bool // Docker build pull Pull bool // Docker build pull
CacheFrom []string // Docker build cache-from CacheFrom []string // Docker build cache-from
CacheTo string // Docker build cache-to CacheTo string // Docker build cache-to
Compress bool // Docker build compress Compress bool // Docker build compress
Repo string // Docker build repository Repo string // Docker build repository
NoCache bool // Docker build no-cache NoCache bool // Docker build no-cache
AddHost cli.StringSlice // Docker build add-host AddHost cli.StringSlice // Docker build add-host
Quiet bool // Docker build quiet Quiet bool // Docker build quiet
Output string // Docker build output folder Output string // Docker build output folder
NamedContext cli.StringSlice // Docker build named context NamedContext cli.StringSlice // Docker build named context
Labels cli.StringSlice // Docker build labels Labels cli.StringSlice // Docker build labels
Provenance string // Docker build provenance attestation Provenance string // Docker build provenance attestation
SBOM string // Docker build sbom attestation SBOM string // Docker build sbom attestation
Secrets []string // Docker build secrets Secrets []string // Docker build secrets
} }
func New(options wp.Options, settings *Settings) *Plugin { func New(options wp.Options, settings *Settings) *Plugin {