use drone env to set GITREV_BUILD
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

This commit is contained in:
Jeffrey Paul 2022-12-09 00:51:19 +01:00
parent 4087fe005b
commit cbe9fca1c6
4 changed files with 12 additions and 3 deletions

View File

@ -1,2 +1,3 @@
*.tmp *.tmp
*.dockerimage *.dockerimage
.git

View File

@ -7,11 +7,13 @@ steps:
network_mode: bridge network_mode: bridge
settings: settings:
repo: sneak/mfer repo: sneak/mfer
build_args_from_env: [ DRONE_COMMIT_SHA ]
dry_run: true dry_run: true
custom_dns: [ 116.202.204.30 ] custom_dns: [ 116.202.204.30 ]
tags: tags:
- ${DRONE_COMMIT_SHA} - ${DRONE_COMMIT_SHA:0:7}
- ${DRONE_BRANCH} - ${DRONE_BRANCH}
- latest
- name: notify - name: notify
image: plugins/slack image: plugins/slack
settings: settings:

View File

@ -4,7 +4,6 @@
FROM sneak/builder:2022-12-08 AS builder FROM sneak/builder:2022-12-08 AS builder
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
WORKDIR /build WORKDIR /build
COPY ./.git /build/.git
COPY ./Makefile ./.golangci.yml ./go.mod ./go.sum /build/ COPY ./Makefile ./.golangci.yml ./go.mod ./go.sum /build/
COPY ./vendor.tzst /build/vendor.tzst COPY ./vendor.tzst /build/vendor.tzst
COPY ./modcache.tzst /build/modcache.tzst COPY ./modcache.tzst /build/modcache.tzst
@ -13,6 +12,7 @@ COPY ./bin/gitrev.sh ./bin/gitrev.sh
COPY ./mfer ./mfer COPY ./mfer ./mfer
COPY ./cmd ./cmd COPY ./cmd ./cmd
ARG GITREV unknown ARG GITREV unknown
ARG DRONE_COMMIT_SHA unknown
RUN mkdir -p "$(go env GOMODCACHE)" && cd "$(go env GOMODCACHE)" && \ RUN mkdir -p "$(go env GOMODCACHE)" && cd "$(go env GOMODCACHE)" && \
zstdmt -d --stdout /build/modcache.tzst | tar xf - && \ zstdmt -d --stdout /build/modcache.tzst | tar xf - && \
@ -24,7 +24,7 @@ RUN \
zstdmt -d --stdout /build/vendor.tzst | tar xf - && rm /build/vendor.tzst && \ zstdmt -d --stdout /build/vendor.tzst | tar xf - && rm /build/vendor.tzst && \
cd .. && \ cd .. && \
make mfer.cmd make mfer.cmd
RUN rm -rf /build/vendor /build/.git && go mod vendor && tar -c . | zstdmt -19 > /src.tzst RUN rm -rf /build/vendor && go mod vendor && tar -c . | zstdmt -19 > /src.tzst
################################################################################ ################################################################################
#2345678911234567892123456789312345678941234567895123456789612345678971234567898 #2345678911234567892123456789312345678941234567895123456789612345678971234567898
################################################################################ ################################################################################

View File

@ -1,4 +1,10 @@
#!/bin/bash #!/bin/bash
#
if [[ ! -z "$DRONE_COMMIT_SHA" ]]; then
echo "${DRONE_COMMIT_SHA:0:7}"
exit 0
fi
if [[ ! -z "$GITREV" ]]; then if [[ ! -z "$GITREV" ]]; then
echo $GITREV echo $GITREV
else else