Commit dadc8a2e by Marcus Efraimsson Committed by GitHub

Chore: Upgrade docker build image (#30820)

* Chore: Upgrade docker build image

* use updated build image in drone
parent 4dc5ac85
...@@ -3,6 +3,7 @@ FROM debian:stretch-20201209 AS toolchain ...@@ -3,6 +3,7 @@ FROM debian:stretch-20201209 AS toolchain
ENV OSX_MIN=10.10 \ ENV OSX_MIN=10.10 \
CTNG=1.24.0 \ CTNG=1.24.0 \
CTNG_CHKSUM=89b8794a4184ad4928750e29712ed4f194aa1d0b93768d67ff64f30c30f1b1e165647cafc6de94d68d3ef70e50446e544dad65aa36137511a32ee7a667dddfb4 \
# This is the last revision that builds on Debian Stretch # This is the last revision that builds on Debian Stretch
OSX_CROSS_REV=a1d7d7a8d569f9f0b8c3140b8b32848dbcd62afa OSX_CROSS_REV=a1d7d7a8d569f9f0b8c3140b8b32848dbcd62afa
...@@ -56,7 +57,9 @@ RUN rm -rf /tmp/osxcross/target/SDK/*/usr/share && \ ...@@ -56,7 +57,9 @@ RUN rm -rf /tmp/osxcross/target/SDK/*/usr/share && \
rm -rf /tmp/osxcross rm -rf /tmp/osxcross
RUN apt-get install -yq \ RUN apt-get install -yq \
unzip libtool-bin bison flex gawk gcc g++ gperf help2man libncurses5-dev make patch python-dev texinfo xz-utils unzip libtool-bin bison flex gawk gcc g++ gperf help2man libncurses5-dev make patch python-dev texinfo xz-utils
RUN curl -fL http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-${CTNG}.tar.xz | tar -xJ -C /tmp/ RUN curl -fLO http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-${CTNG}.tar.xz
RUN echo $CTNG_CHKSUM crosstool-ng-${CTNG}.tar.xz | sha512sum --check --strict --status
RUN tar xf crosstool-ng-${CTNG}.tar.xz
RUN cd /tmp/crosstool-ng-${CTNG} && \ RUN cd /tmp/crosstool-ng-${CTNG} && \
./configure --enable-local && \ ./configure --enable-local && \
make && \ make && \
......
#!/bin/bash #!/bin/bash
set -eo pipefail set -eo pipefail
_version="1.3.1" _version="1.3.2"
_tag="grafana/build-container:${_version}" _tag="grafana/build-container:${_version}"
_dpath=$(dirname "${BASH_SOURCE[0]}") _dpath=$(dirname "${BASH_SOURCE[0]}")
......
grabpl_version = '0.5.36' grabpl_version = '0.5.36'
build_image = 'grafana/build-container:1.3.1' build_image = 'grafana/build-container:1.3.2'
publish_image = 'grafana/grafana-ci-deploy:1.3.0' publish_image = 'grafana/grafana-ci-deploy:1.3.0'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
alpine_image = 'alpine:3.12' alpine_image = 'alpine:3.12'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment