From 15bd3caec1c053a89594dd055e0cd4b855c56b1c Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 22 Jan 2021 11:28:49 +0100 Subject: [PATCH] test BUILD_DATE --- .drone.jsonnet | 9 +++------ .drone.yml | 26 ++++++++++---------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 930075d..d12a2ad 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -58,17 +58,14 @@ local PipelineBuildContainer(arch='amd64') = { }, { name: 'publish-dockerhub', - image: 'thegeeklab/drone-docker-buildx:20', - environment: { - BUILD_DATE: '$$(date --rfc-3339=seconds)', - }, + image: 'thegeeklab/drone-docker-buildx', settings: { dockerfile: 'Dockerfile.' + std.split(arch, '_')[0], repo: 'thegeeklab/${DRONE_REPO_NAME}', username: { from_secret: 'docker_username' }, password: { from_secret: 'docker_password' }, - build_args_from_env: [ - 'BUILD_DATE', + build_args: [ + 'BUILD_DATE=${DRONE_DOCKER_BUILD_TIME}', ], }, when: { diff --git a/.drone.yml b/.drone.yml index c050c47..43604ca 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,18 +55,16 @@ steps: - tags - name: publish-dockerhub - image: thegeeklab/drone-docker-buildx:20 + image: thegeeklab/drone-docker-buildx settings: - build_args_from_env: - - BUILD_DATE + build_args: + - BUILD_DATE=${DRONE_DOCKER_BUILD_TIME} dockerfile: Dockerfile.amd64 password: from_secret: docker_password repo: thegeeklab/${DRONE_REPO_NAME} username: from_secret: docker_username - environment: - BUILD_DATE: $$(date --rfc-3339=seconds) when: ref: - refs/heads/main @@ -137,18 +135,16 @@ steps: - tags - name: publish-dockerhub - image: thegeeklab/drone-docker-buildx:20 + image: thegeeklab/drone-docker-buildx settings: - build_args_from_env: - - BUILD_DATE + build_args: + - BUILD_DATE=${DRONE_DOCKER_BUILD_TIME} dockerfile: Dockerfile.arm64 password: from_secret: docker_password repo: thegeeklab/${DRONE_REPO_NAME} username: from_secret: docker_username - environment: - BUILD_DATE: $$(date --rfc-3339=seconds) when: ref: - refs/heads/main @@ -219,18 +215,16 @@ steps: - tags - name: publish-dockerhub - image: thegeeklab/drone-docker-buildx:20 + image: thegeeklab/drone-docker-buildx settings: - build_args_from_env: - - BUILD_DATE + build_args: + - BUILD_DATE=${DRONE_DOCKER_BUILD_TIME} dockerfile: Dockerfile.arm password: from_secret: docker_password repo: thegeeklab/${DRONE_REPO_NAME} username: from_secret: docker_username - environment: - BUILD_DATE: $$(date --rfc-3339=seconds) when: ref: - refs/heads/main @@ -358,6 +352,6 @@ depends_on: --- kind: signature -hmac: 478b279e928c111b85864329aa2aa6744e5d77f9a7b7ddbaee1fdd388cda83b8 +hmac: a29790fab71a1ebb5dd6904c898ccd4e3137b40f0014b763eb22fc6ede074547 ...