From 19ab97db6590a8756fd7ef747c09964ef2320bc7 Mon Sep 17 00:00:00 2001 From: jakubgs Date: Mon, 21 Feb 2022 17:52:52 +0000 Subject: [PATCH] deploy: 263284978ac650191f562c0e01c5362e34256451 --- Dockerfile | 3 ++- ci/Jenkinsfile.release | 3 ++- vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ea3eca8b..8fcab56d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.12 AS nim-build ARG NIM_PARAMS -ARG MAKE_TARGET=wakunode +ARG MAKE_TARGET=wakunode2 # Get build tools and required header files RUN apk add --no-cache bash git rust cargo build-base pcre-dev linux-headers @@ -29,6 +29,7 @@ ARG MAKE_TARGET=wakunode2 LABEL maintainer="jakub@status.im" LABEL source="https://github.com/status-im/nim-waku" LABEL description="Wakunode: Waku and Whisper client" +LABEL commit="unknown" # DevP2P, LibP2P, and JSON RPC ports EXPOSE 30303 60000 8545 diff --git a/ci/Jenkinsfile.release b/ci/Jenkinsfile.release index fdbee382c..04cef3db2 100644 --- a/ci/Jenkinsfile.release +++ b/ci/Jenkinsfile.release @@ -39,7 +39,8 @@ pipeline { stage('Build') { steps { script { image = docker.build( - "${params.IMAGE_NAME}:${env.GIT_COMMIT.take(6)}", + "${params.IMAGE_NAME}:${env.GIT_COMMIT.take(8)}", + "--label=commit='${env.GIT_COMMIT.take(8)}' " + "--build-arg=MAKE_TARGET='${params.MAKE_TARGET}' " + "--build-arg=NIM_PARAMS='${params.NIM_PARAMS}' ." ) diff --git a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool index c05f4bde8..fd070c90d 100755 --- a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool +++ b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool @@ -2,7 +2,7 @@ # libtool - Provide generalized library-building support services. # Generated automatically by config.status (libbacktrace) version-unused -# Libtool was configured on host fv-az269-832: +# Libtool was configured on host fv-az129-201: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,