altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: skip chromedriver install if arch is not supported in docker build

Browse source 
Commit ready for merge.
 - Legacy-Id: 19761
This commit is contained in:
nick 2021-12-08 20:13:44 +00:00
parent bf4e7474a1
commit 516877d2db
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
docker/app.Dockerfile
View file

@ -64,17 +64,11 @@ RUN apt-get install -qy \
yang-tools \ yang-tools \
zsh zsh
# Install chromedriver # Install chromedriver if supported
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \ COPY docker/scripts/app-install-chromedriver.sh /tmp/app-install-chromedriver.sh
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list && \ RUN sed -i 's/\r$//' /tmp/app-install-chromedriver.sh && \
apt-get update -y && \ chmod +x /tmp/app-install-chromedriver.sh
apt-get install -y google-chrome-stable && \ RUN /tmp/app-install-chromedriver.sh
CHROMEVER=$(google-chrome --product-version | grep -o "[^\.]*\.[^\.]*\.[^\.]*") && \
DRIVERVER=$(curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROMEVER") && \
wget -q --continue -P /chromedriver "http://chromedriver.storage.googleapis.com/$DRIVERVER/chromedriver_linux64.zip" && \
unzip /chromedriver/chromedriver* -d /chromedriver && \
ln -s /chromedriver/chromedriver /usr/local/bin/chromedriver && \
ln -s /chromedriver/chromedriver /usr/bin/chromedriver
# Get rid of installation files we don't need in the image, to reduce size # Get rid of installation files we don't need in the image, to reduce size
RUN apt-get clean && rm -rf /var/lib/apt/lists/* RUN apt-get clean && rm -rf /var/lib/apt/lists/*

1
docker/docker-compose.yml
View file

@ -39,6 +39,7 @@ services:
# (Adding the "ports" property to this file will not forward from a Codespace.) # (Adding the "ports" property to this file will not forward from a Codespace.)
db: db:
# image: ghcr.io/ngpixel/datatracker-db:nightly-20211208
build: build:
context: .. context: ..
dockerfile: docker/db.Dockerfile dockerfile: docker/db.Dockerfile

18
docker/scripts/app-install-chromedriver.sh Executable file
View file

@ -0,0 +1,18 @@
#!/bin/bash
HOSTARCH=$(arch)
if [ $HOSTARCH == "x86_64" ]; then
echo "Installing chrome driver..."
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
apt-get update -y
apt-get install -y google-chrome-stable
CHROMEVER=$(google-chrome --product-version | grep -o "[^\.]*\.[^\.]*\.[^\.]*")
DRIVERVER=$(curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROMEVER")
wget -q --continue -P /chromedriver "http://chromedriver.storage.googleapis.com/$DRIVERVER/chromedriver_linux64.zip"
unzip /chromedriver/chromedriver* -d /chromedriver
ln -s /chromedriver/chromedriver /usr/local/bin/chromedriver
ln -s /chromedriver/chromedriver /usr/bin/chromedriver
else
echo "This architecture doesn't support chromedriver. Skipping installation..."
fi