Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Fedora support #1460

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions script-library/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Script names end in the Linux distribution "tree" they support. The majority are

- **Debian or Ubuntu**: `-debian`
- **Alpine Linux**: `-alpine`
- **CentOS, RHEL**: `-redhat` (when the `yum` package manager is available - usually community supported).
- **CentOS, RHEL, Fedora**: `-redhat` (when the `yum` package manager is available - usually community supported).

Some scripts have special installation instructions (like `desktop-lite-debian.sh`). Consult the following documents for more information (in order of the script name):

Expand Down Expand Up @@ -71,7 +71,7 @@ RUN ash /tmp/library-scripts/common-alpine.sh \
&& rm -rf /tmp/library-scripts
```

**CentOS/RedHat/Oracle Linux**
**CentOS/RedHat/Fedora/Oracle Linux**

```Dockerfile
COPY library-scripts/*.sh /tmp/library-scripts/
Expand Down
11 changes: 8 additions & 3 deletions script-library/docker-redhat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,14 @@ fi
curl -fsSL https://download.docker.com/linux/${OSNAME}/gpg > /tmp/docker.gpg && \
rpm --import /tmp/docker.gpg

yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${RHEL_COMPAT_VER}.noarch.rpm
yum install -y yum-utils device-mapper-persistent-data lvm2
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
if [ "${OSNAME}" = "fedora" ]; then
yum install -y yum-utils device-mapper-persistent-data lvm2
yum-config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
else
yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${RHEL_COMPAT_VER}.noarch.rpm
yum install -y yum-utils device-mapper-persistent-data lvm2
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
fi

yum -y update
yum -y install docker-ce-cli
Expand Down
2 changes: 1 addition & 1 deletion script-library/docs/common.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

**Script status**: Stable

**OS support**: Debian 9+, Ubuntu 16.04+, Alpine 3.9+, CentOS/RHEL 7+ (community supported) and downstream distros.
**OS support**: Debian 9+, Ubuntu 16.04+, Alpine 3.9+, CentOS/RHEL 7+/Fedora (community supported) and downstream distros.

**Maintainer:** The VS Code and GitHub Codespaces teams

Expand Down
4 changes: 2 additions & 2 deletions script-library/docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

**Script status**: Stable

**OS support**: Debian 9+, Ubuntu 18.04+, CentOS/RHEL 7+ (community supported) and downstream distros.
**OS support**: Debian 9+, Ubuntu 18.04+, CentOS/RHEL 7+/Fedora (community supported) and downstream distros.

**Maintainer:** The VS Code and GitHub Codespaces teams, [@smankoo](https://github.com/smankoo) (`docker-redhat.sh`)

Expand Down Expand Up @@ -90,7 +90,7 @@ See the [`docker-from-docker`](../../containers/docker-from-docker) and [`docker
CMD ["sleep", "infinity"]
```

For CentOS/RedHat, simply replace the `RUN` above with:
For CentOS/RedHat/Fedora, simply replace the `RUN` above with:

```Dockerfile
RUN bash /tmp/library-scripts/docker-redhat.sh
Expand Down
23 changes: 23 additions & 0 deletions script-library/test/regression/fedora/.devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "Script Tester - Fedora",
"build": {
"dockerfile": "../Dockerfile",
"context": "../../../",
"args": {
"IMAGE_TO_TEST": "fedora:36",
"USERNAME": "vscode",
"DISTRO": "redhat"
}
},

"mounts": [ "source=/var/run/docker.sock,target=/var/run/docker-host.sock,type=bind" ],
"workspaceMount": "source=${localWorkspaceFolder}/../../..,target=/workspace,type=bind",
"workspaceFolder": "/workspace",
"overrideCommand": false,

"extensions": [
"ms-azuretools.vscode-docker"
],

"remoteUser": "vscode"
}