Skip to content

Commit 52efe0d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1260 from grdryn/multiarch-texlive-pandoc
RHOAIENG-28774, RHOAIENG-28822: allow install_pdf_deps.sh to work for multiarch
2 parents bce04f9 + d2fcf92 commit 52efe0d

File tree

17 files changed

+104
-42
lines changed

17 files changed

+104
-42
lines changed

‎jupyter/datascience/ubi9-python-3.11/Dockerfile.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ USER 0
5353

5454
# Dependencies for PDF export
5555
RUN ./utils/install_pdf_deps.sh
56-
ENV PATH="/usr/local/texlive/bin/x86_64-linux:/usr/local/pandoc/bin:$PATH"
56+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
5757

5858
USER 1001
5959

‎jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ WORKDIR /opt/app-root/bin
4949
COPY ${JUPYTER_REUSABLE_UTILS} utils/
5050
COPY ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
5151

52+
USER 0
53+
54+
# Dependencies for PDF export
55+
RUN ./utils/install_pdf_deps.sh
56+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
57+
58+
USER 1001
59+
5260
WORKDIR /opt/app-root/src
5361

5462
ENTRYPOINT ["start-notebook.sh"]

‎jupyter/minimal/ubi9-python-3.11/Dockerfile.cpu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/oc
2626
####################
2727
# jupyter-minimal #
2828
####################
29-
FROM base AS jupyter-minimal
29+
FROM base AS jupyter-minimal
3030

3131
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
3232
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.11
@@ -49,7 +49,7 @@ USER 0
4949

5050
# Dependencies for PDF export
5151
RUN ./utils/install_pdf_deps.sh
52-
ENV PATH="/usr/local/texlive/bin/x86_64-linux:/usr/local/pandoc/bin:$PATH"
52+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
5353

5454
USER 1001
5555

@@ -73,4 +73,4 @@ RUN echo "Installing softwares and packages" && \
7373

7474
WORKDIR /opt/app-root/src
7575

76-
ENTRYPOINT ["start-notebook.sh"]
76+
ENTRYPOINT ["start-notebook.sh"]

‎jupyter/minimal/ubi9-python-3.11/Dockerfile.cuda

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN yum install -y \
135135
${NV_CUDNN_PACKAGE_DEV} \
136136
&& yum clean all \
137137
&& rm -rf /var/cache/yum/*
138-
138+
139139
# Set this flag so that libraries can find the location of CUDA
140140
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
141141

@@ -146,7 +146,7 @@ WORKDIR /opt/app-root/src
146146
#########################
147147
# cuda-jupyter-minimal #
148148
#########################
149-
FROM cuda-base AS cuda-jupyter-minimal
149+
FROM cuda-base AS cuda-jupyter-minimal
150150

151151
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
152152
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.11
@@ -169,7 +169,7 @@ USER 0
169169

170170
# Dependencies for PDF export
171171
RUN ./utils/install_pdf_deps.sh
172-
ENV PATH="/usr/local/texlive/bin/x86_64-linux:/usr/local/pandoc/bin:$PATH"
172+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
173173

174174
USER 1001
175175

@@ -190,7 +190,7 @@ RUN echo "Installing softwares and packages" && \
190190
fix-permissions /opt/app-root -P && \
191191
# Apply JupyterLab addons \
192192
/opt/app-root/bin/utils/addons/apply.sh
193-
193+
194194
WORKDIR /opt/app-root/src
195195

196-
ENTRYPOINT ["start-notebook.sh"]
196+
ENTRYPOINT ["start-notebook.sh"]

‎jupyter/minimal/ubi9-python-3.11/Dockerfile.rocm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ARG AMDGPU_VERSION=6.2.4
3838
# Install the ROCm rpms
3939
# ref: https://github.com/ROCm/ROCm-docker/blob/master/dev/Dockerfile-centos-7-complete
4040
# Note: Based on 6.2 above new package mivisionx is a pre-requistes, which bring in more dependent packages
41-
# so we are only installing meta packages of rocm
41+
# so we are only installing meta packages of rocm
4242
# ref: https://rocm.docs.amd.com/projects/install-on-linux/en/develop/reference/package-manager-integration.html#packages-in-rocm-programming-models
4343
RUN echo "[ROCm]" > /etc/yum.repos.d/rocm.repo && \
4444
echo "name=ROCm" >> /etc/yum.repos.d/rocm.repo && \
@@ -60,7 +60,7 @@ WORKDIR /opt/app-root/src
6060
########################
6161
# rocm-jupyter-minimal #
6262
########################
63-
FROM rocm-base AS rocm-jupyter-minimal
63+
FROM rocm-base AS rocm-jupyter-minimal
6464

6565
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
6666
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.11
@@ -83,7 +83,7 @@ USER 0
8383

8484
# Dependencies for PDF export
8585
RUN ./utils/install_pdf_deps.sh
86-
ENV PATH="/usr/local/texlive/bin/x86_64-linux:/usr/local/pandoc/bin:$PATH"
86+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
8787

8888
USER 1001
8989

@@ -104,7 +104,7 @@ RUN echo "Installing softwares and packages" && \
104104
fix-permissions /opt/app-root -P && \
105105
# Apply JupyterLab addons \
106106
/opt/app-root/bin/utils/addons/apply.sh
107-
107+
108108
WORKDIR /opt/app-root/src
109109

110-
ENTRYPOINT ["start-notebook.sh"]
110+
ENTRYPOINT ["start-notebook.sh"]

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/oc
2626
####################
2727
# jupyter-minimal #
2828
####################
29-
FROM base AS jupyter-minimal
29+
FROM base AS jupyter-minimal
3030

3131
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
3232
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.12
@@ -45,6 +45,14 @@ WORKDIR /opt/app-root/bin
4545

4646
COPY ${JUPYTER_REUSABLE_UTILS} utils/
4747

48+
USER 0
49+
50+
# Dependencies for PDF export
51+
RUN ./utils/install_pdf_deps.sh
52+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
53+
54+
USER 1001
55+
4856
COPY ${MINIMAL_SOURCE_CODE}/Pipfile.lock ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
4957

5058
# Install Python dependencies from Pipfile.lock file
@@ -60,7 +68,7 @@ RUN echo "Installing softwares and packages" && \
6068
fix-permissions /opt/app-root -P && \
6169
# Apply JupyterLab addons \
6270
/opt/app-root/bin/utils/addons/apply.sh
63-
71+
6472
WORKDIR /opt/app-root/src
6573

66-
ENTRYPOINT ["start-notebook.sh"]
74+
ENTRYPOINT ["start-notebook.sh"]

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN yum install -y \
135135
${NV_CUDNN_PACKAGE_DEV} \
136136
&& yum clean all \
137137
&& rm -rf /var/cache/yum/*
138-
138+
139139
# Set this flag so that libraries can find the location of CUDA
140140
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
141141

@@ -146,7 +146,7 @@ WORKDIR /opt/app-root/src
146146
#########################
147147
# cuda-jupyter-minimal #
148148
#########################
149-
FROM cuda-base AS cuda-jupyter-minimal
149+
FROM cuda-base AS cuda-jupyter-minimal
150150

151151
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
152152
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.12
@@ -165,6 +165,14 @@ WORKDIR /opt/app-root/bin
165165

166166
COPY ${JUPYTER_REUSABLE_UTILS} utils/
167167

168+
USER 0
169+
170+
# Dependencies for PDF export
171+
RUN ./utils/install_pdf_deps.sh
172+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
173+
174+
USER 1001
175+
168176
COPY ${MINIMAL_SOURCE_CODE}/Pipfile.lock ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
169177

170178
# Install Python dependencies from Pipfile.lock file
@@ -180,7 +188,7 @@ RUN echo "Installing softwares and packages" && \
180188
fix-permissions /opt/app-root -P && \
181189
# Apply JupyterLab addons \
182190
/opt/app-root/bin/utils/addons/apply.sh
183-
191+
184192
WORKDIR /opt/app-root/src
185193

186-
ENTRYPOINT ["start-notebook.sh"]
194+
ENTRYPOINT ["start-notebook.sh"]

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.rocm

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ARG AMDGPU_VERSION=6.2.4
3838
# Install the ROCm rpms
3939
# ref: https://github.com/ROCm/ROCm-docker/blob/master/dev/Dockerfile-centos-7-complete
4040
# Note: Based on 6.2 above new package mivisionx is a pre-requistes, which bring in more dependent packages
41-
# so we are only installing meta packages of rocm
41+
# so we are only installing meta packages of rocm
4242
# ref: https://rocm.docs.amd.com/projects/install-on-linux/en/develop/reference/package-manager-integration.html#packages-in-rocm-programming-models
4343
RUN echo "[ROCm]" > /etc/yum.repos.d/rocm.repo && \
4444
echo "name=ROCm" >> /etc/yum.repos.d/rocm.repo && \
@@ -60,7 +60,7 @@ WORKDIR /opt/app-root/src
6060
########################
6161
# rocm-jupyter-minimal #
6262
########################
63-
FROM rocm-base AS rocm-jupyter-minimal
63+
FROM rocm-base AS rocm-jupyter-minimal
6464

6565
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
6666
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.12
@@ -79,6 +79,14 @@ WORKDIR /opt/app-root/bin
7979

8080
COPY ${JUPYTER_REUSABLE_UTILS} utils/
8181

82+
USER 0
83+
84+
# Dependencies for PDF export
85+
RUN ./utils/install_pdf_deps.sh
86+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
87+
88+
USER 1001
89+
8290
COPY ${MINIMAL_SOURCE_CODE}/Pipfile.lock ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
8391

8492
# Install Python dependencies from Pipfile.lock file
@@ -94,7 +102,7 @@ RUN echo "Installing softwares and packages" && \
94102
fix-permissions /opt/app-root -P && \
95103
# Apply JupyterLab addons \
96104
/opt/app-root/bin/utils/addons/apply.sh
97-
105+
98106
WORKDIR /opt/app-root/src
99107

100-
ENTRYPOINT ["start-notebook.sh"]
108+
ENTRYPOINT ["start-notebook.sh"]

‎jupyter/pytorch/ubi9-python-3.11/Dockerfile.cuda

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ USER 0
174174

175175
# Dependencies for PDF export
176176
RUN ./utils/install_pdf_deps.sh
177-
ENV PATH="/usr/local/texlive/bin/x86_64-linux:/usr/local/pandoc/bin:$PATH"
177+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
178178

179179
USER 1001
180-
180+
181181
WORKDIR /opt/app-root/src
182182

183183
ENTRYPOINT ["start-notebook.sh"]

‎jupyter/pytorch/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,14 @@ COPY ${JUPYTER_REUSABLE_UTILS} utils/
170170

171171
COPY ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
172172

173+
USER 0
174+
175+
# Dependencies for PDF export
176+
RUN ./utils/install_pdf_deps.sh
177+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
178+
179+
USER 1001
180+
173181
WORKDIR /opt/app-root/src
174182

175183
ENTRYPOINT ["start-notebook.sh"]

0 commit comments

Comments
 (0)