Skip to content

Commit

Permalink
Update Docker image to use Debian Bullseye (#6838)
Browse files Browse the repository at this point in the history
* WIP. Adding upgrade command to Dockerifle.

* Pointing at new Debian Bullseye image.
  • Loading branch information
1Copenut committed Jun 12, 2023
1 parent 78f405b commit 8992deb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion scripts/deploy/build_docs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

NODE_IMG="docker.elastic.co/eui/ci:3.5"
NODE_IMG="docker.elastic.co/eui/ci:4.0"

# Compile using node image
echo "Building docs using ${NODE_IMG} Docker image"
Expand Down
3 changes: 2 additions & 1 deletion scripts/docker-ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zenato/docker-puppeteer/blob/master/Dockerfile

# >=12.0 required (for cypress), but latest right now is 16.19.1
FROM node:16.19.1
FROM node:16.19.1-bullseye

# See https://crbug.com/795759
RUN apt-get update && apt-get install -yq libgconf-2-4
Expand All @@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y wget xvfb --no-install-recommends \
&& apt-get update \
&& apt-get install -y google-chrome-stable \
--no-install-recommends \
&& apt-get upgrade -y \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get purge --auto-remove -y curl \
&& rm -rf /src/*.deb
Expand Down
4 changes: 2 additions & 2 deletions scripts/test-a11y-docker.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { execSync } = require('child_process');

execSync('docker pull docker.elastic.co/eui/ci:3.5', {
execSync('docker pull docker.elastic.co/eui/ci:4.0', {
stdio: 'inherit',
});
/* eslint-disable-next-line no-multi-str */
Expand All @@ -9,7 +9,7 @@ execSync(
-i --rm --cap-add=SYS_ADMIN --volume=$(pwd):/app --workdir=/app \
-e GIT_COMMITTER_NAME=test -e GIT_COMMITTER_EMAIL=test -e HOME=/tmp \
--user=$(id -u):$(id -g) \
docker.elastic.co/eui/ci:3.5 \
docker.elastic.co/eui/ci:4.0 \
bash -c \'npm config set spin false \
&& /opt/yarn*/bin/yarn \
&& yarn cypress install \
Expand Down
4 changes: 2 additions & 2 deletions scripts/test-docker.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { execSync } = require('child_process');

execSync('docker pull docker.elastic.co/eui/ci:3.5', {
execSync('docker pull docker.elastic.co/eui/ci:4.0', {
stdio: 'inherit',
});
/* eslint-disable-next-line no-multi-str */
Expand All @@ -9,7 +9,7 @@ execSync(
-i --rm --cap-add=SYS_ADMIN --volume=$(pwd):/app --workdir=/app \
-e GIT_COMMITTER_NAME=test -e GIT_COMMITTER_EMAIL=test -e HOME=/tmp \
--user=$(id -u):$(id -g) \
docker.elastic.co/eui/ci:3.5 \
docker.elastic.co/eui/ci:4.0 \
bash -c \'npm config set spin false \
&& /opt/yarn*/bin/yarn \
&& yarn cypress install \
Expand Down

0 comments on commit 8992deb

Please sign in to comment.