Skip to content

Commit

Permalink
👷 Bump chrome to 128.0.6613.84-1 (#2946)
Browse files Browse the repository at this point in the history
* 👷 Bump chrome to 128.0.6613.84-1

* add new chrome dependency

* update debian to bookworm (latest stable)

* update aws-cli setup

python2 (aka 'python' on Debian) is not available anymore in Bookworm.
So we would need to upgrade to python3, but the only thing that uses
python is aws-cli, and newer version of aws-cli includes its own python
version. So let's remove python altogether and use the newer version of
aws-cli instead.

* remove jq and stylistic Dockerfile update

jq isn't used anymore, let's remove it from our dependencies.

---------

Co-authored-by: ci.browser-sdk <[email protected]>
Co-authored-by: Benoît Zugmeyer <[email protected]>
  • Loading branch information
3 people authored Sep 10, 2024
1 parent 1202329 commit 0c401ab
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
variables:
CURRENT_STAGING: staging-37
APP: 'browser-sdk'
CURRENT_CI_IMAGE: 69
CURRENT_CI_IMAGE: 70
BUILD_STABLE_REGISTRY: 'registry.ddbuild.io'
CI_IMAGE: '$BUILD_STABLE_REGISTRY/ci/$APP:$CURRENT_CI_IMAGE'
GIT_REPOSITORY: '[email protected]:DataDog/browser-sdk.git'
MAIN_BRANCH: 'main'
NEXT_MAJOR_BRANCH: 'v6'
CHROME_PACKAGE_VERSION: 127.0.6533.72-1
CHROME_PACKAGE_VERSION: 128.0.6613.84-1

cache:
key:
Expand Down
44 changes: 19 additions & 25 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.15.0-buster-slim
FROM node:20.15.0-bookworm-slim

ARG CHROME_PACKAGE_VERSION

Expand All @@ -7,6 +7,7 @@ RUN test -n "$CHROME_PACKAGE_VERSION" || (echo "\nCHROME_PACKAGE_VERSION not set

# Install Chrome deps
RUN apt-get update && apt-get install -y -q --no-install-recommends \
libgcc-s1 \
libgtk-3-dev \
libx11-xcb1 \
libnss3 \
Expand All @@ -30,21 +31,14 @@ RUN curl --silent --show-error --fail http://dl.google.com/linux/chrome/deb/pool
&& rm google-chrome.deb


# Install python
RUN apt-get install -y -q --no-install-recommends python

# Install pip
RUN set -x \
&& curl -OL https://bootstrap.pypa.io/pip/2.7/get-pip.py \
&& python get-pip.py \
&& rm get-pip.py

# Install AWS cli
# https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
RUN set -x \
&& pip install awscli

# Deploy deps
RUN apt-get install -y -q --no-install-recommends jq
&& apt-get install -y -q --no-install-recommends unzip \
&& cd /tmp \
&& curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
&& unzip awscliv2.zip \
&& ./aws/install

# Node fsevents deps
RUN apt-get install -y -q --no-install-recommends g++ build-essential
Expand All @@ -67,21 +61,21 @@ RUN apt-get -y install git
RUN apt-get -y install procps

# Woke
RUN set -o pipefail && curl -sSfL https://git.io/getwoke | \
bash -s -- -b /usr/local/bin v0.17.1
RUN set -o pipefail \
&& curl -sSfL https://git.io/getwoke | bash -s -- -b /usr/local/bin v0.17.1

# Codecov https://docs.codecov.com/docs/codecov-uploader
RUN apt-get -y install gnupg coreutils
RUN set -o pipefail && curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import
RUN CODECOV_UPLOADER_VERSION=v0.1.15 \
RUN apt-get -y install gnupg coreutils \
&& set -o pipefail && curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import \
&& CODECOV_UPLOADER_VERSION=v0.1.15 \
&& curl -Os https://uploader.codecov.io/${CODECOV_UPLOADER_VERSION}/linux/codecov \
&& curl -Os https://uploader.codecov.io/${CODECOV_UPLOADER_VERSION}/linux/codecov.SHA256SUM \
&& curl -Os https://uploader.codecov.io/${CODECOV_UPLOADER_VERSION}/linux/codecov.SHA256SUM.sig
RUN gpgv codecov.SHA256SUM.sig codecov.SHA256SUM
RUN shasum -a 256 -c codecov.SHA256SUM
RUN chmod +x codecov
RUN mv codecov /usr/local/bin
RUN rm codecov.*
&& curl -Os https://uploader.codecov.io/${CODECOV_UPLOADER_VERSION}/linux/codecov.SHA256SUM.sig \
&& gpgv codecov.SHA256SUM.sig codecov.SHA256SUM \
&& shasum -a 256 -c codecov.SHA256SUM \
&& chmod +x codecov \
&& mv codecov /usr/local/bin \
&& rm codecov.*

# Install authanywhere for pull request commenter token
RUN if [ $(uname -m) = x86_64 ]; then AAA="amd64"; else AAA="arm64"; fi; curl -OL "binaries.ddbuild.io/dd-source/authanywhere/LATEST/authanywhere-linux-${AAA}" && mv "authanywhere-linux-${AAA}" /bin/authanywhere && chmod +x /bin/authanywhere

0 comments on commit 0c401ab

Please sign in to comment.