Skip to content

Commit 765aaa0

Browse files
committed
Avoided repeating the drivers' path many times
1 parent 35399b7 commit 765aaa0

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ ENV ROBOT_FRAMEWORK_BASE_FOLDER="/opt/robotframework"
1212
# Set the Python dependencies' directory environment variable
1313
ENV ROBOT_DEPENDENCY_DIR="${ROBOT_FRAMEWORK_BASE_FOLDER}/dependencies"
1414

15+
# Set the browser drivers' directory environment variable
16+
ENV ROBOT_DRIVER_DIR="${ROBOT_FRAMEWORK_BASE_FOLDER}/drivers"
17+
1518
# Set the reports directory environment variable
1619
ENV ROBOT_REPORTS_DIR="${ROBOT_FRAMEWORK_BASE_FOLDER}/reports"
1720

@@ -118,8 +121,8 @@ RUN if [ `uname --machine` == "x86_64" ]; \
118121
fi \
119122
&& wget -q "https://github.com/mozilla/geckodriver/releases/download/${GECKO_DRIVER_VERSION}/geckodriver-${GECKO_DRIVER_VERSION}-${PLATFORM}.tar.gz" \
120123
&& tar xzf geckodriver-${GECKO_DRIVER_VERSION}-${PLATFORM}.tar.gz \
121-
&& mkdir -p ${ROBOT_FRAMEWORK_BASE_FOLDER}/drivers/ \
122-
&& mv geckodriver ${ROBOT_FRAMEWORK_BASE_FOLDER}/drivers/geckodriver \
124+
&& mkdir -p ${ROBOT_DRIVER_DIR}/ \
125+
&& mv geckodriver ${ROBOT_DRIVER_DIR}/geckodriver \
123126
&& rm geckodriver-${GECKO_DRIVER_VERSION}-${PLATFORM}.tar.gz
124127

125128
# Install Microsoft Edge & webdriver
@@ -139,8 +142,8 @@ RUN if [ `uname --machine` == "x86_64" ]; \
139142
zip \
140143
&& wget -q "https://msedgedriver.microsoft.com/${MICROSOFT_EDGE_VERSION}/edgedriver_${PLATFORM}.zip" \
141144
&& unzip edgedriver_${PLATFORM}.zip -d edge \
142-
&& mv edge/msedgedriver ${ROBOT_FRAMEWORK_BASE_FOLDER}/drivers/msedgedriver-original \
143-
&& chmod ugo+x ${ROBOT_FRAMEWORK_BASE_FOLDER}/drivers/msedgedriver-original \
145+
&& mv edge/msedgedriver ${ROBOT_DRIVER_DIR}/msedgedriver-original \
146+
&& chmod ugo+x ${ROBOT_DRIVER_DIR}/msedgedriver-original \
144147
&& rm -Rf edgedriver_${PLATFORM}.zip edge/ \
145148
# IMPORTANT: don't remove the wget package because it's a dependency of Microsoft Edge
146149
&& dnf remove -y \
@@ -168,7 +171,7 @@ RUN mkdir -p ${ROBOT_REPORTS_DIR} \
168171
&& chmod -R ugo+w ${ROBOT_REPORTS_DIR} ${ROBOT_WORK_DIR} \
169172
\
170173
# Allow any user to run the drivers and write logs
171-
&& chmod ugo+x ${ROBOT_FRAMEWORK_BASE_FOLDER}/drivers \
174+
&& chmod ugo+x ${ROBOT_DRIVER_DIR} \
172175
&& chmod ugo+w /var/log \
173176
&& chown ${ROBOT_UID}:${ROBOT_GID} /var/log \
174177
\
@@ -178,7 +181,7 @@ RUN mkdir -p ${ROBOT_REPORTS_DIR} \
178181
&& chmod 777 ${ROBOT_DEPENDENCY_DIR}
179182

180183
# Update system path
181-
ENV PATH=${ROBOT_FRAMEWORK_BASE_FOLDER}/bin:${ROBOT_FRAMEWORK_BASE_FOLDER}/drivers:$PATH
184+
ENV PATH=${ROBOT_FRAMEWORK_BASE_FOLDER}/bin:${ROBOT_DRIVER_DIR}:$PATH
182185

183186
# Set up a volume for the generated reports
184187
VOLUME ${ROBOT_REPORTS_DIR}

0 commit comments

Comments
 (0)