From 336ab8990ee85cb825f6e0d73f652ec3d992e172 Mon Sep 17 00:00:00 2001 From: Stephanie Closson Date: Fri, 17 Apr 2020 14:29:10 -0600 Subject: [PATCH] Toolkit: Update slim debian image for e2e testing (#23629) * Because alpine uses musl instead of libc, the e2e/cypress was not compatible So: - Created new VM based on debian-slim - Could also be used as a build VM Fixes: - ginstall issue with merge somewhere. - Trimmed down the alpine VM since we don't need the extra libraries for cypress * Fix: Don't need cp on debian Fix: Don't use /bin/sh on debian. Only for alpine. Use /bin/bash on debian Fix: Missing dependencies to e2e tests --- .../docker/grafana-plugin-ci-e2e/install/ginstall | 2 +- .../docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/install/ginstall b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/install/ginstall index 06d07a8c2de..5846be8243f 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/install/ginstall +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/install/ginstall @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ## # gget # A script to get and install grafana versions diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh index e9da0742154..745d850d448 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh @@ -2,5 +2,5 @@ source "/etc/profile" 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 +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