From 1d7098ed429917b253a820fa5d56c643f417c971 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Sun, 26 Jan 2020 16:06:21 +0100 Subject: [PATCH] docs: invite people to use docker --pull (#1305) * www/docker: invite people to use --pull Signed-off-by: Yoan Blanc * fixup! www/docker: invite people to use --pull Signed-off-by: Yoan Blanc * goreleaser: label-schema is deprecated Signed-off-by: Yoan Blanc * fixup! goreleaser: label-schema is deprecated Signed-off-by: Yoan Blanc Co-authored-by: Carlos Alexandro Becker --- .goreleaser.yml | 17 +++++++++++------ www/content/docker.md | 24 +++++++++++++++--------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 32e60ce0b..b0e3eb781 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -38,9 +38,11 @@ dockers: binaries: - goreleaser build_flag_templates: - - "--label=org.label-schema.schema-version=1.0" - - "--label=org.label-schema.version={{.Version}}" - - "--label=org.label-schema.name={{.ProjectName}}" + - "--pull" + - "--label=org.opencontainers.image.created={{.Date}}" + - "--label=org.opencontainers.image.name={{.ProjectName}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.version={{.Version}}" extra_files: - scripts/entrypoint.sh - image_templates: @@ -51,9 +53,12 @@ dockers: binaries: - goreleaser build_flag_templates: - - "--label=org.label-schema.schema-version=1.0" - - "--label=org.label-schema.version={{.Version}}" - - "--label=org.label-schema.name={{.ProjectName}}" + - "--pull" + - "--label=org.opencontainers.image.created={{.Date}}" + - "--label=org.opencontainers.image.name={{.ProjectName}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.version={{.Version}}" + - "--label=org.opencontainers.image.source={{.GitURL}}" - "--label=com.github.actions.name={{.ProjectName}}" - "--label=com.github.actions.description=Deliver Go binaries as fast and easily as possible" - "--label=com.github.actions.icon=terminal" diff --git a/www/content/docker.md b/www/content/docker.md index 04715e98c..6101a9171 100644 --- a/www/content/docker.md +++ b/www/content/docker.md @@ -84,9 +84,11 @@ dockers: # Template of the docker build flags. build_flag_templates: - - "--label=org.label-schema.schema-version=1.0" - - "--label=org.label-schema.version={{.Version}}" - - "--label=org.label-schema.name={{.ProjectName}}" + - "--pull" + - "--label=org.opencontainers.image.created={{.Date}}" + - "--label=org.opencontainers.image.name={{.ProjectName}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.version={{.Version}}" - "--build-arg=FOO={{.Env.Bar}}" # If your Dockerfile copies files other than the binary itself, @@ -198,18 +200,22 @@ dockers: image_templates: - "myuser/myimage" build_flag_templates: - - "--label=org.label-schema.schema-version=1.0" - - "--label=org.label-schema.version={{.Version}}" - - "--label=org.label-schema.name={{.ProjectName}}" + - "--pull" + - "--label=org.opencontainers.image.created={{.Date}}" + - "--label=org.opencontainers.image.name={{.ProjectName}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.version={{.Version}}" ``` This will execute the following command: ```bash docker build -t myuser/myimage . \ - --label=org.label-schema.schema-version=1.0 \ - --label=org.label-schema.version=1.6.4 \ - --label=org.label-schema.name=mybinary" + --pull \ + --label=org.opencontainers.image.created=2020-01-19T15:58:07Z" \ + --label=org.opencontainers.image.name=mybinary" \ + --label=org.opencontainers.image.revision=da39a3ee5e6b4b0d3255bfef95601890afd80709" \ + --label=org.opencontainers.image.version=1.6.4 ``` > Learn more about the [name template engine](/templates).