IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

area/grafana/toolkit: update e2e docker image (#28335)

Browse Source 
* add xvfb to image

* comment out toolkit inclusion

* add latest tag

* update packages for cypress

* cleanup script
This commit is contained in:
Brian Gann 2020-10-16 22:02:49 -05:00 committed by GitHub
parent 44a795cb17
commit 5c5fcbf5e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/Dockerfile
View File

@ -1,8 +1,10 @@
FROM debian:buster-slim FROM debian:buster-slim
USER root USER root
ENV DEBIAN_FRONTEND=noninteractive
COPY scripts scripts COPY scripts scripts
COPY install /usr/local COPY install /usr/local
RUN cd scripts && ./deploy.sh RUN cd scripts && ./deploy.sh
ENV DEBIAN_FRONTEND=newt

2
packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh
View File

@ -18,5 +18,7 @@ fi
docker build -t ${DOCKER_IMAGE_NAME} . docker build -t ${DOCKER_IMAGE_NAME} .
docker push $DOCKER_IMAGE_NAME docker push $DOCKER_IMAGE_NAME
docker tag ${DOCKER_IMAGE_NAME} ${DOCKER_IMAGE_BASE_NAME}:latest
docker push ${DOCKER_IMAGE_BASE_NAME}:latest
[ -n "$INCLUDE_TOOLKIT" ] && /bin/rm -rfv install/grafana-toolkit [ -n "$INCLUDE_TOOLKIT" ] && /bin/rm -rfv install/grafana-toolkit

4
packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh
View File

@ -4,4 +4,6 @@
## Common variable declarations ## Common variable declarations
## ##
DOCKER_IMAGE_NAME="grafana/grafana-plugin-ci-e2e:1.0.0" DOCKER_IMAGE_BASE_NAME="grafana/grafana-plugin-ci-e2e"
DOCKER_IMAGE_VERSION="1.0.1"
DOCKER_IMAGE_NAME="${DOCKER_IMAGE_BASE_NAME}:${DOCKER_IMAGE_VERSION}"

23
packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh
View File

@ -2,5 +2,26 @@
source "/etc/profile" source "/etc/profile"
apt-get --allow-insecure-repositories update apt-get --allow-insecure-repositories update
apt-get install --allow-unauthenticated -y build-essential wget git sudo adduser libfontconfig1 locate libnss3 libnspr4 libgdk-pixbuf2.0-0 libgtk-3-0 libpangocairo-1.0-0 libpango-1.0-0 libatk1.0-0 libcairo2 libdbus-1-3 libxcomposite1 libxrender1 libxcursor1 libxi6 libxtst6 libxrandr2 libxss1 libasound2 libatk-bridge2.0-0 libatspi2.0-0 libcups2 jq xvfb net-tools git-lfs unzip pkg-config zip libaio1 libaio-dev netcat apt-get install --allow-unauthenticated -y \
build-essential \
wget git sudo adduser \
libfontconfig1 \
locate \
libnss3 libnspr4 \
libgdk-pixbuf2.0-0 \
libgtk-3-0 \
libpangocairo-1.0-0 \
libpango-1.0-0 \
libatk1.0-0 \
libcairo2 \
libdbus-1-3 \
libxcomposite1 libxrender1 libxcursor1 libxi6 libxtst6 libxrandr2 libxss1 xauth xvfb \
libasound2 \
libatk-bridge2.0-0 \
libatspi2.0-0 \
libcups2 \
jq net-tools git-lfs unzip pkg-config zip \
libaio1 libaio-dev \
netcat \
libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb

9
packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
View File

@ -56,11 +56,10 @@ mv $HOME/go/bin/mage /usr/local/bin
/bin/rm -rf /tmp/mage /bin/rm -rf /tmp/mage
/bin/rm -rf $HOME/go /bin/rm -rf $HOME/go
# Install grafana-toolkit deps # add cypress
pushd /usr/local/grafana-toolkit yarn global add cypress
yarn install # verify cypress install
ln -s /usr/local/grafana-toolkit/bin/grafana-toolkit.js /usr/local/bin/grafana-toolkit cypress verify
popd
# Get the size down # Get the size down
/bin/rm -rf /var/lib/apt/lists /bin/rm -rf /var/lib/apt/lists