Skip to content

Commit

Permalink
Merge pull request #5 from nutanixdev/release-0.4.0
Browse files Browse the repository at this point in the history
Release 0.4.0
  • Loading branch information
pipoe2h authored Feb 17, 2024
2 parents 05fc668 + b040b48 commit f781c6b
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 36 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
ARG VARIANT="3.11-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
ARG VARIANT="3.12-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/python:1-${VARIANT}

ENV PYTHONUNBUFFERED 1

Expand Down Expand Up @@ -68,7 +68,7 @@ RUN if [ "${KUBECTL_KARBON}" != "false" ]; then \
RUN if [ "${CALM_DSL_VERSION}" != "none" ]; then \
bash /tmp/library-scripts/calmdsl-debian.sh "${CALM_DSL_VERSION}" \
&& mkdir /home/$USERNAME/.calm \
&& chown -R $USERNAME /home/$USERNAME/.calm; \
&& chown -R $USERNAME /home/$USERNAME; \
fi \
&& rm -rf /tmp/library-scripts

Expand Down
30 changes: 13 additions & 17 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "Nutanix DevStation (Community)",
"name": "Nutanix Dev Station (Community)",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
// Append -bullseye or -buster to pin to an OS version.
// Use -bullseye variants on local on arm64/Apple Silicon.
"VARIANT": "3.11-bullseye",
"VARIANT": "3.12-bullseye",
// Options
"ANSIBLE_VERSION": "7.3.0",
"PACKER_VERSION": "1.9.2",
"CALM_DSL_VERSION": "3.7.0", // "master",
"ANSIBLE_VERSION": "9.2.0",
"PACKER_VERSION": "1.9.2", // latest releases under MPL
"CALM_DSL_VERSION": "master", // "master",
"KUBECTL_KARBON": "true",
"NUTANIX_V4_SDK": "true",
"OPENSHIFT_CLI_VERSION": "stable-4.14",
"OPENSHIFT_INSTALL_VERSION": "stable-4.14",
"CLUSTERCTL_VERSION": "1.5.3",
"K9S_VERSION": "0.27.4",
"COOKIECUTTER_VERSION": "2.4.0"
"CLUSTERCTL_VERSION": "1.6.1",
"K9S_VERSION": "0.31.9",
"COOKIECUTTER_VERSION": "2.5.0"
}
},
"mounts": [
Expand All @@ -28,18 +28,14 @@
],
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {},
"ghcr.io/devcontainers/features/github-cli:1": {
"version": "2.38.0"
},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {},
"ghcr.io/devcontainers/features/powershell:1": {
"version": "7.3.9"
},
"ghcr.io/devcontainers/features/powershell:1": {},
"ghcr.io/devcontainers/features/terraform:1": {
"version": "1.5.5",
"tflint": "0.48.0",
"terragrunt": "0.53.1"
"version": "1.5.5", // latest releases under MPL
"tflint": "0.50.3",
"terragrunt": "0.55.2"
}
},
"postCreateCommand": "bash .devcontainer/postCreateCommand.sh",
Expand Down
1 change: 0 additions & 1 deletion .devcontainer/library-scripts/calmdsl-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ fi
# Install Calm DSL
unzip ${calmdsl_filename}
cd calm-dsl-${CALM_DSL_VERSION}
sed -i "s/asciimatics>==1.13.0/asciimatics>=1.13.0/" requirements.txt
pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt
make dist
pip3 --disable-pip-version-check --no-cache-dir install dist/calm.dsl*.whl
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/postCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fi

if [ -d "/calm" ] && [ -z "$(ls -A $HOME/.calm)" ]
then
sudo cp -a /calm/. $HOME/.calm/
cp -a /calm/. $HOME/.calm/
fi

if [ -d "/nutanixdev" ] && [ -z "$(ls -A $HOME/.nutanixdev)" ]
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2024-02-17

- Update: v3.12 is the new default Python container image
- Update: bump tools and SDKs versions
- Update: a few devcontainer features changed to install latest

2023-11-09

- Added: support for persistent user profile
Expand Down
32 changes: 18 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ git clone https://github.com/nutanixdev/nutanix-devstation.git --config core.aut

### CLIs

- [x] Python v3.11.x
- [x] Calm DSL v3.7.0
- [x] Ansible v2.14.11 (pip v7.3.0)
- [x] Python v3.12.x
- [x] Calm DSL latest
- [x] Ansible v2.16.3 (pip v9.2.0)
- [x] Terraform v1.5.5
- [x] PowerShell v7.3.9
- [x] PowerShell v7.4.1
- [x] Packer v1.9.2
- [x] Kubectl v1.28.3
- [x] Helm v3.13.1
- [x] minikube v1.31.2
- [x] Kubectl-karbon v0.11.4
- [x] OpenShift CLI (oc) v4.14.1
- [x] OpenShift Install CLI v4.14.1
- [x] Clusterctl v1.5.3
- [x] k9s v0.27.4
- [x] Cookiecutter v2.4.0
- [x] GitHub CLI v2.38.0
- [x] Kubectl v1.29.2
- [x] Helm v3.14.1
- [x] minikube v1.32.0
- [x] Kubectl-karbon v0.11.5
- [x] OpenShift CLI (oc) v4.14.11
- [x] OpenShift Install CLI v4.14.11
- [x] Clusterctl v1.6.1
- [x] k9s v0.31.9
- [x] Cookiecutter v2.5.0
- [x] GitHub CLI v2.44.1
- [ ] Nutanix CLI (nCLI)
- [ ] Acropolis CLI (aCLI)

Expand Down Expand Up @@ -97,6 +97,10 @@ https://www.nutanix.com/legal/terms-of-use

## CHANGELOG

### Version 0.4.0

- Python updated to version 3.12

### Version 0.3.0

- Support for persistent user profile (.calm and .nutanixdev volumes are migrated to a new one)
Expand Down

0 comments on commit f781c6b

Please sign in to comment.