Skip to content

Commit aaa9be5

Browse files
authored
Upgrade version and fixed imagecustomizer files location to comply with RPM guidelines. (#14579)
1 parent 92f7dcc commit aaa9be5

4 files changed

Lines changed: 24 additions & 19 deletions

File tree

.pipelines/containerSourceData/imagecustomizer/Dockerfile-imagecustomizer

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ RUN tdnf update -y && \
2525

2626
# Create virtual environment and install Python dependencies for telemetry
2727
RUN python3 -m venv /opt/telemetry-venv
28-
RUN /opt/telemetry-venv/bin/pip install --no-cache-dir -r /imagecustomizer-telemetry-requirements.txt
28+
RUN /opt/telemetry-venv/bin/pip install --no-cache-dir -r /usr/lib/imagecustomizer/telemetry-requirements.txt
2929

30-
ENTRYPOINT ["/usr/local/bin/imagecustomizer-entrypoint.sh"]
30+
ENTRYPOINT ["/usr/lib/imagecustomizer/entrypoint.sh"]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Signatures": {
3-
"azurelinux-image-tools-0.18.0.tar.gz": "dc0a167cbce8164f1a051abde165a575d411774cc65020bd39d6dfe0bb120064",
4-
"azurelinux-image-tools-0.18.0-vendor.tar.gz": "6fadff7d823a97658704183f028ecc94e9725fe3ffcba1e4eb48c2d291c184da"
3+
"azurelinux-image-tools-0.19.0.tar.gz": "7465609d2f0e8988b21abaa0ed3192588e7fc6362bd6ec3bacf90c40d036efb4",
4+
"azurelinux-image-tools-0.19.0-vendor.tar.gz": "6fadff7d823a97658704183f028ecc94e9725fe3ffcba1e4eb48c2d291c184da"
55
}
66
}

SPECS/azurelinux-image-tools/azurelinux-image-tools.spec

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Summary: Azure Linux Image Tools
44
Name: azurelinux-image-tools
5-
Version: 0.18.0
5+
Version: 0.19.0
66
Release: 1%{?dist}
77
License: MIT
88
URL: https://github.com/microsoft/azure-linux-image-tools/
@@ -75,14 +75,14 @@ install -p -m 0755 toolkit/out/tools/imagecustomizer %{buildroot}%{_bindir}/imag
7575

7676
# Install container support files for imagecustomizer subpackage
7777
# These files are used when building the imagecustomizer container
78-
mkdir -p %{buildroot}/usr/local/bin
79-
mkdir -p %{buildroot}/
78+
mkdir -p %{buildroot}%{_bindir}
79+
mkdir -p %{buildroot}%{_libdir}/imagecustomizer
8080

81-
# Copy container scripts from their source locations to container paths
82-
install -p -m 0755 toolkit/tools/imagecustomizer/container/entrypoint.sh %{buildroot}/usr/local/bin/imagecustomizer-entrypoint.sh
83-
install -p -m 0755 toolkit/tools/imagecustomizer/container/run.sh %{buildroot}/usr/local/bin/imagecustomizer-run.sh
84-
install -p -m 0755 toolkit/scripts/telemetry_hopper/telemetry_hopper.py %{buildroot}/usr/local/bin/telemetry_hopper.py
85-
install -p -m 0644 toolkit/scripts/telemetry_hopper/requirements.txt %{buildroot}/imagecustomizer-telemetry-requirements.txt
81+
# Copy container scripts to component-specific lib directory (internal binaries)
82+
install -p -m 0755 toolkit/tools/imagecustomizer/container/entrypoint.sh %{buildroot}%{_libdir}/imagecustomizer/entrypoint.sh
83+
install -p -m 0755 toolkit/tools/imagecustomizer/container/run.sh %{buildroot}%{_libdir}/imagecustomizer/run.sh
84+
install -p -m 0755 toolkit/scripts/telemetry_hopper/telemetry_hopper.py %{buildroot}%{_libdir}/imagecustomizer/telemetry_hopper.py
85+
install -p -m 0644 toolkit/scripts/telemetry_hopper/requirements.txt %{buildroot}%{_libdir}/imagecustomizer/telemetry-requirements.txt
8686

8787
%check
8888
go test -C toolkit/tools ./...
@@ -92,13 +92,18 @@ go test -C toolkit/tools ./...
9292
%files imagecustomizer
9393
%license LICENSE
9494
%{_bindir}/imagecustomizer
95-
# Container support files - placed in container filesystem paths with imagecustomizer- prefix
96-
/usr/local/bin/imagecustomizer-entrypoint.sh
97-
/usr/local/bin/imagecustomizer-run.sh
98-
/usr/local/bin/telemetry_hopper.py
99-
/imagecustomizer-telemetry-requirements.txt
95+
# Container support files - internal binaries stored in component lib directory
96+
%{_libdir}/imagecustomizer/entrypoint.sh
97+
%{_libdir}/imagecustomizer/run.sh
98+
%{_libdir}/imagecustomizer/telemetry_hopper.py
99+
%{_libdir}/imagecustomizer/telemetry-requirements.txt
100100

101101
%changelog
102+
* Wed Sep 3 2025 Lanze Liu <lanzeliu@microsoft.com> 0.19.0-1
103+
- Upgrade the version.
104+
- Fixed imagecustomizer container files location to comply with RPM packaging guidelines
105+
- Moved container dependency files from /etc to /usr/lib/imagecustomizer/
106+
102107
* Wed Aug 20 2025 Lanze Liu <lanzeliu@microsoft.com> 0.18.0-1
103108
- Original version for Azure Linux (license: MIT).
104109
- License verified.

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,8 @@
905905
"type": "other",
906906
"other": {
907907
"name": "azurelinux-image-tools",
908-
"version": "0.18.0",
909-
"downloadUrl": "https://github.com/microsoft/azure-linux-image-tools/archive/refs/tags/v0.18.0.tar.gz"
908+
"version": "0.19.0",
909+
"downloadUrl": "https://github.com/microsoft/azure-linux-image-tools/archive/refs/tags/v0.19.0.tar.gz"
910910
}
911911
}
912912
},

0 commit comments

Comments
 (0)