public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DeployImage: Switch base images to Debian (#30684) (#30699)

Browse Source 
* DeployImage: Switch base images to Debian

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit fdd6a84d82)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2021-01-28 13:49:32 +01:00
committed by GitHub
co-authored by Arve Knudsen
parent b768649a10
commit 5e20794cfe
4 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/ci-deploy/Dockerfile
+23 -12
View File
@@ -1,4 +1,17 @@
FROM cimg/go:1.15.5
FROM debian:testing-20210111-slim
# Use ARG so as not to persist environment variable in image
ARG GOVERSION=1.15.7 \
GO_CHECKSUM=0d142143794721bb63ce6c8a6180c4062bcf8ef4715e7d6d6609f3a8282629b3 \
DEBIAN_FRONTEND=noninteractive
ENV PATH=/usr/local/go/bin:$PATH \
GOPATH=/go
RUN apt update && apt install -yq curl git make
RUN curl -fLO https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz && \
echo "${GO_CHECKSUM} go${GOVERSION}.linux-amd64.tar.gz" | sha256sum --check --strict --status && \
tar -xzf go${GOVERSION}.linux-amd64.tar.gz -C /usr/local
RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly
RUN cd $GOPATH/src/github.com/aptly-dev/aptly && \
@@ -6,27 +19,25 @@ RUN cd $GOPATH/src/github.com/aptly-dev/aptly && \
git reset --hard a64807efdaf5e380bfa878c71bc88eae10d62be1 && \
make install
FROM circleci/python:2.7-stretch-node
FROM debian:testing-20210111-slim
USER root
# Use ARG so as not to persist environment variable in image
ARG DEBIAN_FRONTEND=noninteractive \
GOOGLE_SDK_VERSION=325.0.0 \
GOOGLE_SDK_CHECKSUM=374f960c9f384f88b6fc190b268ceac5dcad777301390107af63782bfb5ecbc7
ARG GOOGLE_SDK_VERSION=319.0.0
ARG GOOGLE_SDK_CHECKSUM=28048af8fe83a1c80a37258d4e6c00edf22bc93edf570fb9bb6a42cca726d4c5
RUN apt-get install -yq python3-pip && pip3 install -U awscli crcmod && \
RUN apt update && apt install -yq curl python3-pip && pip3 install -U awscli crcmod && \
curl -fLO https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz && \
echo "${GOOGLE_SDK_CHECKSUM} google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz" | sha256sum --check --status && \
tar xzf google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz -C /opt && \
rm google-cloud-sdk-${GOOGLE_SDK_VERSION}-linux-x86_64.tar.gz && \
apt update && \
apt install -y createrepo expect && \
apt install -y createrepo-c expect && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* && \
ln -s /opt/google-cloud-sdk/bin/gsutil /usr/bin/gsutil && \
ln -s /opt/google-cloud-sdk/bin/gcloud /usr/bin/gcloud && \
mkdir -p /deb-repo /rpm-repo && \
chown circleci:circleci /deb-repo /rpm-repo
ln -s /usr/bin/createrepo_c /usr/bin/createrepo
COPY --from=0 /home/circleci/go/bin/aptly /usr/local/bin/aptly
USER circleci
COPY --from=0 /go/bin/aptly /usr/local/bin/aptly