diff --git a/Dockerfile b/Dockerfile index f6e3c3d..269771b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,9 @@ RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/ap USER ausweisapp # Install development stuff -# Get AusweisApp2 +# Get AusweisApp # Build Libraries -# Build AusweisApp2 +# Build AusweisApp # Clean up unused stuff # Remove development stuff RUN sudo apk --no-cache --virtual deps add patch cmake make ninja g++ pkgconf pcsc-lite-dev binutils-gold perl python3 wget \ @@ -25,15 +25,15 @@ RUN sudo apk --no-cache --virtual deps add patch cmake make ninja g++ pkgconf pc xcb-util-renderutil-dev libxcb-dev && \ \ cd ~ && mkdir .config && mkdir build && cd build && \ - wget https://github.com/Governikus/AusweisApp2/releases/download/${VERSION}/AusweisApp2-${VERSION}.tar.gz && \ - cmake -E tar xf AusweisApp2-${VERSION}.tar.gz && \ + wget https://github.com/Governikus/AusweisApp2/releases/download/${VERSION}/AusweisApp-${VERSION}.tar.gz && \ + cmake -E tar xf AusweisApp-${VERSION}.tar.gz && \ \ cd ~/build && mkdir libs && cd libs && \ - cmake ../AusweisApp2-${VERSION}/libs/ -DCMAKE_BUILD_TYPE=Release -DDESTINATION_DIR=/home/ausweisapp/libs && \ + cmake ../AusweisApp-${VERSION}/libs/ -DCMAKE_BUILD_TYPE=Release -DDESTINATION_DIR=/home/ausweisapp/libs && \ cmake --build . -v && \ \ cd ~/build && mkdir aa2 && cd aa2 && \ - cmake ../AusweisApp2-${VERSION}/ -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH=/home/ausweisapp/libs -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -GNinja && \ + cmake ../AusweisApp-${VERSION}/ -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH=/home/ausweisapp/libs -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -GNinja && \ cmake --build . -v && sudo cmake --install . && \ \ cd ~ && rm -rf build && \ @@ -49,4 +49,4 @@ RUN sudo apk --no-cache --virtual deps add patch cmake make ninja g++ pkgconf pc VOLUME ["/home/ausweisapp/.config"] ENTRYPOINT ["/sbin/tini", "--"] -CMD /usr/sbin/pcscd && /usr/local/bin/AusweisApp2 --address 0.0.0.0 +CMD /usr/sbin/pcscd && /usr/local/bin/AusweisApp --address 0.0.0.0 diff --git a/README.rst b/README.rst index 263023a..31ab897 100644 --- a/README.rst +++ b/README.rst @@ -5,12 +5,12 @@ :target: https://hub.docker.com/r/aklitzing/ausweisapp2/ -AusweisApp2 in Docker (Linux) -============================= +AusweisApp in Docker (Linux) +============================ This docker image contains a minimal OS (AlpineLinux) as a base image. -It builds Qt6 and OpenSSL with the cmake library-script of AusweisApp2 -and builds AusweisApp2 itself. +It builds Qt6 and OpenSSL with the cmake library-script of AusweisApp +and builds AusweisApp itself. Also it contains ``pcscd`` with some additional card reader driver. @@ -18,7 +18,7 @@ Also it contains ``pcscd`` with some additional card reader driver. Start ----- -You could start AusweisApp2 with this command: +You could start AusweisApp with this command: :: @@ -31,7 +31,7 @@ You could start AusweisApp2 with this command: If you are not familiar with Docker. You can add ``-d`` to ``docker run`` to detach from terminal and avoid logging -of AusweisApp2. After you created a container and stopped it you can start it with ``docker start ausweisapp`` if +of AusweisApp. After you created a container and stopped it you can start it with ``docker start ausweisapp`` if you used the provided name. @@ -42,11 +42,11 @@ Troubleshooting - Just add ``-e http_proxy=PROXY:PORT -e https_proxy=PROXY:PORT`` to ``docker run`` cmdline. -- I need AusweisApp2 in English or German. +- I need AusweisApp in English or German. - Change ``-e LANG=$LANG`` to ``-e LANG=de`` or ``-e LANG=en``. -- Window of AusweisApp2 is black/faulted. +- Window of AusweisApp is black/faulted. - Looks like an OpenGL issue. Try to grab the border of the window and resize it. Sometimes it will refresh the buffers and repaint the window correctly.