Update Fedora docker images

- Remove no longer supported versions
- Add current versions

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
Thomas Lauf 2023-01-13 22:40:14 +01:00
parent 84c65f0324
commit ba0514543f
4 changed files with 6 additions and 47 deletions

View file

@ -16,26 +16,18 @@ services:
security_opt:
- label=type:container_runtime_t
tty: true
test-fedora31:
test-fedora36:
build:
context: .
dockerfile: test/docker/fedora31
dockerfile: test/docker/fedora36
network_mode: "host"
security_opt:
- label=type:container_runtime_t
tty: true
test-fedora32:
test-fedora37:
build:
context: .
dockerfile: test/docker/fedora32
network_mode: "host"
security_opt:
- label=type:container_runtime_t
tty: true
test-fedora33:
build:
context: .
dockerfile: test/docker/fedora33
dockerfile: test/docker/fedora37
network_mode: "host"
security_opt:
- label=type:container_runtime_t

View file

@ -1,33 +0,0 @@
FROM fedora:33
RUN dnf update -y
RUN dnf install -y \
asciidoctor \
cmake \
findutils \
gcc-c++ \
glibc-locale-source \
git \
make \
man \
python3 \
python3-dateutil
# Setup environment
RUN alternatives --install /usr/bin/python python /usr/bin/python3 10
RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
# Setup timewarrior
ADD . /root/code/
WORKDIR /root/code/
RUN git clean -dfx
RUN git submodule init
RUN git submodule update
RUN cmake -DCMAKE_BUILD_TYPE=debug .
RUN make -j2
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 ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version"]

View file

@ -1,4 +1,4 @@
FROM fedora:31
FROM fedora:36
RUN dnf update -y
RUN dnf install -y \

View file

@ -1,4 +1,4 @@
FROM fedora:32
FROM fedora:37
RUN dnf update -y
RUN dnf install -y \