mirror of
https://github.com/GothenburgBitFactory/timewarrior.git
synced 2025-07-07 20:06:39 +02:00
Replace Fedora 28 and Fedora 29 by Fedora 31 and Fedora 32
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
parent
60c138b959
commit
1308a124bb
4 changed files with 14 additions and 20 deletions
|
@ -1,9 +1,10 @@
|
|||
FROM fedora:28
|
||||
FROM fedora:31
|
||||
|
||||
RUN dnf update -y
|
||||
RUN dnf install -y \
|
||||
cmake \
|
||||
gcc-c++ \
|
||||
glibc-locale-source \
|
||||
git \
|
||||
make \
|
||||
man \
|
||||
|
@ -14,10 +15,6 @@ RUN dnf install -y \
|
|||
RUN alternatives --install /usr/bin/python python /usr/bin/python3 10
|
||||
RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
||||
|
||||
ENV LC_ALL en_US.UTF-8
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LANGUAGE en_US.UTF-8
|
||||
|
||||
# Setup timewarrior
|
||||
ADD . /root/code/
|
||||
WORKDIR /root/code/
|
||||
|
@ -31,4 +28,4 @@ RUN make install
|
|||
# Setup tests
|
||||
RUN make -j2 test || true
|
||||
WORKDIR /root/code/test/
|
||||
CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version; exit $FAILED"]
|
||||
CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version"]
|
|
@ -1,9 +1,10 @@
|
|||
FROM fedora:29
|
||||
FROM fedora:32
|
||||
|
||||
RUN dnf update -y
|
||||
RUN dnf install -y \
|
||||
cmake \
|
||||
gcc-c++ \
|
||||
glibc-locale-source \
|
||||
git \
|
||||
make \
|
||||
man \
|
||||
|
@ -14,10 +15,6 @@ RUN dnf install -y \
|
|||
RUN alternatives --install /usr/bin/python python /usr/bin/python3 10
|
||||
RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
||||
|
||||
ENV LC_ALL en_US.UTF-8
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LANGUAGE en_US.UTF-8
|
||||
|
||||
# Setup timewarrior
|
||||
ADD . /root/code/
|
||||
WORKDIR /root/code/
|
||||
|
@ -31,4 +28,4 @@ RUN make install
|
|||
# Setup tests
|
||||
RUN make -j2 test || true
|
||||
WORKDIR /root/code/test/
|
||||
CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version; exit $FAILED"]
|
||||
CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version"]
|
Loading…
Add table
Add a link
Reference in a new issue