Skip to content
This repository was archived by the owner on Jun 22, 2024. It is now read-only.

Commit b7a012c

Browse files
jamesmortensenjamesmortensen
committed
Removed unneeded scripts added earlier. Moved Firefox build and deploy process to build.sh and build-and-deploy-multi-arch.sh. Added defaults for environment variables in those scripts. Renamed build-step-2.sh to generate-arm.sh
1 parent 70ae225 commit b7a012c

File tree

13 files changed

+70
-176
lines changed

13 files changed

+70
-176
lines changed

‎Hub/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM local-seleniarm/base:4.1.2-20220302
6-
LABEL authors=SeleniumHQ
5+
FROM seleniarm/base:4.1.2-20220327
6+
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER 1200
99

‎NodeBase/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM local-seleniarm/base:4.1.2-20220302
6-
LABEL authors=SeleniumHQ
5+
FROM seleniarm/base:4.1.2-20220327
6+
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER root
99

‎NodeChromium/Dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM local-seleniarm/node-base:4.1.2-20220302
6-
LABEL authors=SeleniumHQ
5+
FROM seleniarm/node-base:4.1.2-20220327
6+
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER root
99

1010
# Install Chromium
1111
# RUN echo "deb http://http.us.debian.org/debian/ stable non-free contrib main" >> /etc/apt/sources.list \
12-
RUN echo "deb http://ftp.hk.debian.org/debian/ sid main" >> /etc/apt/sources.list \
12+
RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
1313
&& apt-get update -qqy \
1414
# && apt-get -qqy install chromium=89.0.4389.82-1 \
1515
# && apt-get -qqy install chromium=90.0.4430.212-1 \
1616
# && apt-get -qqy install chromium=93.0.4577.82-1 \
1717
# && apt-get -qqy install chromium=97.0.4692.71-0.1 \
18-
&& apt-get -qqy install chromium=98.0.4758.102-1+b1 \
18+
# && apt-get -qqy install chromium=98.0.4758.102-1+b1 \
19+
&& apt-get -qqy install chromium \
1920
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2021

2122
#=================================

‎NodeFirefox/Dockerfile‎

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,44 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM local-seleniarm/node-base:4.1.2-20220302
6-
LABEL authors=SeleniumHQ
7-
8-
#FROM local-seleniarm/node-base:4.0.0-20211018
9-
#LABEL authors=SeleniumHQ,sj26,jamesmortensen
10-
11-
ARG TARGETARCH
12-
ARG TARGETVARIANT
5+
FROM seleniarm/node-base:4.1.2-20220327
6+
LABEL authors=SeleniumHQ,sj26,jamesmortensen
137

148
USER root
159

1610
#=========
1711
# Firefox
1812
#=========
19-
RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \
13+
ARG FIREFOX_VERSION=latest
14+
RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "latest" ] || [ $FIREFOX_VERSION = "nightly-latest" ] || [ $FIREFOX_VERSION = "devedition-latest" ] || [ $FIREFOX_VERSION = "esr-latest" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \
2015
&& apt-get update -qqy \
21-
# && apt-get -qqy install firefox-esr libavcodec-extra \
22-
&& apt-get -qqy install firefox libavcodec-extra \
23-
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
16+
&& apt-get -qqy --no-install-recommends install firefox libavcodec-extra \
17+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
18+
&& wget --no-verbose -O /tmp/firefox.tar.bz2 $FIREFOX_DOWNLOAD_URL \
19+
&& apt-get -y purge firefox \
20+
&& rm -rf /opt/firefox \
21+
&& tar -C /opt -xjf /tmp/firefox.tar.bz2 \
22+
&& rm /tmp/firefox.tar.bz2 \
23+
&& mv /opt/firefox /opt/firefox-$FIREFOX_VERSION \
24+
&& ln -fs /opt/firefox-$FIREFOX_VERSION/firefox /usr/bin/firefox
2425

25-
#=============
26-
# geckodriver
27-
#=============
28-
RUN if [ $TARGETARCH = "arm" ] && [ $TARGETVARIANT = "v7" ]; then \
29-
export ARCH=armhf ; \
30-
else \
31-
export ARCH=$TARGETARCH ; \
32-
fi ; \
33-
if [ -z "$ARCH" ]; then \
34-
echo "*** BUILD ERROR: \$TARGETARCH must be arm64, amd64, or arm with \$TARGETVARIANT set to v7... exiting..." ; \
35-
exit 1 ; \
36-
fi ; \
37-
if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \
38-
wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/jamesmortensen/geckodriver-arm-binaries/releases/download/v0.30.0/geckodriver-v0.30.0-linux-aarch64.tar.gz ; \
39-
else \
40-
wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz ; \
41-
fi ; \
42-
tar -C /tmp -zxf /tmp/geckodriver.tar.gz ; \
43-
rm /tmp/geckodriver.tar.gz ; \
44-
mkdir -p /opt/geckodriver-bin ; \
45-
mv /tmp/geckodriver /opt/geckodriver-bin/geckodriver ; \
46-
echo "Symlinking geckodriver to /usr/local/bin/geckodriver" ; \
47-
ln -s /opt/geckodriver-bin/geckodriver /usr/local/bin/geckodriver ; \
48-
chmod 755 /usr/local/bin/geckodriver
26+
#============
27+
# GeckoDriver
28+
#============
29+
ARG GECKODRIVER_VERSION=latest
30+
RUN GK_VERSION=$(if [ ${GECKODRIVER_VERSION:-latest} = "latest" ]; then echo "0.30.0"; else echo $GECKODRIVER_VERSION; fi) \
31+
&& echo "Using GeckoDriver version: "$GK_VERSION \
32+
&& wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GK_VERSION/geckodriver-v$GK_VERSION-linux64.tar.gz \
33+
&& rm -rf /opt/geckodriver \
34+
&& tar -C /opt -zxf /tmp/geckodriver.tar.gz \
35+
&& rm /tmp/geckodriver.tar.gz \
36+
&& mv /opt/geckodriver /opt/geckodriver-$GK_VERSION \
37+
&& chmod 755 /opt/geckodriver-$GK_VERSION \
38+
&& ln -fs /opt/geckodriver-$GK_VERSION /usr/bin/geckodriver
4939

5040
USER 1200
5141

5242
#============================================
5343
# Dumping Browser name and version for config
5444
#============================================
55-
RUN echo "firefox" > /opt/selenium/browser_name
45+
RUN echo "firefox" > /opt/selenium/browser_name

‎NodeFirefox/Dockerfile-geckodriver-arm64‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎NodeFirefox/build-step-1.sh‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎NodeFirefox/build-step-3.sh‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎NodeFirefox/build-step-2.sh‎ renamed to ‎NodeFirefox/generate-arm.sh‎

File renamed without changes.

‎StandaloneChromium/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM local-seleniarm/node-chromium:4.1.2-20220302
6-
LABEL authors=SeleniumHQ
5+
FROM seleniarm/node-chromium:4.1.2-20220327
6+
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER 1200
99

‎StandaloneFirefox/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM local-seleniarm/node-firefox:4.1.2-20220302
6-
LABEL authors=SeleniumHQ
5+
FROM seleniarm/node-firefox:4.1.2-20220327
6+
LABEL authors=SeleniumHQ,sj26,jamesmortensen
77

88
USER 1200
99

0 commit comments

Comments
 (0)