Skip to content

Commit 842ccf8

Browse files
committed
Docker: Firefox stable latest version for ARM64
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 70ac588 commit 842ccf8

File tree

5 files changed

+33
-23
lines changed

5 files changed

+33
-23
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
test-strategy: job_https
7171
cluster: 'minikube'
7272
helm-version: 'v3.14.3'
73-
docker-version: '27.5.1'
73+
docker-version: '26.1.4'
7474
python-version: '3.11'
7575
test-upgrade: true
7676
service-mesh: false
@@ -79,7 +79,7 @@ jobs:
7979
test-strategy: job_hostname
8080
cluster: 'minikube'
8181
helm-version: 'v3.15.4'
82-
docker-version: '27.5.1'
82+
docker-version: '26.1.4'
8383
python-version: '3.12'
8484
test-upgrade: true
8585
service-mesh: false
@@ -88,7 +88,7 @@ jobs:
8888
test-strategy: deployment_https
8989
cluster: 'minikube'
9090
helm-version: 'v3.16.4'
91-
docker-version: '28.0.1'
91+
docker-version: '27.4.1'
9292
python-version: '3.13'
9393
test-upgrade: true
9494
service-mesh: false
@@ -97,7 +97,7 @@ jobs:
9797
test-strategy: playwright_connect_grid
9898
cluster: 'minikube'
9999
helm-version: 'v3.17.0'
100-
docker-version: '28.0.1'
100+
docker-version: '26.1.4'
101101
python-version: '3.10'
102102
test-upgrade: true
103103
service-mesh: true

.github/workflows/k8s-scaling-test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,37 +65,37 @@ jobs:
6565
test-strategy: test_k8s_autoscaling_job_count_strategy_default_in_chaos
6666
cluster: 'minikube'
6767
helm-version: 'v3.16.4'
68-
docker-version: '28.0.1'
68+
docker-version: '27.4.1'
6969
python-version: '3.13'
7070
- k8s-version: 'v1.31.5'
7171
test-strategy: test_k8s_autoscaling_job_count_strategy_default_with_node_max_sessions
7272
cluster: 'minikube'
7373
helm-version: 'v3.16.4'
74-
docker-version: '28.0.1'
74+
docker-version: '27.4.1'
7575
python-version: '3.13'
7676
- k8s-version: 'v1.31.5'
7777
test-strategy: test_k8s_autoscaling_job_count_strategy_default
7878
cluster: 'minikube'
7979
helm-version: 'v3.16.4'
80-
docker-version: '28.0.1'
80+
docker-version: '27.4.1'
8181
python-version: '3.13'
8282
- k8s-version: 'v1.31.5'
8383
test-strategy: test_k8s_autoscaling_deployment_count_in_chaos
8484
cluster: 'minikube'
8585
helm-version: 'v3.16.4'
86-
docker-version: '28.0.1'
86+
docker-version: '27.4.1'
8787
python-version: '3.13'
8888
- k8s-version: 'v1.31.5'
8989
test-strategy: test_k8s_autoscaling_deployment_count_with_node_max_sessions
9090
cluster: 'minikube'
9191
helm-version: 'v3.16.4'
92-
docker-version: '28.0.1'
92+
docker-version: '27.4.1'
9393
python-version: '3.13'
9494
- k8s-version: 'v1.31.5'
9595
test-strategy: test_k8s_autoscaling_deployment_count
9696
cluster: 'minikube'
9797
helm-version: 'v3.16.4'
98-
docker-version: '28.0.1'
98+
docker-version: '27.4.1'
9999
python-version: '3.13'
100100
env:
101101
CLUSTER: ${{ matrix.cluster }}

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,15 @@ check_dev_env:
6060

6161
setup_dev_env:
6262
./tests/charts/make/chart_setup_env.sh ; \
63-
make set_containerd_image_store
63+
exit_code=$$? ; \
64+
make set_containerd_image_store ; \
65+
exit $$exit_code ;
6466

6567
set_containerd_image_store:
6668
sudo mkdir -p /etc/docker
6769
sudo mv /etc/docker/daemon.json /etc/docker/daemon.json.bak || true
6870
echo "{\"features\":{\"containerd-snapshotter\": true, \"containerd\": true}, \"experimental\": true}" | sudo tee /etc/docker/daemon.json
69-
sudo systemctl restart docker
71+
sudo -u root systemctl restart docker
7072
sudo chmod 666 /var/run/docker.sock
7173
docker version -f '{{.Server.Experimental}}'
7274
docker info -f '{{ .DriverStatus }}'

NodeFirefox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ARG FIREFOX_VERSION=latest
2121
ARG FIREFOX_DOWNLOAD_URL=""
2222
ARG FIREFOX_LANG_VERSION=${FIREFOX_VERSION}
2323
RUN apt-get update -qqy && \
24-
if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
24+
if [ "$(dpkg --print-architecture)" = "amd64" ] || [ $FIREFOX_VERSION = "latest" ]; then \
2525
if [ $FIREFOX_VERSION = "latest" ] || [ $FIREFOX_VERSION = "beta-latest" ] || [ $FIREFOX_VERSION = "nightly-latest" ] || [ $FIREFOX_VERSION = "devedition-latest" ] || [ $FIREFOX_VERSION = "esr-latest" ]; then \
2626
/opt/bin/install-firefox-apt.sh \
2727
&& FIREFOX_VERSION=$(echo "-$FIREFOX_VERSION" | sed 's/-latest//') \

tests/charts/make/chart_setup_env.sh

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
echo "Set ENV variables"
44
CLUSTER=${CLUSTER:-"minikube"}
5-
DOCKER_VERSION=${DOCKER_VERSION:-"26.1.4"}
5+
DOCKER_VERSION=${DOCKER_VERSION:-""}
66
HELM_VERSION=${HELM_VERSION:-"latest"}
77
KUBERNETES_VERSION=${KUBERNETES_VERSION:-$(curl -L -s https://dl.k8s.io/release/stable.txt)}
88

@@ -28,6 +28,7 @@ echo \
2828
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
2929
sudo apt-get update -qq || true
3030
if [ -n "${DOCKER_VERSION}" ]; then
31+
DOCKER_VERSION_EXPECT=$DOCKER_VERSION
3132
if [[ "${DOCKER_VERSION}" == "20.10"* ]]; then
3233
DOCKER_VERSION="=5:${DOCKER_VERSION}~3-0~$(. /etc/os-release; echo "$ID")-$(. /etc/os-release; echo "$VERSION_CODENAME")"
3334
else
@@ -36,21 +37,28 @@ if [ -n "${DOCKER_VERSION}" ]; then
3637
echo "Installing package docker-ce${DOCKER_VERSION}"
3738
ALLOW_DOWNGRADE="--allow-downgrades"
3839
fi
39-
sudo apt-get install -yq ${ALLOW_DOWNGRADE} docker-ce${DOCKER_VERSION} docker-ce-cli${DOCKER_VERSION}
40-
sudo apt-get install -yq ${ALLOW_DOWNGRADE} containerd.io docker-buildx-plugin docker-compose-plugin gcc-aarch64-linux-gnu qemu-user-static
40+
sudo apt-get install -yqf ${ALLOW_DOWNGRADE} docker-ce${DOCKER_VERSION} docker-ce-cli${DOCKER_VERSION}
41+
sudo apt-get install -yqf ${ALLOW_DOWNGRADE} containerd.io docker-buildx-plugin docker-compose-plugin gcc-aarch64-linux-gnu qemu-user-static
4142
sudo chmod 666 /var/run/docker.sock
43+
if [ -n "${DOCKER_VERSION_EXPECT}" ]; then
44+
DOCKER_VERSION_ACTUAL="$(docker version --format '{{.Server.Version}}')"
45+
if [ "${DOCKER_VERSION_EXPECT}" != "${DOCKER_VERSION_ACTUAL}" ]; then
46+
exit 1
47+
fi
48+
fi
4249
docker version
4350
docker buildx version
44-
docker buildx use default
51+
docker buildx use default || true
4552
if [ "$(dpkg --print-architecture)" = "amd64" ]; then
46-
docker run --privileged --rm tonistiigi/binfmt --install all
53+
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes ;
4754
else
48-
docker run --privileged --rm tonistiigi/binfmt --install all
55+
docker run --rm --privileged aptman/qus -- -r ;
56+
docker run --rm --privileged aptman/qus -s -- -p
4957
fi
5058
docker info
5159
echo "==============================="
5260
echo "Installing Docker compose for AMD64 / ARM64"
53-
DOCKER_COMPOSE_VERSION="v2.33.1"
61+
DOCKER_COMPOSE_VERSION="v2.26.0"
5462
curl -fsSL -o ./docker-compose "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-$(uname -m)"
5563
chmod +x ./docker-compose
5664
sudo mv ./docker-compose /usr/libexec/docker/cli-plugins
@@ -95,14 +103,14 @@ elif [ "${CLUSTER}" = "minikube" ]; then
95103
go version
96104
echo "==============================="
97105
echo "Installing CRI-CTL (CLI for CRI-compatible container runtimes)"
98-
CRICTL_VERSION="v1.32.0"
106+
CRICTL_VERSION="v1.30.0"
99107
curl -fsSL -o crictl.tar.gz https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-$CRICTL_VERSION-linux-$(dpkg --print-architecture).tar.gz
100108
sudo tar -xf crictl.tar.gz -C /usr/local/bin
101109
rm -rf crictl.tar.gz
102110
crictl --version || true
103111
echo "==============================="
104112
echo "Installing CRI-Dockerd"
105-
CRI_DOCKERD_VERSION="0.3.16"
113+
CRI_DOCKERD_VERSION="0.3.14"
106114
curl -fsSL -o cri-dockerd.tgz https://github.com/Mirantis/cri-dockerd/releases/download/v$CRI_DOCKERD_VERSION/cri-dockerd-$CRI_DOCKERD_VERSION.$(dpkg --print-architecture).tgz
107115
sudo tar -xf cri-dockerd.tgz -C /tmp
108116
sudo mv /tmp/cri-dockerd/cri-dockerd /usr/local/bin/cri-dockerd
@@ -120,7 +128,7 @@ elif [ "${CLUSTER}" = "minikube" ]; then
120128
cri-dockerd --version
121129
echo "==============================="
122130
echo "Installing CNI-Plugins (Container Network Interface)"
123-
CNI_PLUGIN_VERSION="v1.6.2"
131+
CNI_PLUGIN_VERSION="v1.4.0"
124132
CNI_PLUGIN_TAR="cni-plugins-linux-$(dpkg --print-architecture)-$CNI_PLUGIN_VERSION.tgz"
125133
CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin"
126134
curl -sLO "https://github.com/containernetworking/plugins/releases/download/$CNI_PLUGIN_VERSION/$CNI_PLUGIN_TAR"

0 commit comments

Comments
 (0)