From 96614e494e725c8439a9005cdeb8a1cd9387e5fd Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Tue, 9 Jan 2018 20:03:04 +0100 Subject: [PATCH] Added Dockerfile --- Dockerfile | 12 ++++++++++++ README.md | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..48e2d8e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:artful + +RUN apt update \ + && apt install git-core g++ make qt5-default qtmultimedia5-dev qttools5-dev qttools5-dev-tools -y \ + && git clone --recursive https://github.com/0xFEEDC0DE64/QtZeiterfassung.git /tmp/QtZeiterfassung \ + && mkdir -p /tmp/build_QtZeiterfassung \ + && qmake /tmp/QtZeiterfassung -o /tmp/build_QtZeiterfassung/Makefile -config release \ + && make -C /tmp/build_QtZeiterfassung -j8 \ + && make -C /tmp/build_QtZeiterfassung install \ + && mv /tmp/build_QtZeiterfassung/bin /root + +CMD /root/bin/zeiterfassung.sh diff --git a/README.md b/README.md index 2e8affb..22dc02b 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ This tool helps me assigning my working hours to projects at work. ![Screenshot of the main window](https://raw.githubusercontent.com/0xFEEDC0DE64/QtZeiterfassung/master/screenshot.png) ## Building from source -The build process has only been tested with gcc. On windows you have to use MinGW (provided by the Qt setup). All necessary config files or translations should be copied over to the build folder. The executable with all plugin lands in your build folder under /bin +The build process has only been tested with gcc and clang. On windows you need to use MinGW (provided by the Qt setup). All necessary libraries, config files or translations should be copied over to the build folder in the last build step. The executable and plugin land in the build folder under /bin The simplest way to get it up and running is to just open it in QtCreator. If you are more like a terminal monkey, you can build it there too: ``` -git clone https://github.com/0xFEEDC0DE64/QtZeiterfassung.git +git clone --recursive https://github.com/0xFEEDC0DE64/QtZeiterfassung.git mkdir build_QtZeiterfassung cd build_QtZeiterfassung qmake ../QtZeiterfassung @@ -18,12 +18,12 @@ make make install # only needed on first build to copy Qt resources ``` -## Launching (on unix) +### Launching (on unix) ``` ./zeiterfassung.sh ``` -## Launching (on win32) +### Launching (on win32) Double click the **zeiterfassung.exe**. Please report any error message like missing libraries or plugins! ## Configuration