Skip to content

Commit 01f01c9

Browse files
authored
Merge pull request #1667 from Karry/docker-webpage
update docker image for documentation build to Ubuntu 24.04
2 parents 44130ad + 5a2d915 commit 01f01c9

File tree

10 files changed

+54
-33
lines changed

10 files changed

+54
-33
lines changed

ci/docker/buildAll.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ set -xe
99
./ubuntu_24.04_gcc_cmake/build.sh
1010
./ubuntu_24.04_gcc_meson_qt6/build.sh
1111
./ubuntu_24.04_aarch64_gcc_cmake/build.sh
12+
./ubuntu_24.04_webpage/build.sh

ci/docker/runAll.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ RESULT_ubuntu_24_04_gcc_meson_qt6=$?
2323
./ubuntu_24.04_aarch64_gcc_cmake/run.sh "$@"
2424
RESULT_ubuntu_24_04_aarch64_gcc_cmake=$?
2525

26+
./ubuntu_24.04_webpage/build.sh "$@"
27+
RESULT_ubuntu_24_04_webpage=$?
2628

2729
# print results
2830
set +x
@@ -48,3 +50,6 @@ if [ $RESULT_ubuntu_24_04_gcc_meson_qt6 -eq 0 ] ; then echo "OK"; else echo "FA
4850

4951
echo -ne "ubuntu_24.04_aarch64_gcc_cmake "
5052
if [ $RESULT_ubuntu_24_04_aarch64_gcc_cmake -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi
53+
54+
echo -ne "ubuntu_24.04_webpage "
55+
if [ $RESULT_ubuntu_24_04_webpage -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi

ci/docker/ubuntu_14.04_webpage/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

ci/docker/ubuntu_14.04_webpage/build.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/ubuntu_14.04_webpage/data/build.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

ci/docker/ubuntu_14.04_webpage/run.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM ubuntu:noble
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN apt-get update && apt-get install -y \
6+
wget git python3-pygments doxygen lftp \
7+
&& rm -rf /var/lib/apt/lists/*
8+
9+
RUN wget https://github.com/gohugoio/hugo/releases/download/v0.147.8/hugo_0.147.8_linux-amd64.deb \
10+
&& dpkg -i hugo_0.147.8_linux-amd64.deb
11+
12+
RUN mkdir /work
13+
14+
COPY data/build.sh /work
15+
RUN chmod +x /work/build.sh
16+
17+
WORKDIR /work
18+
CMD ./build.sh
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
cd `dirname $0`
3+
docker build -t libosmscout/ubuntu_24.04_webpage .
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/sh
2+
set -e
3+
4+
if [ $# -ge 1 ] ; then
5+
REPO="$1"
6+
else
7+
REPO="https://github.com/Framstag/libosmscout.git"
8+
fi
9+
10+
if [ $# -ge 2 ] ; then
11+
BRANCH="$2"
12+
else
13+
BRANCH="master"
14+
fi
15+
16+
git clone -b "$BRANCH" "$REPO" libosmscout
17+
18+
cd libosmscout
19+
20+
echo "Generating HTML API documentation..."
21+
( cat doxygen.cfg ; echo "OUTPUT_DIRECTORY=webpage/static/api-doc" ) | doxygen -
22+
echo "Generating static web site..."
23+
cd webpage
24+
hugo build --logLevel info
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
docker run --rm=true -it libosmscout/ubuntu_24.04_webpage ./build.sh "$@"

0 commit comments

Comments
 (0)