Skip to content

Commit d3b6c05

Browse files
Merge pull request #1 from ScriptAutomate/salt-repo-file
Add salt.repo file for new packages.broadcom.com location; add devcontainer for GitHub Workspaces integration
2 parents e635de6 + 2bfcedd commit d3b6c05

File tree

4 files changed

+74
-9
lines changed

4 files changed

+74
-9
lines changed

.devcontainer.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/python
3+
{
4+
"name": "Salt Install Guide",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/python:0-3.10-bullseye",
7+
"features": {
8+
"ghcr.io/devcontainers-contrib/features/pre-commit:2": {
9+
"version": "latest"
10+
},
11+
"ghcr.io/devcontainers-contrib/features/nox:2": {
12+
"version": "latest"
13+
}
14+
},
15+
16+
// Features to add to the dev container. More info: https://containers.dev/features.
17+
// "features": {},
18+
19+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
20+
// "forwardPorts": [],
21+
22+
// Use 'postCreateCommand' to run commands after the container is created.
23+
// "postCreateCommand": "pip3 install -U pip setuptools"
24+
"postCreateCommand": "echo \"alias serve='python -m http.server -d /workspaces/salt-install-guide/docs/_build/html'\" >> ~/.bashrc && sudo apt update && sudo apt install vim -y && sudo rm -rf /var/lib/apt/lists/*"
25+
26+
// There is also a postStartCommand that executes every time the container starts.
27+
// The parameters behave exactly like postCreateCommand, but the commands execute on start rather than create.
28+
// "postStartCommand": "alias serve='python -m http.server -d /workspaces/salt-install-guide/docs/_build/html' > ~/.bashrc"
29+
30+
// Configure tool-specific properties.
31+
// "customizations": {},
32+
33+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
34+
// "remoteUser": "root"
35+
}

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ def setup(app):
141141
"sphinx.ext.todo",
142142
"sphinx-prompt", # Required by sphinx_substitution_extensions
143143
"sphinx_inline_tabs",
144-
# "sphinx_multiversion", # To ensure publishing of mulitple, versioned sites
145144
"sphinx_substitution_extensions",
146145
]
147146
# Render TODO directives

docs/requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# If using version selector, use
22
# Temporary Furo theme target for versioning
3-
# furo>=2022.6.21
4-
Sphinx-Substitution-Extensions>=2022.2.16
3+
# furo==2022.6.21
4+
Sphinx-Substitution-Extensions==2022.02.16
55
requests>=2.31.0
66
salt-furo-versioner @ git+https://github.com/ScriptAutomate/salt-furo-versioner@excelsior
7-
sphinx-copybutton>=0.5.0
8-
sphinx-design
9-
sphinx-inline-tabs>=2022.1.2b11
10-
sphinx-prompt
11-
sphinx-tabs>=3.4.1
12-
sphinx>=5.3.0
7+
sphinx-copybutton==0.5.2
8+
sphinx-design==0.5.0
9+
sphinx-inline-tabs==2023.4.21
10+
sphinx-prompt==1.5.0
11+
sphinx-tabs==3.4.7
12+
sphinx==5.3.0

salt.repo

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[salt-repo-3006-lts]
2+
name=Salt Repo for Salt v3006 LTS
3+
baseurl=https://packages.broadcom.com/artifactory/saltproject-rpm/
4+
skip_if_unavailable=True
5+
priority=10
6+
enabled=1
7+
enabled_metadata=1
8+
gpgcheck=1
9+
exclude=*3007* *3008* *3009* *3010*
10+
gpgkey=https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
11+
12+
[salt-repo-3007-sts]
13+
name=Salt Repo for Salt v3007 STS
14+
baseurl=https://packages.broadcom.com/artifactory/saltproject-rpm/
15+
skip_if_unavailable=True
16+
priority=10
17+
enabled=0
18+
enabled_metadata=1
19+
gpgcheck=1
20+
exclude=*3006* *3008* *3009* *3010*
21+
gpgkey=https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
22+
23+
[salt-repo-latest]
24+
name=Salt Repo for Salt LATEST release
25+
baseurl=https://packages.broadcom.com/artifactory/saltproject-rpm/
26+
skip_if_unavailable=True
27+
priority=10
28+
enabled=0
29+
enabled_metadata=1
30+
gpgcheck=1
31+
gpgkey=https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public

0 commit comments

Comments
 (0)