From e44e63f465560ac7c7b39ece2497012a44d3c771 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 13 Sep 2024 12:22:39 +0000 Subject: [PATCH 01/25] Instal odbc --- docker-bits/0_cpu.Dockerfile | 7 ++++++ docker-bits/0_cpu_sas.Dockerfile | 7 +++++- .../odbc-drivers-install.sh | 24 +++++++++++++++++++ output/jupyterlab-cpu/Dockerfile | 7 ++++++ output/jupyterlab-cpu/odbc-drivers-install.sh | 24 +++++++++++++++++++ output/jupyterlab-pytorch/Dockerfile | 7 ++++++ .../odbc-drivers-install.sh | 24 +++++++++++++++++++ output/jupyterlab-tensorflow/Dockerfile | 7 ++++++ .../odbc-drivers-install.sh | 24 +++++++++++++++++++ output/remote-desktop/odbc-drivers-install.sh | 24 +++++++++++++++++++ output/rstudio/Dockerfile | 7 ++++++ output/rstudio/odbc-drivers-install.sh | 24 +++++++++++++++++++ output/sas/Dockerfile | 7 +++++- output/sas/odbc-drivers-install.sh | 24 +++++++++++++++++++ resources/common/odbc-drivers-install.sh | 24 +++++++++++++++++++ 15 files changed, 239 insertions(+), 2 deletions(-) create mode 100755 output/docker-stacks-datascience-notebook/odbc-drivers-install.sh create mode 100755 output/jupyterlab-cpu/odbc-drivers-install.sh create mode 100755 output/jupyterlab-pytorch/odbc-drivers-install.sh create mode 100755 output/jupyterlab-tensorflow/odbc-drivers-install.sh create mode 100755 output/remote-desktop/odbc-drivers-install.sh create mode 100755 output/rstudio/odbc-drivers-install.sh create mode 100755 output/sas/odbc-drivers-install.sh create mode 100755 resources/common/odbc-drivers-install.sh diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 570effd5a..6c1c2f23f 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -19,3 +19,10 @@ RUN apt-get update --yes \ && apt-get upgrade --yes libwebp7 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh + + +# Update the package list +RUN sudo apt-get update + +# Install unixODBC and psqlODBC +RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc \ No newline at end of file diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 9a2e11cb4..8a031107d 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -24,4 +24,9 @@ RUN apt-get update --yes \ RUN pip install --force-reinstall cryptography==39.0.1 && \ fix-permissions $CONDA_DIR && \ fix-permissions /home/$NB_USER - \ No newline at end of file + +# Update the package list +RUN sudo apt-get update + +# Install unixODBC and psqlODBC +RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc \ No newline at end of file diff --git a/output/docker-stacks-datascience-notebook/odbc-drivers-install.sh b/output/docker-stacks-datascience-notebook/odbc-drivers-install.sh new file mode 100755 index 000000000..2b6a486ac --- /dev/null +++ b/output/docker-stacks-datascience-notebook/odbc-drivers-install.sh @@ -0,0 +1,24 @@ +if ! [[ "18.04 20.04 22.04 23.04 24.04" == *"$(lsb_release -rs)"* ]]; +then + echo "Ubuntu $(lsb_release -rs) is not currently supported."; + exit; +fi + +# Add the signature to trust the Microsoft repo +# For Ubuntu versions < 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc +# For Ubuntu versions >= 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +# Add repo to apt sources +curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + +# Install the driver +sudo apt-get update +sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 +# optional: for bcp and sqlcmd +sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18 +echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc +source ~/.bashrc +# optional: for unixODBC development headers +sudo apt-get install -y unixodbc-dev \ No newline at end of file diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 5ea543386..7e40ea2f2 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -30,6 +30,13 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh + +# Update the package list +RUN sudo apt-get update + +# Install unixODBC and psqlODBC +RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc + ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### diff --git a/output/jupyterlab-cpu/odbc-drivers-install.sh b/output/jupyterlab-cpu/odbc-drivers-install.sh new file mode 100755 index 000000000..2b6a486ac --- /dev/null +++ b/output/jupyterlab-cpu/odbc-drivers-install.sh @@ -0,0 +1,24 @@ +if ! [[ "18.04 20.04 22.04 23.04 24.04" == *"$(lsb_release -rs)"* ]]; +then + echo "Ubuntu $(lsb_release -rs) is not currently supported."; + exit; +fi + +# Add the signature to trust the Microsoft repo +# For Ubuntu versions < 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc +# For Ubuntu versions >= 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +# Add repo to apt sources +curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + +# Install the driver +sudo apt-get update +sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 +# optional: for bcp and sqlcmd +sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18 +echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc +source ~/.bashrc +# optional: for unixODBC development headers +sudo apt-get install -y unixodbc-dev \ No newline at end of file diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index e99238c4f..e97d16612 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -30,6 +30,13 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh + +# Update the package list +RUN sudo apt-get update + +# Install unixODBC and psqlODBC +RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc + ############################### ### docker-bits/2_pytorch.Dockerfile ############################### diff --git a/output/jupyterlab-pytorch/odbc-drivers-install.sh b/output/jupyterlab-pytorch/odbc-drivers-install.sh new file mode 100755 index 000000000..2b6a486ac --- /dev/null +++ b/output/jupyterlab-pytorch/odbc-drivers-install.sh @@ -0,0 +1,24 @@ +if ! [[ "18.04 20.04 22.04 23.04 24.04" == *"$(lsb_release -rs)"* ]]; +then + echo "Ubuntu $(lsb_release -rs) is not currently supported."; + exit; +fi + +# Add the signature to trust the Microsoft repo +# For Ubuntu versions < 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc +# For Ubuntu versions >= 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +# Add repo to apt sources +curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + +# Install the driver +sudo apt-get update +sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 +# optional: for bcp and sqlcmd +sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18 +echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc +source ~/.bashrc +# optional: for unixODBC development headers +sudo apt-get install -y unixodbc-dev \ No newline at end of file diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index d3808f60e..4daa8d51e 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -30,6 +30,13 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh + +# Update the package list +RUN sudo apt-get update + +# Install unixODBC and psqlODBC +RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc + ############################### ### docker-bits/1_CUDA-11.8.0.Dockerfile ############################### diff --git a/output/jupyterlab-tensorflow/odbc-drivers-install.sh b/output/jupyterlab-tensorflow/odbc-drivers-install.sh new file mode 100755 index 000000000..2b6a486ac --- /dev/null +++ b/output/jupyterlab-tensorflow/odbc-drivers-install.sh @@ -0,0 +1,24 @@ +if ! [[ "18.04 20.04 22.04 23.04 24.04" == *"$(lsb_release -rs)"* ]]; +then + echo "Ubuntu $(lsb_release -rs) is not currently supported."; + exit; +fi + +# Add the signature to trust the Microsoft repo +# For Ubuntu versions < 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc +# For Ubuntu versions >= 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +# Add repo to apt sources +curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + +# Install the driver +sudo apt-get update +sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 +# optional: for bcp and sqlcmd +sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18 +echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc +source ~/.bashrc +# optional: for unixODBC development headers +sudo apt-get install -y unixodbc-dev \ No newline at end of file diff --git a/output/remote-desktop/odbc-drivers-install.sh b/output/remote-desktop/odbc-drivers-install.sh new file mode 100755 index 000000000..2b6a486ac --- /dev/null +++ b/output/remote-desktop/odbc-drivers-install.sh @@ -0,0 +1,24 @@ +if ! [[ "18.04 20.04 22.04 23.04 24.04" == *"$(lsb_release -rs)"* ]]; +then + echo "Ubuntu $(lsb_release -rs) is not currently supported."; + exit; +fi + +# Add the signature to trust the Microsoft repo +# For Ubuntu versions < 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc +# For Ubuntu versions >= 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +# Add repo to apt sources +curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + +# Install the driver +sudo apt-get update +sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 +# optional: for bcp and sqlcmd +sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18 +echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc +source ~/.bashrc +# optional: for unixODBC development headers +sudo apt-get install -y unixodbc-dev \ No newline at end of file diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index fd1a74b44..1a20d2138 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -30,6 +30,13 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh + +# Update the package list +RUN sudo apt-get update + +# Install unixODBC and psqlODBC +RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc + ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### diff --git a/output/rstudio/odbc-drivers-install.sh b/output/rstudio/odbc-drivers-install.sh new file mode 100755 index 000000000..2b6a486ac --- /dev/null +++ b/output/rstudio/odbc-drivers-install.sh @@ -0,0 +1,24 @@ +if ! [[ "18.04 20.04 22.04 23.04 24.04" == *"$(lsb_release -rs)"* ]]; +then + echo "Ubuntu $(lsb_release -rs) is not currently supported."; + exit; +fi + +# Add the signature to trust the Microsoft repo +# For Ubuntu versions < 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc +# For Ubuntu versions >= 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +# Add repo to apt sources +curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + +# Install the driver +sudo apt-get update +sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 +# optional: for bcp and sqlcmd +sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18 +echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc +source ~/.bashrc +# optional: for unixODBC development headers +sudo apt-get install -y unixodbc-dev \ No newline at end of file diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 5a5f0de7c..f9b6ecc79 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -29,7 +29,12 @@ RUN apt-get update --yes \ RUN pip install --force-reinstall cryptography==39.0.1 && \ fix-permissions $CONDA_DIR && \ fix-permissions /home/$NB_USER - + +# Update the package list +RUN sudo apt-get update + +# Install unixODBC and psqlODBC +RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc ############################### ### docker-bits/3_Kubeflow.Dockerfile diff --git a/output/sas/odbc-drivers-install.sh b/output/sas/odbc-drivers-install.sh new file mode 100755 index 000000000..2b6a486ac --- /dev/null +++ b/output/sas/odbc-drivers-install.sh @@ -0,0 +1,24 @@ +if ! [[ "18.04 20.04 22.04 23.04 24.04" == *"$(lsb_release -rs)"* ]]; +then + echo "Ubuntu $(lsb_release -rs) is not currently supported."; + exit; +fi + +# Add the signature to trust the Microsoft repo +# For Ubuntu versions < 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc +# For Ubuntu versions >= 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +# Add repo to apt sources +curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + +# Install the driver +sudo apt-get update +sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 +# optional: for bcp and sqlcmd +sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18 +echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc +source ~/.bashrc +# optional: for unixODBC development headers +sudo apt-get install -y unixodbc-dev \ No newline at end of file diff --git a/resources/common/odbc-drivers-install.sh b/resources/common/odbc-drivers-install.sh new file mode 100755 index 000000000..2b6a486ac --- /dev/null +++ b/resources/common/odbc-drivers-install.sh @@ -0,0 +1,24 @@ +if ! [[ "18.04 20.04 22.04 23.04 24.04" == *"$(lsb_release -rs)"* ]]; +then + echo "Ubuntu $(lsb_release -rs) is not currently supported."; + exit; +fi + +# Add the signature to trust the Microsoft repo +# For Ubuntu versions < 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc +# For Ubuntu versions >= 24.04 +curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + +# Add repo to apt sources +curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + +# Install the driver +sudo apt-get update +sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 +# optional: for bcp and sqlcmd +sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18 +echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc +source ~/.bashrc +# optional: for unixODBC development headers +sudo apt-get install -y unixodbc-dev \ No newline at end of file From af1bd2083cf53fa4b1df7615d255b5676a96555d Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 13 Sep 2024 15:43:41 +0000 Subject: [PATCH 02/25] Try with msodbc package --- docker-bits/0_cpu.Dockerfile | 2 +- output/jupyterlab-cpu/Dockerfile | 2 +- output/jupyterlab-pytorch/Dockerfile | 2 +- output/jupyterlab-tensorflow/Dockerfile | 2 +- output/rstudio/Dockerfile | 2 +- output/sas/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 6c1c2f23f..942564571 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -25,4 +25,4 @@ RUN apt-get update --yes \ RUN sudo apt-get update # Install unixODBC and psqlODBC -RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc \ No newline at end of file +RUN sudo apt-get install -y msodbcsql18 \ No newline at end of file diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 7e40ea2f2..bc12e95e2 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update --yes \ RUN sudo apt-get update # Install unixODBC and psqlODBC -RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc +RUN sudo apt-get install -y msodbcsql18 ############################### ### docker-bits/3_Kubeflow.Dockerfile diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index e97d16612..ac42d694e 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update --yes \ RUN sudo apt-get update # Install unixODBC and psqlODBC -RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc +RUN sudo apt-get install -y msodbcsql18 ############################### ### docker-bits/2_pytorch.Dockerfile diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 4daa8d51e..fcac49a26 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update --yes \ RUN sudo apt-get update # Install unixODBC and psqlODBC -RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc +RUN sudo apt-get install -y msodbcsql18 ############################### ### docker-bits/1_CUDA-11.8.0.Dockerfile diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 1a20d2138..3f70d3ef5 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update --yes \ RUN sudo apt-get update # Install unixODBC and psqlODBC -RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc +RUN sudo apt-get install -y msodbcsql18 ############################### ### docker-bits/3_Kubeflow.Dockerfile diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index f9b6ecc79..1d3b84110 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -34,7 +34,7 @@ RUN pip install --force-reinstall cryptography==39.0.1 && \ RUN sudo apt-get update # Install unixODBC and psqlODBC -RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc +RUN sudo apt-get install -y msodbcsql18 ############################### ### docker-bits/3_Kubeflow.Dockerfile From 3b470e1f44a82756733656b72a53dac15074aeb5 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 13 Sep 2024 15:56:34 +0000 Subject: [PATCH 03/25] Forgot a file --- docker-bits/0_cpu_sas.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 8a031107d..93a174cb7 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -29,4 +29,4 @@ RUN pip install --force-reinstall cryptography==39.0.1 && \ RUN sudo apt-get update # Install unixODBC and psqlODBC -RUN sudo apt-get install -y unixodbc unixodbc-dev psqlodbc \ No newline at end of file +RUN sudo apt-get install -y msodbcsql18 \ No newline at end of file From 463c6000a37d8851bf6569797237db9f7702b1df Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 13 Sep 2024 17:24:15 +0000 Subject: [PATCH 04/25] Same location --- docker-bits/0_cpu.Dockerfile | 8 +------- docker-bits/0_cpu_sas.Dockerfile | 9 ++------- output/jupyterlab-cpu/Dockerfile | 8 +------- output/jupyterlab-pytorch/Dockerfile | 8 +------- output/jupyterlab-tensorflow/Dockerfile | 8 +------- output/rstudio/Dockerfile | 8 +------- output/sas/Dockerfile | 7 +------ 7 files changed, 8 insertions(+), 48 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 942564571..5c1a0d6c7 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -17,12 +17,6 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ + && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh - - -# Update the package list -RUN sudo apt-get update - -# Install unixODBC and psqlODBC -RUN sudo apt-get install -y msodbcsql18 \ No newline at end of file diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 93a174cb7..8a2b9388f 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -16,6 +16,7 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ + && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh @@ -23,10 +24,4 @@ RUN apt-get update --yes \ #TODO: Evaluate if this is still necessary when updating the base image RUN pip install --force-reinstall cryptography==39.0.1 && \ fix-permissions $CONDA_DIR && \ - fix-permissions /home/$NB_USER - -# Update the package list -RUN sudo apt-get update - -# Install unixODBC and psqlODBC -RUN sudo apt-get install -y msodbcsql18 \ No newline at end of file + fix-permissions /home/$NB_USER \ No newline at end of file diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index bc12e95e2..97e2a2336 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -27,16 +27,10 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ + && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh - -# Update the package list -RUN sudo apt-get update - -# Install unixODBC and psqlODBC -RUN sudo apt-get install -y msodbcsql18 - ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index ac42d694e..a07991e5c 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -27,16 +27,10 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ + && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh - -# Update the package list -RUN sudo apt-get update - -# Install unixODBC and psqlODBC -RUN sudo apt-get install -y msodbcsql18 - ############################### ### docker-bits/2_pytorch.Dockerfile ############################### diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index fcac49a26..ecdf071ba 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -27,16 +27,10 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ + && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh - -# Update the package list -RUN sudo apt-get update - -# Install unixODBC and psqlODBC -RUN sudo apt-get install -y msodbcsql18 - ############################### ### docker-bits/1_CUDA-11.8.0.Dockerfile ############################### diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 3f70d3ef5..275299dd8 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -27,16 +27,10 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ + && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh - -# Update the package list -RUN sudo apt-get update - -# Install unixODBC and psqlODBC -RUN sudo apt-get install -y msodbcsql18 - ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 1d3b84110..c55ad9780 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -21,6 +21,7 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ + && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh @@ -30,12 +31,6 @@ RUN pip install --force-reinstall cryptography==39.0.1 && \ fix-permissions $CONDA_DIR && \ fix-permissions /home/$NB_USER -# Update the package list -RUN sudo apt-get update - -# Install unixODBC and psqlODBC -RUN sudo apt-get install -y msodbcsql18 - ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### From e207360b41513d2a4b4d8c89988690ff6411b881 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Thu, 19 Sep 2024 13:25:39 +0000 Subject: [PATCH 05/25] Instal mssql --- docker-bits/0_cpu.Dockerfile | 11 ++++++++++- docker-bits/0_cpu_sas.Dockerfile | 11 ++++++++++- output/jupyterlab-cpu/Dockerfile | 11 ++++++++++- output/jupyterlab-pytorch/Dockerfile | 11 ++++++++++- output/jupyterlab-tensorflow/Dockerfile | 11 ++++++++++- output/rstudio/Dockerfile | 11 ++++++++++- output/sas/Dockerfile | 11 ++++++++++- 7 files changed, 70 insertions(+), 7 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 5c1a0d6c7..908e0db6f 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -19,4 +19,13 @@ RUN apt-get update --yes \ && apt-get upgrade --yes libwebp7 \ && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh + && chmod +x /usr/bin/clean-layer.sh \ + && apt-get install -y gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +RUN apt-get install --yes msodbcsql18 \ No newline at end of file diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 8a2b9388f..7382f877b 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -18,7 +18,16 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh + && chmod +x /usr/bin/clean-layer.sh \ + && apt-get install -y gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +RUN apt-get install --yes msodbcsql18 #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 97e2a2336..f3a316a65 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -29,7 +29,16 @@ RUN apt-get update --yes \ && apt-get upgrade --yes libwebp7 \ && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh + && chmod +x /usr/bin/clean-layer.sh \ + && apt-get install -y gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +RUN apt-get install --yes msodbcsql18 ############################### ### docker-bits/3_Kubeflow.Dockerfile diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index a07991e5c..03c1fb210 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -29,7 +29,16 @@ RUN apt-get update --yes \ && apt-get upgrade --yes libwebp7 \ && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh + && chmod +x /usr/bin/clean-layer.sh \ + && apt-get install -y gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +RUN apt-get install --yes msodbcsql18 ############################### ### docker-bits/2_pytorch.Dockerfile diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index ecdf071ba..fb4d6c0dc 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -29,7 +29,16 @@ RUN apt-get update --yes \ && apt-get upgrade --yes libwebp7 \ && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh + && chmod +x /usr/bin/clean-layer.sh \ + && apt-get install -y gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +RUN apt-get install --yes msodbcsql18 ############################### ### docker-bits/1_CUDA-11.8.0.Dockerfile diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 275299dd8..f385b5b87 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -29,7 +29,16 @@ RUN apt-get update --yes \ && apt-get upgrade --yes libwebp7 \ && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh + && chmod +x /usr/bin/clean-layer.sh \ + && apt-get install -y gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +RUN apt-get install --yes msodbcsql18 ############################### ### docker-bits/3_Kubeflow.Dockerfile diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index c55ad9780..a8527c3dc 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -23,7 +23,16 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh + && chmod +x /usr/bin/clean-layer.sh \ + && apt-get install -y gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +RUN apt-get install --yes msodbcsql18 #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image From e28ccbc6a52f8b0c0138c59f623b8883d41e2be1 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 20 Sep 2024 13:36:13 +0000 Subject: [PATCH 06/25] Remove line --- docker-bits/0_cpu.Dockerfile | 1 - docker-bits/0_cpu_sas.Dockerfile | 1 - output/jupyterlab-cpu/Dockerfile | 1 - output/jupyterlab-pytorch/Dockerfile | 1 - output/jupyterlab-tensorflow/Dockerfile | 1 - output/rstudio/Dockerfile | 1 - output/sas/Dockerfile | 1 - 7 files changed, 7 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 908e0db6f..030ec4842 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -17,7 +17,6 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ - && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh \ && apt-get install -y gnupg \ diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 7382f877b..48da55113 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -16,7 +16,6 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ - && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh \ && apt-get install -y gnupg \ diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index f3a316a65..de17c610b 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -27,7 +27,6 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ - && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh \ && apt-get install -y gnupg \ diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index 03c1fb210..b53353762 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -27,7 +27,6 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ - && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh \ && apt-get install -y gnupg \ diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index fb4d6c0dc..981e6b575 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -27,7 +27,6 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ - && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh \ && apt-get install -y gnupg \ diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index f385b5b87..67687ecd1 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -27,7 +27,6 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ - && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh \ && apt-get install -y gnupg \ diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index a8527c3dc..6932d84d3 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -21,7 +21,6 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ - && apt-get install --yes msodbcsql18 \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh \ && apt-get install -y gnupg \ From ef30c22d32c225511ef8a6c4f81fd6fd3fcd1bb4 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 20 Sep 2024 13:58:50 +0000 Subject: [PATCH 07/25] Sudo update mandatory --- docker-bits/0_cpu.Dockerfile | 7 +++++-- docker-bits/0_cpu_sas.Dockerfile | 6 ++++-- output/jupyterlab-cpu/Dockerfile | 7 +++++-- output/jupyterlab-pytorch/Dockerfile | 7 +++++-- output/jupyterlab-tensorflow/Dockerfile | 7 +++++-- output/rstudio/Dockerfile | 7 +++++-- output/sas/Dockerfile | 6 ++++-- 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 030ec4842..d2515f079 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -18,10 +18,13 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh \ - && apt-get install -y gnupg \ + && chmod +x /usr/bin/clean-layer.sh + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ && apt-get -y install gnupg2 + RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list RUN apt-get update diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 48da55113..4d57c1911 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -17,8 +17,10 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh \ - && apt-get install -y gnupg \ + && chmod +x /usr/bin/clean-layer.sh + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index de17c610b..3b76e5bb7 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -28,10 +28,13 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh \ - && apt-get install -y gnupg \ + && chmod +x /usr/bin/clean-layer.sh + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ && apt-get -y install gnupg2 + RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list RUN apt-get update diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index b53353762..c0c0dae61 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -28,10 +28,13 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh \ - && apt-get install -y gnupg \ + && chmod +x /usr/bin/clean-layer.sh + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ && apt-get -y install gnupg2 + RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list RUN apt-get update diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 981e6b575..f6a3526f6 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -28,10 +28,13 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh \ - && apt-get install -y gnupg \ + && chmod +x /usr/bin/clean-layer.sh + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ && apt-get -y install gnupg2 + RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list RUN apt-get update diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 67687ecd1..981672b60 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -28,10 +28,13 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh \ - && apt-get install -y gnupg \ + && chmod +x /usr/bin/clean-layer.sh + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ && apt-get -y install gnupg2 + RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list RUN apt-get update diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 6932d84d3..d121ec602 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -22,8 +22,10 @@ COPY clean-layer.sh /usr/bin/clean-layer.sh RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh \ - && apt-get install -y gnupg \ + && chmod +x /usr/bin/clean-layer.sh + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg From 65e7dc36f2346e8c73a28b488ed0929c17b32fa2 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Thu, 26 Sep 2024 14:51:08 +0000 Subject: [PATCH 08/25] Test oracle --- docker-bits/0_cpu.Dockerfile | 8 +++++++- docker-bits/0_cpu_sas.Dockerfile | 9 +++++++++ output/jupyterlab-cpu/Dockerfile | 8 +++++++- output/jupyterlab-pytorch/Dockerfile | 8 +++++++- output/jupyterlab-tensorflow/Dockerfile | 8 +++++++- output/rstudio/Dockerfile | 8 +++++++- output/sas/Dockerfile | 9 +++++++++ 7 files changed, 53 insertions(+), 5 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index d2515f079..dc6fc0884 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -30,4 +30,10 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get install --yes msodbcsql18 \ No newline at end of file +RUN apt-get update --yes \ + && sudo apt-get -y install alien \ + && apt-get -y install libaio1 + +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 4d57c1911..7a46a50ff 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -30,6 +30,15 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get install --yes msodbcsql18 +RUN apt-get update --yes \ + && sudo apt-get -y install alien \ + && apt-get -y install libaio1 + +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' + + #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image RUN pip install --force-reinstall cryptography==39.0.1 && \ diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 3b76e5bb7..823791972 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -40,7 +40,13 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get install --yes msodbcsql18 +RUN apt-get update --yes \ + && sudo apt-get -y install alien \ + && apt-get -y install libaio1 + +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' ############################### ### docker-bits/3_Kubeflow.Dockerfile diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index c0c0dae61..e363b2bc0 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -40,7 +40,13 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get install --yes msodbcsql18 +RUN apt-get update --yes \ + && sudo apt-get -y install alien \ + && apt-get -y install libaio1 + +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' ############################### ### docker-bits/2_pytorch.Dockerfile diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index f6a3526f6..42e38d033 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -40,7 +40,13 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get install --yes msodbcsql18 +RUN apt-get update --yes \ + && sudo apt-get -y install alien \ + && apt-get -y install libaio1 + +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' ############################### ### docker-bits/1_CUDA-11.8.0.Dockerfile diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 981672b60..26735dec5 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -40,7 +40,13 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get install --yes msodbcsql18 +RUN apt-get update --yes \ + && sudo apt-get -y install alien \ + && apt-get -y install libaio1 + +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' ############################### ### docker-bits/3_Kubeflow.Dockerfile diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index d121ec602..00fb205c9 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -35,6 +35,15 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get install --yes msodbcsql18 +RUN apt-get update --yes \ + && sudo apt-get -y install alien \ + && apt-get -y install libaio1 + +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' + + #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image RUN pip install --force-reinstall cryptography==39.0.1 && \ From a4e07a57c96a8778fd7f62f773cb8318e549f1f2 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 27 Sep 2024 13:58:28 +0000 Subject: [PATCH 09/25] Try with zip --- docker-bits/0_cpu.Dockerfile | 9 ++++++--- output/jupyterlab-cpu/Dockerfile | 9 ++++++--- output/jupyterlab-pytorch/Dockerfile | 9 ++++++--- output/jupyterlab-tensorflow/Dockerfile | 9 ++++++--- output/rstudio/Dockerfile | 9 ++++++--- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index dc6fc0884..8e4e41fa2 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -33,7 +33,10 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && sudo apt-get -y install alien \ && apt-get -y install libaio1 +RUN mkdir /opt/oracle +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip + +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 823791972..f7fe5ca09 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -43,10 +43,13 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && sudo apt-get -y install alien \ && apt-get -y install libaio1 +RUN mkdir /opt/oracle +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip + +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' ############################### ### docker-bits/3_Kubeflow.Dockerfile diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index e363b2bc0..509c47536 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -43,10 +43,13 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && sudo apt-get -y install alien \ && apt-get -y install libaio1 +RUN mkdir /opt/oracle +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip + +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' ############################### ### docker-bits/2_pytorch.Dockerfile diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 42e38d033..87fe71a3d 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -43,10 +43,13 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && sudo apt-get -y install alien \ && apt-get -y install libaio1 +RUN mkdir /opt/oracle +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip + +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' ############################### ### docker-bits/1_CUDA-11.8.0.Dockerfile diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 26735dec5..9aa56fe28 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -43,10 +43,13 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && sudo apt-get -y install alien \ && apt-get -y install libaio1 +RUN mkdir /opt/oracle +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip + +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' ############################### ### docker-bits/3_Kubeflow.Dockerfile From 350679f8b516392578eeaa89ca8c2d0a9d28dd59 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 27 Sep 2024 14:09:04 +0000 Subject: [PATCH 10/25] add output flag --- docker-bits/0_cpu.Dockerfile | 8 +++----- docker-bits/0_cpu_sas.Dockerfile | 13 +++++++------ output/jupyterlab-cpu/Dockerfile | 8 +++----- output/jupyterlab-pytorch/Dockerfile | 8 +++----- output/jupyterlab-tensorflow/Dockerfile | 8 +++----- output/rstudio/Dockerfile | 8 +++----- output/sas/Dockerfile | 13 +++++++------ 7 files changed, 29 insertions(+), 37 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 8e4e41fa2..d5bb38820 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -30,12 +30,10 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes \ - && sudo apt-get -y install alien \ - && apt-get -y install libaio1 +RUN apt-get update --yes RUN mkdir /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 7a46a50ff..8cd5d7270 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -30,13 +30,14 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get install --yes msodbcsql18 -RUN apt-get update --yes \ - && sudo apt-get -y install alien \ - && apt-get -y install libaio1 +RUN apt-get update --yes +RUN mkdir /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip + +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index f7fe5ca09..7eddef410 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -40,12 +40,10 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes \ - && sudo apt-get -y install alien \ - && apt-get -y install libaio1 +RUN apt-get update --yes RUN mkdir /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index 509c47536..72d13b42d 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -40,12 +40,10 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes \ - && sudo apt-get -y install alien \ - && apt-get -y install libaio1 +RUN apt-get update --yes RUN mkdir /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 87fe71a3d..1a7c41e0e 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -40,12 +40,10 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes \ - && sudo apt-get -y install alien \ - && apt-get -y install libaio1 +RUN apt-get update --yes RUN mkdir /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 9aa56fe28..8e76de08e 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -40,12 +40,10 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes \ - && sudo apt-get -y install alien \ - && apt-get -y install libaio1 +RUN apt-get update --yes RUN mkdir /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 00fb205c9..8b91e9cc9 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -35,13 +35,14 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get install --yes msodbcsql18 -RUN apt-get update --yes \ - && sudo apt-get -y install alien \ - && apt-get -y install libaio1 +RUN apt-get update --yes +RUN mkdir /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip + +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN curl https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN echo /usr/lib/oracle/19.12/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 From c7ffce0c15048956a019bc392de957b1f030976b Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 27 Sep 2024 14:31:38 +0000 Subject: [PATCH 11/25] add unzip --- docker-bits/0_cpu.Dockerfile | 3 ++- docker-bits/0_cpu_sas.Dockerfile | 3 ++- output/jupyterlab-cpu/Dockerfile | 3 ++- output/jupyterlab-pytorch/Dockerfile | 3 ++- output/jupyterlab-tensorflow/Dockerfile | 3 ++- output/rstudio/Dockerfile | 3 ++- output/sas/Dockerfile | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index d5bb38820..a0f330a6f 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -30,7 +30,8 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes +RUN apt-get update --yes \ + && apt-get install --yes unzip RUN mkdir /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 8cd5d7270..a12da1bef 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -30,7 +30,8 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get install --yes msodbcsql18 -RUN apt-get update --yes +RUN apt-get update --yes \ + && apt-get install --yes unzip RUN mkdir /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 7eddef410..1a5cadc27 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -40,7 +40,8 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes +RUN apt-get update --yes \ + && apt-get install --yes unzip RUN mkdir /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index 72d13b42d..ee1c5b892 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -40,7 +40,8 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes +RUN apt-get update --yes \ + && apt-get install --yes unzip RUN mkdir /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 1a7c41e0e..465bbe0b4 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -40,7 +40,8 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes +RUN apt-get update --yes \ + && apt-get install --yes unzip RUN mkdir /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 8e76de08e..8e0c10c47 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -40,7 +40,8 @@ RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt RUN apt-get update RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 -RUN apt-get update --yes +RUN apt-get update --yes \ + && apt-get install --yes unzip RUN mkdir /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 8b91e9cc9..71e1446fd 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -35,7 +35,8 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get install --yes msodbcsql18 -RUN apt-get update --yes +RUN apt-get update --yes \ + && apt-get install --yes unzip RUN mkdir /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip From ec0a6d14c7f87de763441903fee79692fe912cf7 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 27 Sep 2024 15:16:58 +0000 Subject: [PATCH 12/25] chmod --- docker-bits/0_cpu.Dockerfile | 2 ++ docker-bits/0_cpu_sas.Dockerfile | 2 ++ output/jupyterlab-cpu/Dockerfile | 2 ++ output/jupyterlab-pytorch/Dockerfile | 2 ++ output/jupyterlab-tensorflow/Dockerfile | 2 ++ output/rstudio/Dockerfile | 2 ++ output/sas/Dockerfile | 2 ++ 7 files changed, 14 insertions(+) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index a0f330a6f..a32e6c6c3 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -33,8 +33,10 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index a12da1bef..7d32e478f 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -33,8 +33,10 @@ RUN apt-get install --yes msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 1a5cadc27..e13630cc1 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -43,8 +43,10 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index ee1c5b892..b2c6cf216 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -43,8 +43,10 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 465bbe0b4..b1ad54e61 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -43,8 +43,10 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 8e0c10c47..9c0c83657 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -43,8 +43,10 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 71e1446fd..32aed2f62 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -38,8 +38,10 @@ RUN apt-get install --yes msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip +RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle From 623dfc4ef653e114645340affb80622005b438c8 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 27 Sep 2024 18:08:02 +0000 Subject: [PATCH 13/25] Answer the prompt --- docker-bits/0_cpu.Dockerfile | 2 +- docker-bits/0_cpu_sas.Dockerfile | 2 +- output/jupyterlab-cpu/Dockerfile | 2 +- output/jupyterlab-pytorch/Dockerfile | 2 +- output/jupyterlab-tensorflow/Dockerfile | 2 +- output/rstudio/Dockerfile | 2 +- output/sas/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index a32e6c6c3..75f05b73c 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -39,5 +39,5 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 7d32e478f..5e847647c 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -39,7 +39,7 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index e13630cc1..5a6adbbcf 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -49,7 +49,7 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle ############################### diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index b2c6cf216..4fde64550 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -49,7 +49,7 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle ############################### diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index b1ad54e61..87f3ee681 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -49,7 +49,7 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle ############################### diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 9c0c83657..ac88ea47e 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -49,7 +49,7 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle ############################### diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 32aed2f62..f7461e4d0 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -44,7 +44,7 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN ls RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle From 1cea07f5e46f1b01ae4001f2868073012dc7960f Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Thu, 17 Oct 2024 18:13:26 +0000 Subject: [PATCH 14/25] Try alien and unzip --- docker-bits/0_cpu_sas.Dockerfile | 13 +++++++------ output/sas/Dockerfile | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 5e847647c..c1da57548 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -31,15 +31,16 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get install --yes msodbcsql18 RUN apt-get update --yes \ - && apt-get install --yes unzip + && apt-get install --yes unzip \ + && apt-get install alien --yes RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip -RUN ls +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm + +RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index f7461e4d0..710039926 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -36,15 +36,16 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 RUN apt-get install --yes msodbcsql18 RUN apt-get update --yes \ - && apt-get install --yes unzip + && apt-get install --yes unzip \ + && apt-get install alien --yes RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip -RUN ls +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm + +RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient From 9484d52d717ab5ccce511cc74c1a54223db848a8 Mon Sep 17 00:00:00 2001 From: Wendy V Gaultier Date: Fri, 18 Oct 2024 13:30:42 +0000 Subject: [PATCH 15/25] Try with alien --- docker-bits/0_cpu_sas.Dockerfile | 5 ++++- output/sas/Dockerfile | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index c1da57548..9c5b62aa8 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -40,7 +40,10 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 710039926..0156723d6 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -45,7 +45,10 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient From 15c4ae48f8120849b95739bb82772e11411f372c Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Mon, 28 Oct 2024 14:51:40 +0000 Subject: [PATCH 16/25] Oracle --- docker-bits/0_cpu_sas.Dockerfile | 9 ++++++--- output/sas/Dockerfile | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 9c5b62aa8..ed42b61ec 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -32,14 +32,17 @@ RUN apt-get install --yes msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip \ - && apt-get install alien --yes + && apt-get install alien --yes \ + && apt-get install libaio1 + RUN mkdir /opt/oracle RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm - +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpmRUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' RUN ldconfig diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 0156723d6..6bb0260fd 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -37,7 +37,8 @@ RUN apt-get install --yes msodbcsql18 RUN apt-get update --yes \ && apt-get install --yes unzip \ - && apt-get install alien --yes + && apt-get install alien --yes \ + && apt-get install libaio1 RUN mkdir /opt/oracle RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm @@ -45,7 +46,6 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm - RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' RUN ldconfig # RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient From 5cbb474f57ef834e451c575c7029963b5fa09a9b Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Mon, 28 Oct 2024 14:53:53 +0000 Subject: [PATCH 17/25] generated files --- output/sas/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 6bb0260fd..fc9989cb6 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -39,12 +39,15 @@ RUN apt-get update --yes \ && apt-get install --yes unzip \ && apt-get install alien --yes \ && apt-get install libaio1 + RUN mkdir /opt/oracle RUN chmod +x /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpmRUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' RUN ldconfig From 15b568bd067b7e2f483348aaf4947c900657b30f Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Mon, 28 Oct 2024 15:04:17 +0000 Subject: [PATCH 18/25] fes --- docker-bits/0_cpu_sas.Dockerfile | 2 +- output/sas/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index ed42b61ec..1577fbfc3 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -42,7 +42,7 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpmRUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' RUN ldconfig diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index fc9989cb6..f73e756f2 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -47,7 +47,7 @@ RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350 RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpmRUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' RUN ldconfig From 88524df0b1224c54e0ba4070535b97211f77dcd5 Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Mon, 28 Oct 2024 17:12:24 +0000 Subject: [PATCH 19/25] remove trivy for testing --- .github/workflows/build_push.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_push.yaml b/.github/workflows/build_push.yaml index 283ffa31f..fda40fcb6 100644 --- a/.github/workflows/build_push.yaml +++ b/.github/workflows/build_push.yaml @@ -165,11 +165,11 @@ jobs: - run: ./.github/scripts/cleanup_runner.sh # Scan image for vulnerabilities - - name: Aqua Security Trivy image scan - run: | - printf ${{ secrets.CVE_ALLOWLIST }} > .trivyignore - curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin ${{ env.TRIVY_VERSION }} - trivy image ${{ steps.build-image.outputs.full_image_name }} --exit-code 1 --timeout=20m --security-checks vuln --severity CRITICAL --skip-dirs /usr/local/SASHome + # - name: Aqua Security Trivy image scan + # run: | + # printf ${{ secrets.CVE_ALLOWLIST }} > .trivyignore + # curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin ${{ env.TRIVY_VERSION }} + # trivy image ${{ steps.build-image.outputs.full_image_name }} --exit-code 1 --timeout=20m --security-checks vuln --severity CRITICAL --skip-dirs /usr/local/SASHome # Push image to ACR # Pushes if this is a push to master or an update to a PR that has auto-deploy label From 11233925fc54d6fde3bc2693daa9e9fae779a0db Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Tue, 29 Oct 2024 18:06:20 +0000 Subject: [PATCH 20/25] sas odbc --- docker-bits/0_cpu_sas.Dockerfile | 18 ++++++++++++++---- output/sas/Dockerfile | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 1577fbfc3..3194fd015 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -37,18 +37,28 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig +# RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +# RUN ldconfig # RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient +ENV LD_LIBRARY_PATH=/opt/oracle/instantclient_23_5:$LD_LIBRARY_PATH +ENV PATH=/opt/oracle/instantclient_23_5:$PATH +ENV ORACLE_HOME=/opt/oracle/instantclient_23_5 +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index f73e756f2..8990893f7 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -42,18 +42,28 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig +# RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +# RUN ldconfig # RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient +ENV LD_LIBRARY_PATH=/opt/oracle/instantclient_23_5:$LD_LIBRARY_PATH +ENV PATH=/opt/oracle/instantclient_23_5:$PATH +ENV ORACLE_HOME=/opt/oracle/instantclient_23_5 +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image From 91e47aaabc5e7c537510f773f9151ee0c1113158 Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Tue, 29 Oct 2024 20:11:37 +0000 Subject: [PATCH 21/25] set ini file --- docker-bits/0_cpu.Dockerfile | 24 +---- docker-bits/0_cpu_sas.Dockerfile | 41 -------- "docker-bits/\342\210\236_CMD.Dockerfile" | 53 +++++++++++ .../Dockerfile | 53 +++++++++++ output/jupyterlab-cpu/Dockerfile | 75 ++++++++++----- output/jupyterlab-pytorch/Dockerfile | 75 ++++++++++----- output/jupyterlab-tensorflow/Dockerfile | 75 ++++++++++----- output/rstudio/Dockerfile | 75 ++++++++++----- output/sas/Dockerfile | 94 +++++++++++-------- 9 files changed, 372 insertions(+), 193 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 75f05b73c..b53d127e8 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -18,26 +18,4 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh - -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 - - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip -RUN ls - -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle - + && chmod +x /usr/bin/clean-layer.sh \ No newline at end of file diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 3194fd015..4f5540673 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -19,47 +19,6 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip - -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - - -# RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -# RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -ENV LD_LIBRARY_PATH=/opt/oracle/instantclient_23_5:$LD_LIBRARY_PATH -ENV PATH=/opt/oracle/instantclient_23_5:$PATH -ENV ORACLE_HOME=/opt/oracle/instantclient_23_5 - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image RUN pip install --force-reinstall cryptography==39.0.1 && \ diff --git "a/docker-bits/\342\210\236_CMD.Dockerfile" "b/docker-bits/\342\210\236_CMD.Dockerfile" index b883ce343..dac6dbd03 100644 --- "a/docker-bits/\342\210\236_CMD.Dockerfile" +++ "b/docker-bits/\342\210\236_CMD.Dockerfile" @@ -26,6 +26,59 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle +# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip + +# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) + + + USER $NB_USER ENTRYPOINT ["tini", "--"] CMD ["start-custom.sh"] diff --git a/output/docker-stacks-datascience-notebook/Dockerfile b/output/docker-stacks-datascience-notebook/Dockerfile index 544d3451f..b621fbccc 100644 --- a/output/docker-stacks-datascience-notebook/Dockerfile +++ b/output/docker-stacks-datascience-notebook/Dockerfile @@ -32,6 +32,59 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle +# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip + +# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) + + + USER $NB_USER ENTRYPOINT ["tini", "--"] CMD ["start-custom.sh"] diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 5a6adbbcf..a3d7fff6d 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -30,28 +30,6 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 - - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip -RUN ls - -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle - - ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### @@ -566,6 +544,59 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle +# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip + +# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) + + + USER $NB_USER ENTRYPOINT ["tini", "--"] CMD ["start-custom.sh"] diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index 4fde64550..467ec3fa7 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -30,28 +30,6 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 - - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip -RUN ls - -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle - - ############################### ### docker-bits/2_pytorch.Dockerfile ############################### @@ -588,6 +566,59 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle +# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip + +# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) + + + USER $NB_USER ENTRYPOINT ["tini", "--"] CMD ["start-custom.sh"] diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 87f3ee681..e78a24ddc 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -30,28 +30,6 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 - - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip -RUN ls - -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle - - ############################### ### docker-bits/1_CUDA-11.8.0.Dockerfile ############################### @@ -695,6 +673,59 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle +# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip + +# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) + + + USER $NB_USER ENTRYPOINT ["tini", "--"] CMD ["start-custom.sh"] diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index ac88ea47e..273625057 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -30,28 +30,6 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 - - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-odbc-linux.x64-23.5.0.24.07.zip -RUN ls - -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle -RUN unzip --no instantclient-odbc-linux.x64-23.5.0.24.07.zip -d /opt/oracle - - ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### @@ -313,6 +291,59 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle +# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip + +# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) + + + USER $NB_USER ENTRYPOINT ["tini", "--"] CMD ["start-custom.sh"] diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 8990893f7..a0af50d7f 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -24,47 +24,6 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip - -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - - -# RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -# RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -ENV LD_LIBRARY_PATH=/opt/oracle/instantclient_23_5:$LD_LIBRARY_PATH -ENV PATH=/opt/oracle/instantclient_23_5:$PATH -ENV ORACLE_HOME=/opt/oracle/instantclient_23_5 - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image RUN pip install --force-reinstall cryptography==39.0.1 && \ @@ -569,6 +528,59 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle +# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip + +# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig +# Ended up downloading the zip packages and installing in +# /opt/oracle/instantclient_23_4, +# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, +# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, +# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) + + + USER $NB_USER ENTRYPOINT ["tini", "--"] CMD ["start-custom.sh"] From 8d0576b371c31e30d106a4d88a4f99d1abeba047 Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Tue, 29 Oct 2024 20:16:16 +0000 Subject: [PATCH 22/25] add zip --- "docker-bits/\342\210\236_CMD.Dockerfile" | 4 ++-- output/docker-stacks-datascience-notebook/Dockerfile | 4 ++-- output/jupyterlab-cpu/Dockerfile | 4 ++-- output/jupyterlab-pytorch/Dockerfile | 4 ++-- output/jupyterlab-tensorflow/Dockerfile | 4 ++-- output/rstudio/Dockerfile | 4 ++-- output/sas/Dockerfile | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git "a/docker-bits/\342\210\236_CMD.Dockerfile" "b/docker-bits/\342\210\236_CMD.Dockerfile" index dac6dbd03..60dd0d0ab 100644 --- "a/docker-bits/\342\210\236_CMD.Dockerfile" +++ "b/docker-bits/\342\210\236_CMD.Dockerfile" @@ -47,9 +47,9 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm diff --git a/output/docker-stacks-datascience-notebook/Dockerfile b/output/docker-stacks-datascience-notebook/Dockerfile index b621fbccc..e5e70bc19 100644 --- a/output/docker-stacks-datascience-notebook/Dockerfile +++ b/output/docker-stacks-datascience-notebook/Dockerfile @@ -53,9 +53,9 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index a3d7fff6d..a3bd3be43 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -565,9 +565,9 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index 467ec3fa7..c2002e093 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -587,9 +587,9 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index e78a24ddc..8779b0fae 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -694,9 +694,9 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 273625057..0be690049 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -312,9 +312,9 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index a0af50d7f..407f168af 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -549,9 +549,9 @@ RUN apt-get update --yes \ RUN mkdir /opt/oracle RUN chmod +x /opt/oracle -# RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -# RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm From 3a227c39a7b1a3ed5c9527fd5213e723d64fcf7e Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Tue, 29 Oct 2024 21:48:30 +0000 Subject: [PATCH 23/25] remove one dep --- "docker-bits/\342\210\236_CMD.Dockerfile" | 10 +--------- output/docker-stacks-datascience-notebook/Dockerfile | 10 +--------- output/jupyterlab-cpu/Dockerfile | 10 +--------- output/jupyterlab-pytorch/Dockerfile | 10 +--------- output/jupyterlab-tensorflow/Dockerfile | 10 +--------- output/rstudio/Dockerfile | 10 +--------- output/sas/Dockerfile | 10 +--------- 7 files changed, 7 insertions(+), 63 deletions(-) diff --git "a/docker-bits/\342\210\236_CMD.Dockerfile" "b/docker-bits/\342\210\236_CMD.Dockerfile" index 60dd0d0ab..e52a36a6e 100644 --- "a/docker-bits/\342\210\236_CMD.Dockerfile" +++ "b/docker-bits/\342\210\236_CMD.Dockerfile" @@ -30,8 +30,7 @@ RUN conda config --remove channels conda-forge --system # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 + && sudo apt-get -y install gnupg RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list @@ -71,13 +70,6 @@ RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/ RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so RUN ldconfig -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - - USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/docker-stacks-datascience-notebook/Dockerfile b/output/docker-stacks-datascience-notebook/Dockerfile index e5e70bc19..e9c76ba7c 100644 --- a/output/docker-stacks-datascience-notebook/Dockerfile +++ b/output/docker-stacks-datascience-notebook/Dockerfile @@ -36,8 +36,7 @@ RUN conda config --remove channels conda-forge --system # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 + && sudo apt-get -y install gnupg RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list @@ -77,13 +76,6 @@ RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/ RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so RUN ldconfig -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - - USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index a3bd3be43..0a644c93e 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -548,8 +548,7 @@ RUN conda config --remove channels conda-forge --system # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 + && sudo apt-get -y install gnupg RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list @@ -589,13 +588,6 @@ RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/ RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so RUN ldconfig -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - - USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index c2002e093..64d144df1 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -570,8 +570,7 @@ RUN conda config --remove channels conda-forge --system # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 + && sudo apt-get -y install gnupg RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list @@ -611,13 +610,6 @@ RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/ RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so RUN ldconfig -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - - USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 8779b0fae..809fb7467 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -677,8 +677,7 @@ RUN conda config --remove channels conda-forge --system # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 + && sudo apt-get -y install gnupg RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list @@ -718,13 +717,6 @@ RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/ RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so RUN ldconfig -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - - USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 0be690049..00e3f180b 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -295,8 +295,7 @@ RUN conda config --remove channels conda-forge --system # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 + && sudo apt-get -y install gnupg RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list @@ -336,13 +335,6 @@ RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/ RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so RUN ldconfig -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - - USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 407f168af..9ddfaa867 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -532,8 +532,7 @@ RUN conda config --remove channels conda-forge --system # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg \ - && apt-get -y install gnupg2 + && sudo apt-get -y install gnupg RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list @@ -573,13 +572,6 @@ RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/ RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so RUN ldconfig -# Ended up downloading the zip packages and installing in -# /opt/oracle/instantclient_23_4, -# and then then I added env ORACLE_HOME=/opt/oracle/instantclient_23_4, -# add same path to PATH, and made the files oracle.conf + oracle-instantclient.conf in /etc/ld.so.conf.d/, -# with /opt/oracle/instantclient_23_4/lib/ in the first one and /opt/oracle/instantclient_23_4/ in the second (followed by sudo ldconfig) - - USER $NB_USER ENTRYPOINT ["tini", "--"] From 9bd52407adcfa75454a1ce4b6558f82a9290160f Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Wed, 30 Oct 2024 04:52:51 +0000 Subject: [PATCH 24/25] move code --- docker-bits/0_cpu.Dockerfile | 47 +++++++++- docker-bits/0_cpu_sas.Dockerfile | 47 ++++++++++ "docker-bits/\342\210\236_CMD.Dockerfile" | 44 --------- .../Dockerfile | 44 --------- output/jupyterlab-cpu/Dockerfile | 89 +++++++++--------- output/jupyterlab-pytorch/Dockerfile | 89 +++++++++--------- output/jupyterlab-tensorflow/Dockerfile | 89 +++++++++--------- output/rstudio/Dockerfile | 89 +++++++++--------- output/sas/Dockerfile | 91 ++++++++++--------- 9 files changed, 320 insertions(+), 309 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index b53d127e8..067a96f33 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -18,4 +18,49 @@ RUN apt-get update --yes \ && apt-get install --yes language-pack-fr \ && apt-get upgrade --yes libwebp7 \ && rm -rf /var/lib/apt/lists/* \ - && chmod +x /usr/bin/clean-layer.sh \ No newline at end of file + && chmod +x /usr/bin/clean-layer.sh + +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +ENV ORACLE_HOME="/opt/oracle/instantclient_23_5:${ORACLE_HOME}" +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 4f5540673..56ef9024d 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -19,6 +19,53 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh + +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +ENV ORACLE_HOME="/opt/oracle/instantclient_23_5:${ORACLE_HOME}" +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig + + #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image RUN pip install --force-reinstall cryptography==39.0.1 && \ diff --git "a/docker-bits/\342\210\236_CMD.Dockerfile" "b/docker-bits/\342\210\236_CMD.Dockerfile" index e52a36a6e..2246b4d40 100644 --- "a/docker-bits/\342\210\236_CMD.Dockerfile" +++ "b/docker-bits/\342\210\236_CMD.Dockerfile" @@ -26,50 +26,6 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system -# Adding oracle here instead of inside each cp files -# - -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -# RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -# RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" -RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" -RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - - -RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' -RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' -RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -RUN ldconfig USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/docker-stacks-datascience-notebook/Dockerfile b/output/docker-stacks-datascience-notebook/Dockerfile index e9c76ba7c..5c8a4d807 100644 --- a/output/docker-stacks-datascience-notebook/Dockerfile +++ b/output/docker-stacks-datascience-notebook/Dockerfile @@ -32,50 +32,6 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system -# Adding oracle here instead of inside each cp files -# - -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -# RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -# RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" -RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" -RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - - -RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' -RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' -RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -RUN ldconfig USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 0a644c93e..a46bc0aa7 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -30,6 +30,51 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +ENV ORACLE_HOME="/opt/oracle/instantclient_23_5:${ORACLE_HOME}" +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig + ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### @@ -544,50 +589,6 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system -# Adding oracle here instead of inside each cp files -# - -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -# RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -# RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" -RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" -RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - - -RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' -RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' -RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -RUN ldconfig USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index 64d144df1..68e1e1a7f 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -30,6 +30,51 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +ENV ORACLE_HOME="/opt/oracle/instantclient_23_5:${ORACLE_HOME}" +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig + ############################### ### docker-bits/2_pytorch.Dockerfile ############################### @@ -566,50 +611,6 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system -# Adding oracle here instead of inside each cp files -# - -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -# RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -# RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" -RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" -RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - - -RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' -RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' -RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -RUN ldconfig USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 809fb7467..5066d2eb8 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -30,6 +30,51 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +ENV ORACLE_HOME="/opt/oracle/instantclient_23_5:${ORACLE_HOME}" +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig + ############################### ### docker-bits/1_CUDA-11.8.0.Dockerfile ############################### @@ -673,50 +718,6 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system -# Adding oracle here instead of inside each cp files -# - -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -# RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -# RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" -RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" -RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - - -RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' -RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' -RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -RUN ldconfig USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 00e3f180b..14ebdde10 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -30,6 +30,51 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +ENV ORACLE_HOME="/opt/oracle/instantclient_23_5:${ORACLE_HOME}" +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig + ############################### ### docker-bits/3_Kubeflow.Dockerfile ############################### @@ -291,50 +336,6 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system -# Adding oracle here instead of inside each cp files -# - -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -# RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -# RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" -RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" -RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - - -RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' -RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' -RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -RUN ldconfig USER $NB_USER ENTRYPOINT ["tini", "--"] diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 9ddfaa867..262dd2779 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -24,6 +24,53 @@ RUN apt-get update --yes \ && rm -rf /var/lib/apt/lists/* \ && chmod +x /usr/bin/clean-layer.sh + +# Adding oracle here instead of inside each cp files +# + +RUN apt-get update --yes \ + && sudo apt-get -y install gnupg + +RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg +RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list +# RUN apt-get update +RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 + +# RUN apt-get install --yes msodbcsql18 + +RUN apt-get update --yes \ + && apt-get install --yes unzip \ + && apt-get install alien --yes \ + && apt-get install libaio1 + +RUN mkdir /opt/oracle +RUN chmod +x /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip +RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle + +RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm +RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN ldconfig +# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient + +ENV ORACLE_HOME="/opt/oracle/instantclient_23_5:${ORACLE_HOME}" +RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" +RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" + +RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' +RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' + + +RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' +RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' +RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' + +RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so +RUN ldconfig + + #updates package to fix CVE-2023-0286 https://github.com/StatCan/aaw-private/issues/57 #TODO: Evaluate if this is still necessary when updating the base image RUN pip install --force-reinstall cryptography==39.0.1 && \ @@ -528,50 +575,6 @@ ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md # Point conda to Artifactory repository RUN conda config --remove channels conda-forge --system -# Adding oracle here instead of inside each cp files -# - -RUN apt-get update --yes \ - && sudo apt-get -y install gnupg - -RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list -# RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install -y msodbcsql18 - -# RUN apt-get install --yes msodbcsql18 - -RUN apt-get update --yes \ - && apt-get install --yes unzip \ - && apt-get install alien --yes \ - && apt-get install libaio1 - -RUN mkdir /opt/oracle -RUN chmod +x /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/instantclient-basic-linux.x64-23.5.0.24.07.zip -RUN unzip instantclient-basic-linux.x64-23.5.0.24.07.zip -d /opt/oracle - -RUN curl -s -O https://download.oracle.com/otn_software/linux/instantclient/2350000/oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN alien -i oracle-instantclient-basic-23.5.0.24.07-1.el9.x86_64.rpm -RUN sh -c 'echo /usr/lib/oracle/23/client64/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN ldconfig -# RUN ln -s i/opt/oracle$ cd instantclient_23_5 instantclient - -RUN export PATH="$PATH:/opt/oracle/instantclient_23_5" -RUN export ORACLE_HOME="$PATH:/opt/oracle/instantclient_23_5" -RUN export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/oracle/instantclient_23_5" - -RUN sh -c 'echo /opt/oracle/instantclient_23_5/lib/ > /etc/ld.so.conf.d/oracle.conf' -RUN sh -c 'echo /opt/oracle/instantclient_23_5/ > /etc/ld.so.conf.d/oracle-instantclient.conf' - - -RUN sh -c 'echo [OracleODBC-23ai] > /etc/odbcinst.ini' -RUN sh -c 'echo Description = Oracle ODBC Driver > /etc/odbcinst.ini' -RUN sh -c 'echo Driver = /opt/oracle/instantclient_23_5/libsqora.so.23.5 > /etc/odbcinst.ini' - -RUN ln -s /opt/oracle/instantclient_23_5/libclntsh.so.23.1 /usr/lib/libclntsh.so -RUN ldconfig USER $NB_USER ENTRYPOINT ["tini", "--"] From de5da7a24a18b529943dec4f63808ecbdea3e7e0 Mon Sep 17 00:00:00 2001 From: Wendy Gaultier Date: Wed, 30 Oct 2024 05:03:43 +0000 Subject: [PATCH 25/25] add gnupg2 --- docker-bits/0_cpu.Dockerfile | 3 ++- docker-bits/0_cpu_sas.Dockerfile | 3 ++- output/jupyterlab-cpu/Dockerfile | 3 ++- output/jupyterlab-pytorch/Dockerfile | 3 ++- output/jupyterlab-tensorflow/Dockerfile | 3 ++- output/rstudio/Dockerfile | 3 ++- output/sas/Dockerfile | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docker-bits/0_cpu.Dockerfile b/docker-bits/0_cpu.Dockerfile index 067a96f33..d0100b54e 100644 --- a/docker-bits/0_cpu.Dockerfile +++ b/docker-bits/0_cpu.Dockerfile @@ -24,7 +24,8 @@ RUN apt-get update --yes \ # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list diff --git a/docker-bits/0_cpu_sas.Dockerfile b/docker-bits/0_cpu_sas.Dockerfile index 56ef9024d..cb64909d7 100644 --- a/docker-bits/0_cpu_sas.Dockerfile +++ b/docker-bits/0_cpu_sas.Dockerfile @@ -24,7 +24,8 @@ RUN apt-get update --yes \ # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index a46bc0aa7..b893b00f5 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -34,7 +34,8 @@ RUN apt-get update --yes \ # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index 68e1e1a7f..1016bcf03 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -34,7 +34,8 @@ RUN apt-get update --yes \ # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 5066d2eb8..0c3c14ba3 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -34,7 +34,8 @@ RUN apt-get update --yes \ # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 14ebdde10..bc627b995 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -34,7 +34,8 @@ RUN apt-get update --yes \ # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 262dd2779..11fc0ec3e 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -29,7 +29,8 @@ RUN apt-get update --yes \ # RUN apt-get update --yes \ - && sudo apt-get -y install gnupg + && sudo apt-get -y install gnupg \ + && apt-get -y install gnupg2 RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/mssql.gpg RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list