From 8a6c71456d06c7a31c8068a067618e264d759f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Mon, 27 Feb 2023 12:26:26 +0000
Subject: [PATCH 1/2] Add CI for Dockerfile

---
 .github/workflows/build.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ef0e1bb..2e5c7eb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -67,3 +67,16 @@ jobs:
           set -e
           make INSTALL_ROOT="${PWD}"/ROOT install
           find ROOT | sort
+
+  docker:
+    name: Check Dockerfile
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Git branch'
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: 'Build'
+        run: |-
+          docker build .

From ad6845a783d357aa86c35b1e4a1cbe9720f7c320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Mon, 27 Feb 2023 12:33:01 +0000
Subject: [PATCH 2/2] Update Dockerfile to a more recent version

---
 Dockerfile | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e790744..b1c8518 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,24 @@
-FROM debian:8.11
+FROM ubuntu:22.04
 
-RUN apt update && apt install -y \
-    make g++ libapr1-dev libsvn-dev libqt4-dev \
-    git subversion \
-    && rm -rf /var/lib/apt/lists/* \
-    && mkdir /usr/local/svn2git
+# Change locale to let svn handle international characters
+ENV LC_ALL C.UTF-8
 
-ADD . /usr/local/svn2git
+# Install dependencies
+RUN apt-get update && apt-get install --yes --no-install-recommends \
+    build-essential \
+    libapr1-dev \
+    libsvn-dev \
+    qt5-qmake \
+    qtbase5-dev \
+    git \
+    subversion \
+    && rm -rf /var/lib/apt/lists/*
 
+# Build the binary
+RUN mkdir /usr/local/svn2git
+ADD . /usr/local/svn2git
 RUN cd /usr/local/svn2git && qmake && make
 
+# Docker interface
 WORKDIR /workdir
 CMD /usr/local/svn2git/svn-all-fast-export