From a2da70c663a4ae24005ca67ac97f11e83919a85a Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sat, 19 Aug 2023 11:00:11 +0200 Subject: [PATCH] Remove unnecessary ARG variable in a recipe --- docs/using/recipe_code/oracledb.dockerfile | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/using/recipe_code/oracledb.dockerfile b/docs/using/recipe_code/oracledb.dockerfile index 635880a7..5e8aa391 100644 --- a/docs/using/recipe_code/oracledb.dockerfile +++ b/docs/using/recipe_code/oracledb.dockerfile @@ -1,5 +1,9 @@ FROM jupyter/base-notebook +# Fix: https://github.com/hadolint/hadolint/wiki/DL4006 +# Fix: https://github.com/koalaman/shellcheck/wiki/SC3014 +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + USER root # Install java, javac and alien @@ -12,20 +16,21 @@ RUN apt-get update --yes && \ ARG instantclient_major_version=21 ARG instantclient_version=${instantclient_major_version}.11.0.0.0-1 -ARG instantclient_url=https://download.oracle.com/otn_software/linux/instantclient/2111000 # Then install Oracle SQL Instant client, SQL+Plus, tools and JDBC. # Note: You may need to change the URL to a newer version. # See: https://www.oracle.com/es/database/technologies/instant-client/linux-x86-64-downloads.html WORKDIR "/tmp" -RUN wget --progress=dot:giga ${instantclient_url}/oracle-instantclient-basiclite-${instantclient_version}.el8.x86_64.rpm && \ - alien --install --scripts oracle-instantclient-basiclite-${instantclient_version}.el8.x86_64.rpm && \ - wget --progress=dot:giga ${instantclient_url}/oracle-instantclient-sqlplus-${instantclient_version}.el8.x86_64.rpm && \ - alien --install --scripts oracle-instantclient-sqlplus-${instantclient_version}.el8.x86_64.rpm && \ - wget --progress=dot:giga ${instantclient_url}/oracle-instantclient-tools-${instantclient_version}.el8.x86_64.rpm && \ - alien --install --scripts oracle-instantclient-tools-${instantclient_version}.el8.x86_64.rpm && \ - wget --progress=dot:giga ${instantclient_url}/oracle-instantclient-jdbc-${instantclient_version}.el8.x86_64.rpm && \ - alien --install --scripts oracle-instantclient-jdbc-${instantclient_version}.el8.x86_64.rpm && \ +RUN short_version="$(echo "${instantclient_version}" | tr -d '.' | cut -d "-" -f1)" && \ + instantclient_url="https://download.oracle.com/otn_software/linux/instantclient/${short_version}" && \ + wget --progress=dot:giga "${instantclient_url}/oracle-instantclient-basiclite-${instantclient_version}.el8.x86_64.rpm" && \ + alien --install --scripts "oracle-instantclient-basiclite-${instantclient_version}.el8.x86_64.rpm" && \ + wget --progress=dot:giga "${instantclient_url}/oracle-instantclient-sqlplus-${instantclient_version}.el8.x86_64.rpm" && \ + alien --install --scripts "oracle-instantclient-sqlplus-${instantclient_version}.el8.x86_64.rpm" && \ + wget --progress=dot:giga "${instantclient_url}/oracle-instantclient-tools-${instantclient_version}.el8.x86_64.rpm" && \ + alien --install --scripts "oracle-instantclient-tools-${instantclient_version}.el8.x86_64.rpm" && \ + wget --progress=dot:giga "${instantclient_url}/oracle-instantclient-jdbc-${instantclient_version}.el8.x86_64.rpm" && \ + alien --install --scripts "oracle-instantclient-jdbc-${instantclient_version}.el8.x86_64.rpm" && \ chown -R "${NB_UID}":"${NB_GID}" "${HOME}/.rpmdb" && \ rm -f ./*.rpm