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: 1 addition & 1 deletion .github/workflows/docker-image-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Pulling Catapult repository...
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

- name: Logging into to GitHub Container Registry...
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Pulling Catapult repository...
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
fetch-depth: 0

Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:

steps:
- name: Cloning the repository repo...
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
fetch-depth: 0
fetch-tags: true
Expand Down
7 changes: 4 additions & 3 deletions defaults/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description = "This a Python virtual environment for Catapult"
requires-python = ">=3.12"
dependencies = [
"aiohttp",
"ansible-core==2.18.11",
"ansible-core==2.19.4",
"ansible-lint",
"ansible-pylibssh",
"ansible-specdoc",
Expand All @@ -22,7 +22,7 @@ dependencies = [
"azure-mgmt-mysqlflexibleservers",
"azure-mgmt-batch",
"azure-mgmt-cdn",
"azure-mgmt-compute==33.0.0", # https://github.com/ansible-collections/azure/blob/dev/requirements.txt#L11
"azure-mgmt-compute==33.0.0", # https://github.com/ansible-collections/azure/blob/dev/requirements.txt
"azure-mgmt-containerinstance",
"azure-mgmt-containerregistry",
"azure-mgmt-containerservice",
Expand Down Expand Up @@ -55,12 +55,13 @@ dependencies = [
"azure-mgmt-search",
"azure-mgmt-servicebus",
"azure-mgmt-sql",
"azure-mgmt-storage==21.2.1", # https://github.com/ansible-collections/azure/blob/dev/requirements.txt#L35
"azure-mgmt-storage",
"azure-mgmt-trafficmanager",
"azure-mgmt-web",
"azure-nspkg",
"azure-storage-blob",
"boto3",
"bcrypt==4.3.0", # https://foss.heptapod.net/python-libs/passlib/-/issues/196
"botocore",
"cryptography",
"dnspython",
Expand Down
22 changes: 11 additions & 11 deletions defaults/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ collections:
- name: ansible.utils
version: 6.0.0
- name: ansible.windows
version: 3.2.0
version: 3.3.0
- name: azure.azcollection
version: 3.8.0
version: 3.12.0
- name: chocolatey.chocolatey
version: 1.5.3
- name: cisco.ios
Expand All @@ -29,9 +29,9 @@ collections:
- name: community.crypto
version: 3.0.5
- name: community.docker
version: 5.0.0
version: 5.0.3
- name: community.general
version: 12.0.0
version: 12.1.0
- name: community.hashi_vault
version: 7.1.0
- name: community.library_inventory_filtering_v1
Expand All @@ -43,31 +43,31 @@ collections:
- name: community.proxmox
version: 1.3.0
- name: community.routeros
version: 3.13.0
version: 3.14.0
- name: community.vmware
version: 5.10.0
version: 6.1.0
- name: community.windows
version: 3.0.1
- name: fortinet.fortios
version: 2.4.2
- name: kubernetes.core
version: 5.1.0
version: 6.2.0
- name: linode.cloud
version: 0.41.1
- name: microsoft.ad
version: 1.9.2
version: 1.10.0
- name: microsoft.iis
version: 1.0.3
version: 1.1.0
- name: microsoft.sql
version: 2.6.4
version: 2.6.5
- name: openstack.cloud
version: 2.4.1
- name: paloaltonetworks.panos
version: 3.2.0
- name: vmware.vmware_rest
version: 4.9.0
- name: vmware.vmware
version: 2.4.0
version: 2.5.0
- name: vyos.vyos
version: 5.0.0
- name: https://github.com/vmware/ansible-for-nsxt.git
Expand Down
710 changes: 351 additions & 359 deletions defaults/uv.lock

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions inventories/_operating_systems/group_vars/os_alpine.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
# Template created with Packer or manually
base_vm_template: BASE_TEMPLATE_alpine

# Project/environment specific template created with Catapult with base_vm_template as source
vm_template: catapult-template-alpine

# Network configuration method.
# Using the default 'interfaces' for Alpine Linux which uses /etc/network/interfaces
customization_method: interfaces
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
# Template created with Packer or manually
# Used only to create project templates from
base_vm_template: BASE_TEMPLATE_win11_25H2

vm_template: catapult-template-win11-25h2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ami_name_search_string: Windows_Server-2022-English-Full-Base-* # AMI name
aws_vm_size: t3.micro # Default when creating new instance manually

# Azure
azure_vm_size: Standard_DS1_v2 # Recommended by vendor
azure_vm_size: Standard_D2s_v6
azure_vm_image:
offer: windowsserver
publisher: microsoftwindowsserver
Expand Down
48 changes: 27 additions & 21 deletions inventories/_operating_systems/os.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
#####################################

[os_windows:children]
os_windows_server_2025_core
os_windows_server_2025_gui
os_windows_server_2022_core
os_windows_server_2022_gui
os_windows_server_2019_core
os_windows_server_2019_gui
os_windows_server_2016_core
os_windows_server_2016_gui
os_windows_10_21h1
os_windows_10_21h2
os_windows_10_22h2
os_windows_11_21h2
os_windows_11_22h2
os_windows_11_23h2
os_windows_11_24h2
os_windows_11_25h2
os_windows_server_2012_r2_core
os_windows_server_2012_r2_gui
os_windows_11_24h2
os_windows_11_23h2
os_windows_11_22h2
os_windows_11_21h2
os_windows_10_22h2
os_windows_10_21h2
os_windows_10_21h1
os_windows_server_2016_core
os_windows_server_2016_gui
os_windows_server_2019_core
os_windows_server_2019_gui
os_windows_server_2022_core
os_windows_server_2022_gui
os_windows_server_2025_core
os_windows_server_2025_gui

[os_linux:children]
os_almalinux
Expand All @@ -28,6 +29,7 @@ os_debian
os_kali
os_ubuntu
os_proxmox
os_alpine

[os_ubuntu:children]
os_ubuntu_20_04
Expand Down Expand Up @@ -103,13 +105,14 @@ os_panos_11_1_4
[os_windows_server_2012_r2_gui]

# Windows Workstation OS
[os_windows_11_24h2]
[os_windows_11_23h2]
[os_windows_11_22h2]
[os_windows_11_21h2]
[os_windows_10_22h2]
[os_windows_10_21h2]
[os_windows_10_21h1]
[os_windows_10_21h2]
[os_windows_10_22h2]
[os_windows_11_21h2]
[os_windows_11_22h2]
[os_windows_11_23h2]
[os_windows_11_24h2]
[os_windows_11_25h2]

# Linux Ubuntu Server
[os_ubuntu_20_04]
Expand Down Expand Up @@ -142,6 +145,9 @@ os_panos_11_1_4

[os_almalinux_10]

# Linux Alpine
[os_alpine]

# Proxmox
[os_proxmox_8]
[os_proxmox_9]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"license": "UNLICENSED",
"dependencies": {
"prettier": "3.6.2"
"prettier": "3.7.3"
},
"packageManager": "yarn@4.1.1"
}
9 changes: 8 additions & 1 deletion scripts/general/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ PERSONAL_COMPOSE_FILE="-f ${ROOT_DIR}/personal/docker-compose-personal.yml"
START_WITH_CUSTOM_COMPOSE=""
START_WITH_ARA=""

# Checking if personal Docker Compose file exists and creating it if it doesn't
if [[ ! -r personal/docker-compose-personal.yml ]]; then

cp defaults/docker-compose-personal.yml personal/docker-compose-personal.yml

fi

# Also using custom Docker compose file if it exists
if [[ -r custom/docker/docker-compose-custom.yml ]]; then
START_WITH_CUSTOM_COMPOSE="-f ${ROOT_DIR}/custom/docker/docker-compose-custom.yml"
Expand Down Expand Up @@ -161,7 +168,7 @@ else
fi

# shellcheck disable=SC2086
${MAKEVAR_SUDO_COMMAND} docker --context default --context default compose \
${MAKEVAR_SUDO_COMMAND} docker --context default compose \
${DEFAULT_COMPOSE_FILE} \
${START_WITH_ARA} \
${START_WITH_CUSTOM_COMPOSE} \
Expand Down
7 changes: 0 additions & 7 deletions scripts/start-tasks/01-preparation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,3 @@ mkdir -p ./container/home/builder/.history
mkdir -p ./personal/certificates
touch ./personal/.personal_aliases
touch "$HOME/.gitconfig"

# Checking if personal Docker Compose file exists and creating it if it doesn't
if [[ ! -r personal/docker-compose-personal.yml ]]; then

cp defaults/docker-compose-personal.yml personal/docker-compose-personal.yml

fi
2 changes: 1 addition & 1 deletion version.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 9.4.22
version: 9.5.6
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ __metadata:
version: 8
cacheKey: 10c0

"prettier@npm:3.6.2":
version: 3.6.2
resolution: "prettier@npm:3.6.2"
"prettier@npm:3.7.3":
version: 3.7.3
resolution: "prettier@npm:3.7.3"
bin:
prettier: bin/prettier.cjs
checksum: 10c0/488cb2f2b99ec13da1e50074912870217c11edaddedeadc649b1244c749d15ba94e846423d062e2c4c9ae683e2d65f754de28889ba06e697ac4f988d44f45812
checksum: 10c0/ee86bb06121c74dadc54f30b6f99aff6288966d9b842ce501d6991e20d20c6ce2d45028651b3b0955ca6e5fa89c1bee1e72b6f810243a93cef8bc69737972ef7
languageName: node
linkType: hard

"root-workspace-0b6124@workspace:.":
version: 0.0.0-use.local
resolution: "root-workspace-0b6124@workspace:."
dependencies:
prettier: "npm:3.6.2"
prettier: "npm:3.7.3"
languageName: unknown
linkType: soft
Loading