Skip to content

Commit 57f868f

Browse files
authored
[3.0] Merge changes for Mid-August release (microsoft#14562)
2 parents 62084ef + d220b7f commit 57f868f

File tree

201 files changed

+10980
-1728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+10980
-1728
lines changed

.github/workflows/check-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
# Additional checks for binary files and large files
9898
if [[ -f "$file" ]]; then
9999
# Check if file is binary (but allow .sh files even if executable)
100-
if [[ "$extension" != "sh" ]] && file "$file" | grep -q "binary\|executable\|archive\|compressed"; then
100+
if file "$file" | grep -q "binary\|archive\|compressed"; then
101101
should_be_in_blob_store=true
102102
fi
103103
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Verify osguard imageconfigs are up-to-date
2+
3+
on:
4+
pull_request:
5+
workflow_dispatch:
6+
7+
jobs:
8+
verify-osguard-imageconfigs:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout repository
12+
uses: actions/checkout@v4
13+
14+
- name: Set up Python
15+
uses: actions/setup-python@v5
16+
with:
17+
python-version: '3.x'
18+
19+
- name: Install Python dependencies for merge_yaml
20+
run: |
21+
python -m pip install --upgrade pip
22+
pip install pyyaml
23+
24+
- name: Run osguard imageconfigs test
25+
working-directory: toolkit/scripts
26+
shell: bash
27+
run: |
28+
set -euo pipefail
29+
./generate-osguard-imageconfigs.sh test
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT License.
3+
4+
ARG BASE_IMAGE
5+
ARG TARGETARCH
6+
ARG AZ_MON_CONN_STR
7+
8+
FROM $BASE_IMAGE
9+
10+
ENV AZURE_MONITOR_CONNECTION_STRING=${AZ_MON_CONN_STR}
11+
12+
@INCLUDE_MAIN_RUN_INSTRUCTION@
13+
14+
RUN tdnf update -y && \
15+
tdnf install -y azurelinux-repos-cloud-native && \
16+
tdnf update -y && \
17+
tdnf install -y oras && \
18+
if [ "$TARGETARCH" = "amd64" ]; then \
19+
echo "Installing AMD64-specific packages..."; \
20+
tdnf install -y grub2-pc systemd-ukify; \
21+
else \
22+
echo "Skipping AMD64-specific packages for $TARGETARCH"; \
23+
fi && \
24+
tdnf clean all
25+
26+
# Create virtual environment and install Python dependencies for telemetry
27+
RUN python3 -m venv /opt/telemetry-venv
28+
RUN /opt/telemetry-venv/bin/pip install --no-cache-dir -r /imagecustomizer-telemetry-requirements.txt
29+
30+
ENTRYPOINT ["/usr/local/bin/imagecustomizer-entrypoint.sh"]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
imagecustomizer
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
qemu-img
2+
rpm
3+
coreutils
4+
util-linux
5+
systemd
6+
openssl
7+
sed
8+
createrepo_c
9+
squashfs-tools
10+
cdrkit
11+
parted
12+
e2fsprogs
13+
dosfstools
14+
xfsprogs
15+
zstd
16+
veritysetup
17+
grub2
18+
binutils
19+
lsof
20+
python3
21+
python3-pip
22+
jq
23+
azurelinux-image-tools-imagecustomizer

0 commit comments

Comments
 (0)