Skip to content

Commit 6ca7089

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

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ jobs:
118118
large-packages: false
119119
- name: Checkout code
120120
uses: actions/checkout@main
121+
- name: Set up Docker
122+
uses: docker/setup-docker-action@master
123+
with:
124+
version: 'v${{ env.DOCKER_VERSION }}'
121125
- name: Set up containerd image store feature
122126
uses: nick-invision/retry@master
123127
with:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ jobs:
110110
large-packages: false
111111
- name: Checkout code
112112
uses: actions/checkout@main
113+
- name: Set up Docker
114+
uses: docker/setup-docker-action@master
115+
with:
116+
version: 'v${{ env.DOCKER_VERSION }}'
113117
- name: Set up containerd image store feature
114118
uses: nick-invision/retry@master
115119
with:

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: 3 additions & 3 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:-"27.5.1"}
66
HELM_VERSION=${HELM_VERSION:-"latest"}
77
KUBERNETES_VERSION=${KUBERNETES_VERSION:-$(curl -L -s https://dl.k8s.io/release/stable.txt)}
88

@@ -36,8 +36,8 @@ if [ -n "${DOCKER_VERSION}" ]; then
3636
echo "Installing package docker-ce${DOCKER_VERSION}"
3737
ALLOW_DOWNGRADE="--allow-downgrades"
3838
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
39+
sudo apt-get install -yqf ${ALLOW_DOWNGRADE} docker-ce${DOCKER_VERSION} docker-ce-cli${DOCKER_VERSION}
40+
sudo apt-get install -yqf ${ALLOW_DOWNGRADE} containerd.io docker-buildx-plugin docker-compose-plugin gcc-aarch64-linux-gnu qemu-user-static
4141
sudo chmod 666 /var/run/docker.sock
4242
docker version
4343
docker buildx version

0 commit comments

Comments
 (0)