Skip to content

Commit 9d13d95

Browse files
authored
Merge pull request #1581 from mathbunnyru/asalikhov/fix_arm_pandoc_test
Fix arm pandoc test
2 parents 013a42f + 37af03c commit 9d13d95

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

base-notebook/Dockerfile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,28 @@ USER root
1919

2020
# Install all OS dependencies for notebook server that starts but lacks all
2121
# features (e.g., download as all possible file formats)
22-
# - tini is installed as a helpful container entrypoint that reaps zombie
23-
# processes and such of the actual executable we want to start, see
24-
# https://github.com/krallin/tini#why-tini for details.
25-
# - apt-get upgrade is run to patch known vulnerabilities in apt-get packages as
26-
# the ubuntu base image is rebuilt too seldom sometimes (less than once a month)
2722
ENV DEBIAN_FRONTEND noninteractive
2823
RUN apt-get update --yes && \
24+
# - apt-get upgrade is run to patch known vulnerabilities in apt-get packages as
25+
# the ubuntu base image is rebuilt too seldom sometimes (less than once a month)
2926
apt-get upgrade --yes && \
3027
apt-get install --yes --no-install-recommends \
31-
tini \
32-
wget \
3328
ca-certificates \
34-
sudo \
35-
locales \
3629
fonts-liberation \
37-
run-one && \
30+
locales \
31+
# - pandoc is used to convert notebooks to html files
32+
# it's not present in arm64 ubuntu image, so we install it here
33+
pandoc \
34+
# - run-one - a wrapper script that runs no more
35+
# than one unique instance of some command with a unique set of arguments,
36+
# we use `run-one-constantly` to support `RESTARTABLE` option
37+
run-one \
38+
sudo \
39+
# - tini is installed as a helpful container entrypoint that reaps zombie
40+
# processes and such of the actual executable we want to start, see
41+
# https://github.com/krallin/tini#why-tini for details.
42+
tini \
43+
wget && \
3844
apt-get clean && rm -rf /var/lib/apt/lists/* && \
3945
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
4046
locale-gen

test/test_packages.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262

6363
# List of packages that cannot be tested in a standard way
6464
EXCLUDED_PACKAGES = [
65-
"tini",
6665
"python",
6766
"hdf5",
6867
"conda-forge::blas[build=openblas]",

0 commit comments

Comments
 (0)