From 1308a124bb21cd487408d24d7cc148fc1d5cc5c3 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Sun, 23 Aug 2020 12:53:44 +0200 Subject: [PATCH] Replace Fedora 28 and Fedora 29 by Fedora 31 and Fedora 32 Signed-off-by: Thomas Lauf --- .travis.yml | 8 ++++---- docker-compose.yml | 8 ++++---- test/docker/{fedora28 => fedora31} | 9 +++------ test/docker/{fedora29 => fedora32} | 9 +++------ 4 files changed, 14 insertions(+), 20 deletions(-) rename test/docker/{fedora28 => fedora31} (74%) rename test/docker/{fedora29 => fedora32} (74%) diff --git a/.travis.yml b/.travis.yml index de43d0e4..6fd79697 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,13 @@ matrix: os: linux env: CONTAINER=centos8 services: docker - - name: "Fedora 28" + - name: "Fedora 31" os: linux - env: CONTAINER=fedora28 + env: CONTAINER=fedora31 services: docker - - name: "Fedora 29" + - name: "Fedora 32" os: linux - env: CONTAINER=fedora29 + env: CONTAINER=fedora32 services: docker - name: "Debian Stable" os: linux diff --git a/docker-compose.yml b/docker-compose.yml index 1f48fe19..21fc13a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,17 @@ version: '3' services: - test-fedora28: + test-fedora31: build: context: . - dockerfile: test/docker/fedora28 + dockerfile: test/docker/fedora31 network_mode: "host" security_opt: - label=type:container_runtime_t tty: true - test-fedora29: + test-fedora32: build: context: . - dockerfile: test/docker/fedora29 + dockerfile: test/docker/fedora32 network_mode: "host" security_opt: - label=type:container_runtime_t diff --git a/test/docker/fedora28 b/test/docker/fedora31 similarity index 74% rename from test/docker/fedora28 rename to test/docker/fedora31 index 7236cdd2..b69c1e8f 100644 --- a/test/docker/fedora28 +++ b/test/docker/fedora31 @@ -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"] diff --git a/test/docker/fedora29 b/test/docker/fedora32 similarity index 74% rename from test/docker/fedora29 rename to test/docker/fedora32 index cdf9d2e1..63ad9f9c 100644 --- a/test/docker/fedora29 +++ b/test/docker/fedora32 @@ -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"]