Commit 13b82c28 authored by Martin Jeřábek's avatar Martin Jeřábek

Merge branch 'docker-improvements' into 'master'

Docker improvements

See merge request !231
parents d6087acf e3b001bd
Pipeline #6597 passed with stage
in 39 seconds
......@@ -48,16 +48,11 @@ build_driver:
build_doc:
stage: build
tags: [virt] # runner in virtual, without docker, with new lyx
only:
- master
- tags
- web # debug only!
#image: hathi.duckdns.org/user/lyx:buster
only: *only
image: registry.gitlab.com/canfd/server-tools/lyx
script:
- export LC_ALL=en_US.UTF-8
- export LANG=en_US.UTF-8
- export TMPDIR=/var/tmp # not enouhg room in tmpfs
- make -C doc/core
artifacts:
paths:
......
all: Progdokum.pdf
Progdokum.pdf: version.tex
lyx --export-to pdf Progdokum.pdf Progdokum.lyx
#lyx --export-to pdf Progdokum.pdf Progdokum.lyx
lyx --export-to latex Progdokum.tex Progdokum.lyx
sed -rie '/\{inputenc\}/d' Progdokum.tex
iconv -f latin2 -t utf8 <Progdokum.tex >Progdokum.tex-1 && mv Progdokum.tex-1 Progdokum.tex
xelatex Progdokum
# run again to generate PDF outline and references
xelatex Progdokum
xelatex Progdokum
version.tex: FORCE
desc=$$(git describe --always); \
......
#!/bin/bash
#IMG=mjerabek/lyx:buster
IMG=hathi.duckdns.org/user/lyx:buster
IMG=registry.gitlab.com/canfd/server-tools/lyx
d=$(realpath $(dirname "$0")/../..)
docker run --rm -v $d:/build -w /build/modules/CTU_CAN_FD/doc/core $IMG make
#docker run -ti --rm -v $d:/build -w /build/modules/CTU_CAN_FD/doc/core $IMG
docker run --rm -v $d:/build -w /build/modules/CTU_CAN_FD/doc/core -e HOME=/tmp -u $UID:$UID $IMG make clean all
......@@ -13,6 +13,8 @@ if [ -d /build ]; then
export LC_ALL=C.UTF-8
export LANG=C.UTF-8
export PYTHONUNBUFFERED=1
export HOME=$(mktemp -d /tmp/home.XXXXX)
cd /build/test
if [ $# -gt 0 ]; then
exec "$@"
......@@ -20,6 +22,8 @@ if [ -d /build ]; then
exec bash
fi
else
docker run --rm -ti -v $PWD:/build mjerabek/ghdl:upstream-gcc /build/run-docker-test "$@"
d="$(realpath "$(dirname "$0")")"
#"
docker run --rm -ti -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix -v "$d:/build" --user $(id -u):$(id -g) registry.gitlab.com/canfd/server-tools/ghdl:gtkwave /build/run-docker-test "$@"
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment