Skip to content

Commit

Permalink
update docu and remove Trivy where is not used
Browse files Browse the repository at this point in the history
  • Loading branch information
mpaulic committed Sep 23, 2024
1 parent fb2427e commit c446570
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
4 changes: 3 additions & 1 deletion ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ The main Ansible playbook [`configure-image-factory-vm.yml`](./configure-image-f

The [`podman`](./roles/podman) role configures Podman on the runner host VM. It sets up necessary directories, templates configuration files and GitHub PAT, logs into the Azure Container Registry, pulls the runner image, and creates the runner container. It also generates a systemd unit file for the runner container, ensuring it is managed by systemd, which enables automatic restarts and ensures that the container starts on system boot.

**Important Note:** Podman runner containers are currently rootless, but are still running with "--priviledged" flag. Further setup is needed in Ansible podman role to remove this flag.

## GitHub Workflow

The Ansible playbook is executed through the GitHub Actions workflow [`ansible-configure-if-vm.yml`](../.github/workflows/ansible-configure-if-vm.yml). This workflow handles both development and air-gapped environments, and templates the necessary SSH keys and inventory files accordingly.
Expand All @@ -20,4 +22,4 @@ The Ansible playbook is executed through the GitHub Actions workflow [`ansible-c
2. Template SSH Key and Inventory (based on the environment)
3. Template Ansible Variables
4. Install and Configure Ansible
5. Run Ansible Playbook
5. Run Ansible Playbook
8 changes: 1 addition & 7 deletions images/packer/image-factory-vm/scripts/setup-vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,4 @@ apt-get install --no-install-recommends -y \
rm -rf /var/lib/apt/lists/*

# Install Azure CLI
curl -sL https://aka.ms/InstallAzureCLIDeb | bash

# Set up Trivy repository and install Trivy
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | apt-key add -
echo deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main | tee -a /etc/apt/sources.list.d/trivy.list
apt-get update
apt-get install -y trivy
curl -sL https://aka.ms/InstallAzureCLIDeb | bash

0 comments on commit c446570

Please sign in to comment.