Skip to content

Commit 42b9a87

Browse files
VietND96VietND96
committed
build: spin Chromium version
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent d57a8e7 commit 42b9a87

File tree

5 files changed

+37
-32
lines changed

5 files changed

+37
-32
lines changed

‎.circleci/config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ workflows:
77
name: "K8s test - Autoscaling disabled"
88
platforms: linux/arm64
99
machine-type: ubuntu2204arm64large
10-
k8s-version: 'v1.25.16'
10+
k8s-version: 'v1.26.15'
1111
test-strategy: disabled
1212
cluster: 'minikube'
1313
helm-version: 'v3.10.3'
@@ -16,7 +16,7 @@ workflows:
1616
name: "K8s test - Autoscaling Jobs"
1717
platforms: linux/arm64
1818
machine-type: ubuntu2204arm64large
19-
k8s-version: 'v1.26.15'
19+
k8s-version: 'v1.27.16'
2020
test-strategy: job
2121
cluster: 'minikube'
2222
helm-version: 'v3.11.3'
@@ -25,7 +25,7 @@ workflows:
2525
name: "K8s test - Autoscaling Deployments"
2626
platforms: linux/arm64
2727
machine-type: ubuntu2204arm64large
28-
k8s-version: 'v1.27.16'
28+
k8s-version: 'v1.28.13'
2929
test-strategy: deployment
3030
cluster: 'minikube'
3131
helm-version: 'v3.12.3'
@@ -34,7 +34,7 @@ workflows:
3434
name: "K8s test - Autoscaling Jobs - HTTPS"
3535
platforms: linux/arm64
3636
machine-type: ubuntu2204arm64large
37-
k8s-version: 'v1.28.13'
37+
k8s-version: 'v1.29.8'
3838
test-strategy: job_https
3939
cluster: 'minikube'
4040
helm-version: 'v3.13.3'
@@ -43,7 +43,7 @@ workflows:
4343
name: "K8s test - Autoscaling Jobs - Ingress hostname"
4444
platforms: linux/arm64
4545
machine-type: ubuntu2204arm64large
46-
k8s-version: 'v1.29.8'
46+
k8s-version: 'v1.30.4'
4747
test-strategy: job_hostname
4848
cluster: 'minikube'
4949
helm-version: 'v3.14.4'
@@ -52,7 +52,7 @@ workflows:
5252
name: "K8s test - Autoscaling Deployments - HTTPS"
5353
platforms: linux/arm64
5454
machine-type: ubuntu2204arm64large
55-
k8s-version: 'v1.30.4'
55+
k8s-version: 'v1.31.0'
5656
test-strategy: deployment_https
5757
cluster: 'minikube'
5858
helm-version: 'v3.15.4'

‎.github/workflows/helm-chart-test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,37 +34,37 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
include:
37-
- k8s-version: 'v1.25.16'
37+
- k8s-version: 'v1.26.15'
3838
test-strategy: disabled
3939
cluster: 'minikube'
4040
helm-version: 'v3.10.3'
4141
docker-version: '24.0.9'
4242
test-upgrade: true
43-
- k8s-version: 'v1.26.15'
43+
- k8s-version: 'v1.27.16'
4444
test-strategy: job
4545
cluster: 'minikube'
4646
helm-version: 'v3.11.3'
4747
docker-version: '24.0.9'
4848
test-upgrade: true
49-
- k8s-version: 'v1.27.16'
49+
- k8s-version: 'v1.28.13'
5050
test-strategy: deployment
5151
cluster: 'minikube'
5252
helm-version: 'v3.12.3'
5353
docker-version: '24.0.9'
5454
test-upgrade: true
55-
- k8s-version: 'v1.28.13'
55+
- k8s-version: 'v1.29.8'
5656
test-strategy: job_https
5757
cluster: 'minikube'
5858
helm-version: 'v3.13.3'
5959
docker-version: '25.0.5'
6060
test-upgrade: true
61-
- k8s-version: 'v1.29.8'
61+
- k8s-version: 'v1.30.4'
6262
test-strategy: job_hostname
6363
cluster: 'minikube'
6464
helm-version: 'v3.14.4'
6565
docker-version: '26.1.4'
6666
test-upgrade: true
67-
- k8s-version: 'v1.30.4'
67+
- k8s-version: 'v1.31.0'
6868
test-strategy: deployment_https
6969
cluster: 'minikube'
7070
helm-version: 'v3.15.4'

‎.github/workflows/update-dev-beta-browser-images.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@ jobs:
2222
CHANNEL: ${{ matrix.channel }}
2323

2424
steps:
25-
- uses: actions/checkout@main
26-
- name: Set up QEMU
27-
uses: docker/setup-qemu-action@master
28-
- name: Set up Docker Buildx
29-
uses: docker/setup-buildx-action@master
30-
with:
31-
platforms: linux/amd64,linux/arm64
32-
use: false
25+
- name: Checkout code
26+
uses: actions/checkout@main
3327
- name: Set up containerd image store feature
34-
run: make set_containerd_image_store
28+
uses: nick-invision/retry@master
29+
with:
30+
timeout_minutes: 10
31+
max_attempts: 3
32+
command: |
33+
make setup_dev_env
3534
- name: Setup environment variables
3635
run: |
3736
export SELENIUM_VERSION=$(grep BASE_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),linuxserver)
2323
FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),7.0.2)
2424
PLATFORMS := $(or $(PLATFORMS),$(shell echo $$PLATFORMS),linux/amd64)
2525
SEL_PASSWD := $(or $(SEL_PASSWD),$(SEL_PASSWD),secret)
26+
CHROMIUM_VERSION := $(or $(CHROMIUM_VERSION),$(CHROMIUM_VERSION),128.0.6613.113)
2627

2728
all: hub \
2829
distributor \
@@ -140,7 +141,7 @@ chrome_beta:
140141
cd ./NodeChrome && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg CHROME_VERSION=google-chrome-beta -t $(NAME)/node-chrome:beta .
141142

142143
chromium: node_base
143-
cd ./NodeChromium && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-chromium:$(TAG_VERSION) .
144+
cd ./NodeChromium && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg CHROMIUM_VERSION=$(CHROMIUM_VERSION) -t $(NAME)/node-chromium:$(TAG_VERSION) .
144145

145146
edge: node_base
146147
case "$(PLATFORMS)" in \

‎NodeChromium/Dockerfile‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,22 @@ LABEL authors=${AUTHORS}
77
USER root
88

99
# Install Chromium
10-
RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
11-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0E98404D386FA1D9 6ED0E7B82643E131 \
10+
ARG CHROMIUM_VERSION="latest"
11+
ARG CHROMIUM_DEB_SITE="http://deb.debian.org/debian"
12+
RUN echo "deb ${CHROMIUM_DEB_SITE}/ sid main" >> /etc/apt/sources.list \
13+
&& wget -qO- https://ftp-master.debian.org/keys/archive-key-12.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/debian-archive-keyring.gpg \
14+
&& wget -qO- https://ftp-master.debian.org/keys/archive-key-12-security.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/debian-archive-security-keyring.gpg \
1215
&& apt-get update -qqy \
13-
&& apt-get -qqy --no-install-recommends install chromium chromium-l10n \
16+
&& if [ "${CHROMIUM_VERSION}" = "latest" ]; \
17+
then apt-get -qqy --no-install-recommends install chromium-common chromium chromium-l10n chromium-driver; \
18+
else mkdir -p /tmp/chromium \
19+
&& wget -q ${CHROMIUM_DEB_SITE}/pool/main/c/chromium/chromium-common_${CHROMIUM_VERSION}-1_$(dpkg --print-architecture).deb -O /tmp/chromium/chromium-common.deb \
20+
&& wget -q ${CHROMIUM_DEB_SITE}/pool/main/c/chromium/chromium_${CHROMIUM_VERSION}-1_$(dpkg --print-architecture).deb -O /tmp/chromium/chromium.deb \
21+
&& wget -q ${CHROMIUM_DEB_SITE}/pool/main/c/chromium/chromium-l10n_${CHROMIUM_VERSION}-1_all.deb -O /tmp/chromium/chromium-l10n.deb \
22+
&& wget -q ${CHROMIUM_DEB_SITE}/pool/main/c/chromium/chromium-driver_${CHROMIUM_VERSION}-1_$(dpkg --print-architecture).deb -O /tmp/chromium/chromium-driver.deb \
23+
&& apt-get -qqyf install /tmp/chromium/chromium-common.deb /tmp/chromium/chromium.deb /tmp/chromium/chromium-l10n.deb /tmp/chromium/chromium-driver.deb \
24+
&& rm -rf /tmp/chromium; \
25+
fi \
1426
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1527

1628
#=================================
@@ -19,13 +31,6 @@ RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
1931
COPY wrap_chromium_binary /opt/bin/wrap_chromium_binary
2032
RUN /opt/bin/wrap_chromium_binary
2133

22-
#============================================
23-
# Chromium webdriver
24-
#============================================
25-
RUN apt-get update -qqy \
26-
&& apt-get -qqy --no-install-recommends install chromium-driver \
27-
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
28-
2934
#============================================
3035
# Chromium cleanup script and supervisord file
3136
#============================================

0 commit comments

Comments
 (0)