Skip to content

Commit ceb9a44

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

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ 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

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: 4 additions & 4 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

@@ -36,12 +36,12 @@ 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
44-
docker buildx use default
44+
docker buildx use default || true
4545
if [ "$(dpkg --print-architecture)" = "amd64" ]; then
4646
docker run --privileged --rm tonistiigi/binfmt --install all
4747
else

0 commit comments

Comments
 (0)