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

Add arm64 #54

Merged
merged 4 commits into from
Feb 12, 2025
Merged

Add arm64 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7433d76
fix: update actions/upload-artifact to v4
birkenbube Nov 30, 2024
ec12bb5
fix: remove installation of software-properties-common due to removal…
birkenbube Nov 30, 2024
580d878
add arm64 architecture
mpolitze Feb 3, 2025
bb03899
fix typo
mpolitze Feb 3, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/check-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
run: |
docker run -v $(pwd)/..:/workdir localhost:5000/name/app:latest /bin/bash -c "cd subdir1 && lualatex current-file.tex"
- name: Archive PDFs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: pdfs
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
uses: docker/build-push-action@v4
with:
push: true
platforms: linux/amd64
platforms: linux/amd64, linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
-
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM registry.gitlab.com/islandoftex/images/texlive:latest

ARG TARGETARCH

LABEL \
org.opencontainers.image.title="Full TeX Live with additions" \
org.opencontainers.image.authors="Oliver Kopp <kopp.dev@gmail.com>" \
Expand All @@ -24,11 +26,7 @@ RUN apt-get update -q && \
apt-get install -qqy -o=Dpkg::Use-Pty=0 --no-install-recommends git wget && \
# Install Ruby's bundler
apt-get install -qqy -o=Dpkg::Use-Pty=0 ruby poppler-utils && gem install bundler && \
# openjdk-8-jre-headless is currently not available in testing
# solution by https://stackoverflow.com/a/61902164/873282
apt-get install -qqy -o=Dpkg::Use-Pty=0 software-properties-common && \
apt-get update && \
# plantuml requires java8
# plantuml requires java17
apt-get install -qqy -o=Dpkg::Use-Pty=0 --no-install-recommends openjdk-17-jre-headless && \
# proposal by https://github.com/sumandoc/TeXLive-2017
apt-get install -qqy -o=Dpkg::Use-Pty=0 curl libgetopt-long-descriptive-perl libdigest-perl-md5-perl fontconfig && \
Expand Down Expand Up @@ -60,7 +58,7 @@ RUN apt-get update -q && \
rm -rf /var/lib/apt/lists/* && apt-get clean

# pandoc in the repositories is older - we just overwrite it with a more recent version
RUN wget https://github.com/jgm/pandoc/releases/download/3.1.2/pandoc-3.1.2-1-amd64.deb -q --output-document=/home/pandoc.deb && dpkg -i pandoc.deb && rm pandoc.deb
RUN wget https://github.com/jgm/pandoc/releases/download/3.1.2/pandoc-3.1.2-1-$TARGETARCH.deb -q --output-document=/home/pandoc.deb && dpkg -i pandoc.deb && rm pandoc.deb

# get PlantUML in place
RUN wget https://deac-riga.dl.sourceforge.net/project/plantuml/1.2023.6/plantuml-jar-asl-1.2023.6.zip -q --output-document=/home/plantuml.zip && \
Expand Down