Skip to content

Commit

Permalink
tools/docker: Cleanup fedora support
Browse files Browse the repository at this point in the history
* Remove EOL release (33 to 36)
* Add Fedora-39
  • Loading branch information
Mizux committed Jul 24, 2023
1 parent 4adb9eb commit 33b21a1
Show file tree
Hide file tree
Showing 21 changed files with 12 additions and 543 deletions.
7 changes: 2 additions & 5 deletions tools/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,9 @@ help:
@echo -e "\t\t${BOLD}debian-sid${RESET} (unstable)"
@echo -e "\t\t${BOLD}debian-11${RESET} (bullseye, latest)"
@echo -e "\t\t${BOLD}debian-10${RESET} (buster)"
@echo -e "\t\t${BOLD}fedora-39${RESET} (rawhide)"
@echo -e "\t\t${BOLD}fedora-38${RESET} (rawhide)"
@echo -e "\t\t${BOLD}fedora-37${RESET} (latest)"
@echo -e "\t\t${BOLD}fedora-36${RESET}"
@echo -e "\t\t${BOLD}fedora-35${RESET}"
@echo -e "\t\t${BOLD}fedora-34${RESET}"
@echo -e "\t\t${BOLD}fedora-33${RESET}"
@echo -e "\t\t${BOLD}opensuse-leap${RESET} (latest)"
@echo -e "\t\t${BOLD}ubuntu-23.04${RESET} (Ubuntu 23.04, rolling)"
@echo -e "\t\t${BOLD}ubuntu-22.10${RESET} (Ubuntu 22.10)"
Expand Down Expand Up @@ -407,7 +404,7 @@ DISTROS := \
archlinux \
centos-7 centos-8 \
debian-10 debian-11 debian-sid \
fedora-33 fedora-34 fedora-35 fedora-36 fedora-37 fedora-38 \
fedora-37 fedora-38 fedora-39 \
opensuse-leap \
ubuntu-20.04 ubuntu-22.04 ubuntu-22.10 ubuntu-23.04

Expand Down
109 changes: 0 additions & 109 deletions tools/docker/images/fedora-33.Dockerfile

This file was deleted.

99 changes: 0 additions & 99 deletions tools/docker/images/fedora-34.Dockerfile

This file was deleted.

99 changes: 0 additions & 99 deletions tools/docker/images/fedora-35.Dockerfile

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ref: https://hub.docker.com/_/fedora
FROM fedora:36 AS env
FROM fedora:39 AS env

#############
## SETUP ##
Expand All @@ -21,7 +21,7 @@ RUN dnf -y update \
# Install .Net
# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora
RUN dnf -y update \
&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \
&& dnf -y install dotnet-sdk-6.0 \
&& dnf clean all
# Trigger first run experience by running arbitrary cmd
RUN dotnet --info
Expand Down
33 changes: 0 additions & 33 deletions tools/docker/test/fedora-33/dotnet.Dockerfile

This file was deleted.

Loading

0 comments on commit 33b21a1

Please sign in to comment.