Skip to content

Commit 078c881

Browse files
committed
Revert "Creating grid-base, to enable creating browser only containers"
This reverts commit d30eac8 This approach is creating duplication and it will make maintenance harder
1 parent d30eac8 commit 078c881

File tree

14 files changed

+15
-190
lines changed

14 files changed

+15
-190
lines changed

Base/Dockerfile

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic-20200311
1+
FROM ubuntu:bionic-20191029
22
LABEL authors="Selenium <[email protected]>"
33

44
#================================================
@@ -18,27 +18,19 @@ ENV DEBIAN_FRONTEND=noninteractive \
1818
#========================
1919
RUN apt-get -qqy update \
2020
&& apt-get -qqy --no-install-recommends install \
21-
# bzip2 - high-quality block-sorting file compressor - utilities https://packages.ubuntu.com/bionic/bzip2
2221
bzip2 \
23-
# Common CA certificates - https://packages.ubuntu.com/bionic/ca-certificates
2422
ca-certificates \
25-
# OpenJDK Java runtime, using Hotspot JIT (headless) - https://packages.ubuntu.com/bionic/openjdk-8-jre-headless
23+
openjdk-8-jre-headless \
2624
tzdata \
27-
# Provide limited super user privileges to specific users - https://packages.ubuntu.com/bionic/sudo
2825
sudo \
29-
# De-archiver for .zip files - https://packages.ubuntu.com/bionic/unzip
3026
unzip \
31-
# retrieves files from the web - https://packages.ubuntu.com/bionic/wget
3227
wget \
33-
# lightweight and flexible command-line JSON processor - https://packages.ubuntu.com/bionic/jq
3428
jq \
35-
# command line tool for transferring data with URL syntax - https://packages.ubuntu.com/bionic/curl
3629
curl \
37-
# System for controlling process state - https://packages.ubuntu.com/bionic/supervisor
3830
supervisor \
39-
# GNU privacy guard - a free PGP replacement (dummy transitional package) - https://packages.ubuntu.com/bionic/gnupg2
4031
gnupg2 \
41-
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
32+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
33+
&& sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security
4234

4335
#===================
4436
# Timezone settings
@@ -59,6 +51,11 @@ RUN useradd seluser \
5951
&& echo 'seluser:secret' | chpasswd
6052
ENV HOME=/home/seluser
6153

54+
#======================================
55+
# Add Grid check script
56+
#======================================
57+
COPY check-grid.sh entry_point.sh /opt/bin/
58+
6259
#======================================
6360
# Add Supervisor configuration file
6461
#======================================
File renamed without changes.

GridBase/Dockerfile

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

GridBase/Dockerfile.txt

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

GridBase/README-short.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

GridBase/README.md

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

GridBase/entry_point.sh

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

GridBase/generate.sh

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

GridBase/supervisord.conf

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

Hub/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/grid-base:4.0.0-alpha-5-20200326
5+
FROM selenium/base:4.0.0-alpha-5-20200326
66
LABEL authors=SeleniumHQ
77

88
USER seluser

0 commit comments

Comments
 (0)