Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug: pandoc not being installed, fixed #17

Merged
merged 1 commit into from
Mar 22, 2024
Merged

bug: pandoc not being installed, fixed #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ CI:= $(shell echo $(CI))
help: Makefile
@sed -n 's/^\(## \)\([a-zA-Z]\)/\2/p' $<

## build-base-images: build all the base images defined in this repo
.PHONY: build-base-images
build-base-images:
DOCKER_PLATFORM=$(DOCKER_PLATFORM) DOCKERFILE=$(DOCKERFILE) SHORT_SHA=$(SHORT_SHA) CI=$(CI) $(PROJECT_DIR)/scripts/build-base-images.sh

.PHONY: tidy_shell
## tidy-shell: run the shell syntax linter to fix issues in-place
.PHONY: tidy-shell
tidy-shell:
shfmt -i 2 -l -w .

## check-shell: run the shell syntax linter, raising an error if any diff found
.PHONY: check-shell
check-shell:
shfmt -i 2 -d .
shfmt -i 2 -d .
12 changes: 10 additions & 2 deletions dockerfiles/deps/base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

set -ex

GPU_ENABLED=${GPU_ENABLED:-"true"}
PANDOC_VERSION=${PANDOC_VERSION:-"3.1.9"}

Expand Down Expand Up @@ -32,9 +34,15 @@ cp /etc/yum.repos.d/rocky-devel.repo /etc/yum.repos.d/Rocky-Devel.repo
dnf config-manager --enable crb

# Needed for LibreOffice to install base components on aarch64
pandoc_filename=pandoc-"$PANDOC_VERSION"-linux-"$ARCH".tar.gz
if [ "$ARCH" == "aarch64" ]; then
PANDOC_ARCH="arm64"
else
PANDOC_ARCH="amd64"
fi
pandoc_filename=pandoc-"$PANDOC_VERSION"-linux-"$PANDOC_ARCH".tar.gz
pandoc_url=https://github.com/jgm/pandoc/releases/download/"$PANDOC_VERSION"/"$pandoc_filename"
sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/Rocky-Devel.repo
wget https://github.com/jgm/pandoc/releases/download/"$PANDOC_VERSION"/"$pandoc_filename"
wget "$pandoc_url"
tar xvzf "$pandoc_filename" --strip-components 1 -C '/usr/local'
rm -rf "$pandoc_filename"
dnf -y install libreoffice-writer libreoffice-base libreoffice-impress libreoffice-draw libreoffice-math libreoffice-core
Expand Down
2 changes: 2 additions & 0 deletions dockerfiles/deps/python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

set -ex

dnf -y install bzip2-devel libffi-devel make git sqlite-devel openssl-devel
dnf -y install python-pip
pip3.9 install --upgrade setuptools pip
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/deps/tesseract.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash

set -ex

dnf install -y opencv opencv* zlib zlib-devel perl-core clang libpng libpng-devel libtiff libtiff-devel libwebp libwebp-devel libjpeg libjpeg-devel libjpeg-turbo-devel git-core libtool pkgconfig xz
Expand Down
Loading