Skip to content
Merged
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ features/src/**/installer_*

# Cache for prepared and cleaned feature for packaging/publishing
.prepared-feature/

.devcontainer/devcontainer-lock.json
2 changes: 1 addition & 1 deletion features/src/dotnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ A package which installs .NET SDKs, runtimes and workloads.

```json
"features": {
"ghcr.io/postfinance/devcontainer-features/dotnet:1.0.0": {
"ghcr.io/postfinance/devcontainer-features/dotnet:1.0.1": {
"version": "10.0",
"additionalVersions": "",
"dotnetRuntimeVersions": "",
Expand Down
4 changes: 2 additions & 2 deletions features/src/dotnet/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "dotnet",
"version": "1.0.0",
"version": "1.0.1",
"name": ".NET",
"description": "A package which installs .NET SDKs, runtimes and workloads.",
"options": {
Expand Down Expand Up @@ -84,4 +84,4 @@
"DOTNET_USE_POLLING_FILE_WATCHER": "true",
"DOTNET_CLI_TELEMETRY_OPTOUT": "1"
}
}
}
2 changes: 1 addition & 1 deletion features/src/kubectl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Installs kubectl and other tools for managing kubernetes.

```json
"features": {
"ghcr.io/postfinance/devcontainer-features/kubectl:1.1.0": {
"ghcr.io/postfinance/devcontainer-features/kubectl:1.1.1": {
"version": "latest",
"kubectxVersion": "latest",
"kubensVersion": "latest",
Expand Down
4 changes: 2 additions & 2 deletions features/src/kubectl/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "kubectl",
"version": "1.1.0",
"version": "1.1.1",
"name": "kubectl",
"description": "Installs kubectl and other tools for managing kubernetes.",
"options": {
Expand Down Expand Up @@ -131,4 +131,4 @@
"description": "The download URL to use for kube-score binaries."
}
}
}
}
2 changes: 1 addition & 1 deletion features/src/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Installs Python.

```json
"features": {
"ghcr.io/postfinance/devcontainer-features/python:1.2.0": {
"ghcr.io/postfinance/devcontainer-features/python:1.2.1": {
"version": "latest",
"downloadUrl": "",
"pipIndex": "",
Expand Down
2 changes: 1 addition & 1 deletion features/src/python/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "python",
"version": "1.2.0",
"version": "1.2.1",
"name": "Python",
"description": "Installs Python.",
"options": {
Expand Down
2 changes: 1 addition & 1 deletion features/src/system-packages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Install arbitrary system packages using the system package manager.

```json
"features": {
"ghcr.io/postfinance/devcontainer-features/system-packages:1.0.0": {
"ghcr.io/postfinance/devcontainer-features/system-packages:1.0.1": {
"packages": ""
}
}
Expand Down
4 changes: 2 additions & 2 deletions features/src/system-packages/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "system-packages",
"version": "1.0.0",
"version": "1.0.1",
"name": "System Packages",
"description": "Install arbitrary system packages using the system package manager.",
"options": {
Expand All @@ -14,4 +14,4 @@
"default": ""
}
}
}
}
12 changes: 5 additions & 7 deletions installer/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,28 +107,26 @@ func (s *system) OsInfo() *OsInfo {
if err := scanner.Err(); err != nil {
return
}
// We do not know which values are provided by the OS, so we take what
// we can get and set undefined values to "unknown"
vendor, ok := infoMap["ID"]
if !ok {
return
vendor = "unknown"
}
codename, ok := infoMap["VERSION_CODENAME"]
if !ok {
return
codename = "unknown"
}
versionId, ok := infoMap["VERSION_ID"]
if !ok {
return
versionId = "unknown"
}
s.osInfo = &OsInfo{
Vendor: vendor,
Codename: codename,
VersionId: versionId,
}
})
if s.osInfo == nil {
// Fill with unknown if we couldn't read the OS info
s.osInfo = &OsInfo{Vendor: "unknown", Codename: "unknown", VersionId: "unknown"}
}
return s.osInfo
}

Expand Down
Loading