Skip to content

Commit a2da70c

Browse files
committed
Remove unnecessary ARG variable in a recipe
1 parent aac56a6 commit a2da70c

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

docs/using/recipe_code/oracledb.dockerfile

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
FROM jupyter/base-notebook
22

3+
# Fix: https://github.com/hadolint/hadolint/wiki/DL4006
4+
# Fix: https://github.com/koalaman/shellcheck/wiki/SC3014
5+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
6+
37
USER root
48

59
# Install java, javac and alien
@@ -12,20 +16,21 @@ RUN apt-get update --yes && \
1216

1317
ARG instantclient_major_version=21
1418
ARG instantclient_version=${instantclient_major_version}.11.0.0.0-1
15-
ARG instantclient_url=https://download.oracle.com/otn_software/linux/instantclient/2111000
1619

1720
# Then install Oracle SQL Instant client, SQL+Plus, tools and JDBC.
1821
# Note: You may need to change the URL to a newer version.
1922
# See: https://www.oracle.com/es/database/technologies/instant-client/linux-x86-64-downloads.html
2023
WORKDIR "/tmp"
21-
RUN wget --progress=dot:giga ${instantclient_url}/oracle-instantclient-basiclite-${instantclient_version}.el8.x86_64.rpm && \
22-
alien --install --scripts oracle-instantclient-basiclite-${instantclient_version}.el8.x86_64.rpm && \
23-
wget --progress=dot:giga ${instantclient_url}/oracle-instantclient-sqlplus-${instantclient_version}.el8.x86_64.rpm && \
24-
alien --install --scripts oracle-instantclient-sqlplus-${instantclient_version}.el8.x86_64.rpm && \
25-
wget --progress=dot:giga ${instantclient_url}/oracle-instantclient-tools-${instantclient_version}.el8.x86_64.rpm && \
26-
alien --install --scripts oracle-instantclient-tools-${instantclient_version}.el8.x86_64.rpm && \
27-
wget --progress=dot:giga ${instantclient_url}/oracle-instantclient-jdbc-${instantclient_version}.el8.x86_64.rpm && \
28-
alien --install --scripts oracle-instantclient-jdbc-${instantclient_version}.el8.x86_64.rpm && \
24+
RUN short_version="$(echo "${instantclient_version}" | tr -d '.' | cut -d "-" -f1)" && \
25+
instantclient_url="https://download.oracle.com/otn_software/linux/instantclient/${short_version}" && \
26+
wget --progress=dot:giga "${instantclient_url}/oracle-instantclient-basiclite-${instantclient_version}.el8.x86_64.rpm" && \
27+
alien --install --scripts "oracle-instantclient-basiclite-${instantclient_version}.el8.x86_64.rpm" && \
28+
wget --progress=dot:giga "${instantclient_url}/oracle-instantclient-sqlplus-${instantclient_version}.el8.x86_64.rpm" && \
29+
alien --install --scripts "oracle-instantclient-sqlplus-${instantclient_version}.el8.x86_64.rpm" && \
30+
wget --progress=dot:giga "${instantclient_url}/oracle-instantclient-tools-${instantclient_version}.el8.x86_64.rpm" && \
31+
alien --install --scripts "oracle-instantclient-tools-${instantclient_version}.el8.x86_64.rpm" && \
32+
wget --progress=dot:giga "${instantclient_url}/oracle-instantclient-jdbc-${instantclient_version}.el8.x86_64.rpm" && \
33+
alien --install --scripts "oracle-instantclient-jdbc-${instantclient_version}.el8.x86_64.rpm" && \
2934
chown -R "${NB_UID}":"${NB_GID}" "${HOME}/.rpmdb" && \
3035
rm -f ./*.rpm
3136

0 commit comments

Comments
 (0)