Skip to content

Commit ce88bab

Browse files
andrewpollackandrewpollack
authored
Bazel modifications (#109)
* chore: remove unused go.mod and go.sum files from deploy-images * feat(wkhtmltopdf): update package list and improve documentation for dependencies * feat: update bzlmod structure
1 parent 0348f36 commit ce88bab

File tree

4 files changed

+189
-179
lines changed

4 files changed

+189
-179
lines changed

‎MODULE.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ bazel_dep(name = "gazelle", version = "0.40.0")
55
bazel_dep(name = "rules_pkg", version = "1.1.0")
66
bazel_dep(name = "platforms", version = "1.0.0")
77
bazel_dep(name = "rules_distroless", version = "0.5.1")
8+
bazel_dep(name = "aspect_bazel_lib", version = "2.7.2")
9+
bazel_dep(name = "rules_oci", version = "2.2.6")
810

11+
# Go
912
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
1013
go_sdk.download(version = "1.23.11")
1114

@@ -32,10 +35,7 @@ use_repo(
3235
"org_golang_x_exp",
3336
)
3437

35-
# OCI
36-
bazel_dep(name = "aspect_bazel_lib", version = "2.7.2")
37-
bazel_dep(name = "rules_oci", version = "2.2.6")
38-
38+
# Images
3939
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
4040
oci.pull(
4141
name = "chainguard_static",

‎build_tools/apt/wkhtmltopdf_rules.bzl‎

Lines changed: 185 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,173 +1,188 @@
11
def wkhtmltopdf_deps(arch):
2-
return [
3-
"@bookworm//ca-certificates/" + arch + ":data",
4-
"@bookworm//curl/" + arch + ":data",
5-
"@bookworm//debconf/" + arch + ":data",
6-
"@bookworm//dpkg/" + arch + ":data",
7-
"@bookworm//fontconfig-config/" + arch + ":data",
8-
"@bookworm//fontconfig/" + arch + ":data",
9-
"@bookworm//fonts-dejavu-core/" + arch + ":data",
10-
"@bookworm//gcc-12-base/" + arch + ":data",
11-
"@bookworm//iso-codes/" + arch + ":data",
12-
"@bookworm//libacl1/" + arch + ":data",
13-
"@bookworm//libavahi-client3/" + arch + ":data",
14-
"@bookworm//libavahi-common-data/" + arch + ":data",
15-
"@bookworm//libavahi-common3/" + arch + ":data",
16-
"@bookworm//libblkid1/" + arch + ":data",
17-
"@bookworm//libbrotli1/" + arch + ":data",
18-
"@bookworm//libbsd0/" + arch + ":data",
19-
"@bookworm//libbz2-1.0/" + arch + ":data",
20-
"@bookworm//libc6/" + arch + ":data",
21-
"@bookworm//libcap2-bin/" + arch + ":data",
22-
"@bookworm//libcap2/" + arch + ":data",
23-
"@bookworm//libcom-err2/" + arch + ":data",
24-
"@bookworm//libcups2/" + arch + ":data",
25-
"@bookworm//libcurl4/" + arch + ":data",
26-
"@bookworm//libdb5.3/" + arch + ":data",
27-
"@bookworm//libdbus-1-3/" + arch + ":data",
28-
"@bookworm//libdouble-conversion3/" + arch + ":data",
29-
"@bookworm//libdrm-amdgpu1/" + arch + ":data",
30-
"@bookworm//libdrm-common/" + arch + ":data",
31-
"@bookworm//libdrm-nouveau2/" + arch + ":data",
32-
"@bookworm//libdrm-radeon1/" + arch + ":data",
33-
"@bookworm//libdrm2/" + arch + ":data",
34-
"@bookworm//libdw1/" + arch + ":data",
35-
"@bookworm//libedit2/" + arch + ":data",
36-
"@bookworm//libegl-mesa0/" + arch + ":data",
37-
"@bookworm//libegl1/" + arch + ":data",
38-
"@bookworm//libelf1/" + arch + ":data",
39-
"@bookworm//libelogind0/" + arch + ":data",
40-
"@bookworm//libevdev2/" + arch + ":data",
41-
"@bookworm//libexpat1/" + arch + ":data",
42-
"@bookworm//libffi8/" + arch + ":data",
43-
"@bookworm//libfontconfig1/" + arch + ":data",
44-
"@bookworm//libfreetype6/" + arch + ":data",
45-
"@bookworm//libgbm1/" + arch + ":data",
46-
"@bookworm//libgcc-s1/" + arch + ":data",
47-
"@bookworm//libgcrypt20/" + arch + ":data",
48-
"@bookworm//libgl1-mesa-dri/" + arch + ":data",
49-
"@bookworm//libgl1/" + arch + ":data",
50-
"@bookworm//libglapi-mesa/" + arch + ":data",
51-
"@bookworm//libglib2.0-0/" + arch + ":data",
52-
"@bookworm//libglvnd0/" + arch + ":data",
53-
"@bookworm//libglx-mesa0/" + arch + ":data",
54-
"@bookworm//libglx0/" + arch + ":data",
55-
"@bookworm//libgmp10/" + arch + ":data",
56-
"@bookworm//libgnutls30/" + arch + ":data",
57-
"@bookworm//libgpg-error0/" + arch + ":data",
58-
"@bookworm//libgraphite2-3/" + arch + ":data",
59-
"@bookworm//libgssapi-krb5-2/" + arch + ":data",
60-
"@bookworm//libgstreamer-plugins-base1.0-0/" + arch + ":data",
61-
"@bookworm//libgstreamer1.0-0/" + arch + ":data",
62-
"@bookworm//libgudev-1.0-0/" + arch + ":data",
63-
"@bookworm//libharfbuzz0b/" + arch + ":data",
64-
"@bookworm//libhogweed6/" + arch + ":data",
65-
"@bookworm//libhyphen0/" + arch + ":data",
66-
"@bookworm//libice6/" + arch + ":data",
67-
"@bookworm//libicu72/" + arch + ":data",
68-
"@bookworm//libidn2-0/" + arch + ":data",
69-
"@bookworm//libinput-bin/" + arch + ":data",
70-
"@bookworm//libinput10/" + arch + ":data",
71-
"@bookworm//libjpeg62-turbo/" + arch + ":data",
72-
"@bookworm//libk5crypto3/" + arch + ":data",
73-
"@bookworm//libkeyutils1/" + arch + ":data",
74-
"@bookworm//libkrb5-3/" + arch + ":data",
75-
"@bookworm//libkrb5support0/" + arch + ":data",
76-
"@bookworm//libldap-2.5-0/" + arch + ":data",
77-
"@bookworm//libllvm15/" + arch + ":data",
78-
"@bookworm//liblzma5/" + arch + ":data",
79-
"@bookworm//libmd0/" + arch + ":data",
80-
"@bookworm//libmd4c0/" + arch + ":data",
81-
"@bookworm//libmount1/" + arch + ":data",
82-
"@bookworm//libmtdev1/" + arch + ":data",
83-
"@bookworm//libnettle8/" + arch + ":data",
84-
"@bookworm//libnghttp2-14/" + arch + ":data",
85-
"@bookworm//liborc-0.4-0/" + arch + ":data",
86-
"@bookworm//libp11-kit0/" + arch + ":data",
87-
"@bookworm//libpcre2-16-0/" + arch + ":data",
88-
"@bookworm//libpcre2-8-0/" + arch + ":data",
89-
"@bookworm//libpng16-16/" + arch + ":data",
90-
"@bookworm//libpsl5/" + arch + ":data",
91-
"@bookworm//libqt5core5a/" + arch + ":data",
92-
"@bookworm//libqt5dbus5/" + arch + ":data",
93-
"@bookworm//libqt5gui5/" + arch + ":data",
94-
"@bookworm//libqt5network5/" + arch + ":data",
95-
"@bookworm//libqt5positioning5/" + arch + ":data",
96-
"@bookworm//libqt5printsupport5/" + arch + ":data",
97-
"@bookworm//libqt5qml5/" + arch + ":data",
98-
"@bookworm//libqt5qmlmodels5/" + arch + ":data",
99-
"@bookworm//libqt5quick5/" + arch + ":data",
100-
"@bookworm//libqt5sensors5/" + arch + ":data",
101-
"@bookworm//libqt5svg5/" + arch + ":data",
102-
"@bookworm//libqt5webchannel5/" + arch + ":data",
103-
"@bookworm//libqt5webkit5/" + arch + ":data",
104-
"@bookworm//libqt5widgets5/" + arch + ":data",
105-
"@bookworm//librtmp1/" + arch + ":data",
106-
"@bookworm//libsasl2-2/" + arch + ":data",
107-
"@bookworm//libsasl2-modules-db/" + arch + ":data",
108-
"@bookworm//libselinux1/" + arch + ":data",
109-
"@bookworm//libsensors-config/" + arch + ":data",
110-
"@bookworm//libsensors5/" + arch + ":data",
111-
"@bookworm//libsm6/" + arch + ":data",
112-
"@bookworm//libsqlite3-0/" + arch + ":data",
113-
"@bookworm//libssh2-1/" + arch + ":data",
114-
"@bookworm//libssl3/" + arch + ":data",
115-
"@bookworm//libstdc++6/" + arch + ":data",
116-
"@bookworm//libtasn1-6/" + arch + ":data",
117-
"@bookworm//libtinfo6/" + arch + ":data",
118-
"@bookworm//libudev1/" + arch + ":data",
119-
"@bookworm//libunistring2/" + arch + ":data",
120-
"@bookworm//libunwind8/" + arch + ":data",
121-
"@bookworm//libuuid1/" + arch + ":data",
122-
"@bookworm//libwacom-common/" + arch + ":data",
123-
"@bookworm//libwacom9/" + arch + ":data",
124-
"@bookworm//libwayland-client0/" + arch + ":data",
125-
"@bookworm//libwayland-server0/" + arch + ":data",
126-
"@bookworm//libwebp7/" + arch + ":data",
127-
"@bookworm//libwoff1/" + arch + ":data",
128-
"@bookworm//libx11-6/" + arch + ":data",
129-
"@bookworm//libx11-data/" + arch + ":data",
130-
"@bookworm//libx11-xcb1/" + arch + ":data",
131-
"@bookworm//libxau6/" + arch + ":data",
132-
"@bookworm//libxcb-dri2-0/" + arch + ":data",
133-
"@bookworm//libxcb-dri3-0/" + arch + ":data",
134-
"@bookworm//libxcb-glx0/" + arch + ":data",
135-
"@bookworm//libxcb-icccm4/" + arch + ":data",
136-
"@bookworm//libxcb-image0/" + arch + ":data",
137-
"@bookworm//libxcb-keysyms1/" + arch + ":data",
138-
"@bookworm//libxcb-present0/" + arch + ":data",
139-
"@bookworm//libxcb-randr0/" + arch + ":data",
140-
"@bookworm//libxcb-render-util0/" + arch + ":data",
141-
"@bookworm//libxcb-render0/" + arch + ":data",
142-
"@bookworm//libxcb-shape0/" + arch + ":data",
143-
"@bookworm//libxcb-shm0/" + arch + ":data",
144-
"@bookworm//libxcb-sync1/" + arch + ":data",
145-
"@bookworm//libxcb-util1/" + arch + ":data",
146-
"@bookworm//libxcb-xfixes0/" + arch + ":data",
147-
"@bookworm//libxcb-xinerama0/" + arch + ":data",
148-
"@bookworm//libxcb-xinput0/" + arch + ":data",
149-
"@bookworm//libxcb-xkb1/" + arch + ":data",
150-
"@bookworm//libxcb1/" + arch + ":data",
151-
"@bookworm//libxdmcp6/" + arch + ":data",
152-
"@bookworm//libxext6/" + arch + ":data",
153-
"@bookworm//libxfixes3/" + arch + ":data",
154-
"@bookworm//libxkbcommon-x11-0/" + arch + ":data",
155-
"@bookworm//libxkbcommon0/" + arch + ":data",
156-
"@bookworm//libxml2/" + arch + ":data",
157-
"@bookworm//libxrender1/" + arch + ":data",
158-
"@bookworm//libxshmfence1/" + arch + ":data",
159-
"@bookworm//libxslt1.1/" + arch + ":data",
160-
"@bookworm//libxxf86vm1/" + arch + ":data",
161-
"@bookworm//libz3-4/" + arch + ":data",
162-
"@bookworm//libzstd1/" + arch + ":data",
163-
"@bookworm//lsb-base/" + arch + ":data",
164-
"@bookworm//openssl/" + arch + ":data",
165-
"@bookworm//shared-mime-info/" + arch + ":data",
166-
"@bookworm//sysvinit-utils/" + arch + ":data",
167-
"@bookworm//tar/" + arch + ":data",
168-
"@bookworm//wkhtmltopdf/" + arch + ":data",
169-
"@bookworm//x11-common/" + arch + ":data",
170-
"@bookworm//xkb-data/" + arch + ":data",
171-
"@bookworm//zlib1g/" + arch + ":data",
2+
"""Returns the list of Debian packages required for wkhtmltopdf.
3+
4+
Args:
5+
arch: The target architecture (e.g., "amd64", "arm64")
6+
7+
Returns:
8+
A list of Bazel targets for the required Debian packages.
9+
"""
10+
11+
# Helper function to generate package targets
12+
def _pkg(name):
13+
return "@bookworm//{}/{}:data".format(name, arch)
14+
15+
packages = [
16+
"ca-certificates",
17+
"curl",
18+
"debconf",
19+
"dpkg",
20+
"fontconfig-config",
21+
"fontconfig",
22+
"fonts-dejavu-core",
23+
"gcc-12-base",
24+
"iso-codes",
25+
"libacl1",
26+
"libavahi-client3",
27+
"libavahi-common-data",
28+
"libavahi-common3",
29+
"libblkid1",
30+
"libbrotli1",
31+
"libbsd0",
32+
"libbz2-1.0",
33+
"libc6",
34+
"libcap2-bin",
35+
"libcap2",
36+
"libcom-err2",
37+
"libcups2",
38+
"libcurl4",
39+
"libdb5.3",
40+
"libdbus-1-3",
41+
"libdouble-conversion3",
42+
"libdrm-amdgpu1",
43+
"libdrm-common",
44+
"libdrm-nouveau2",
45+
"libdrm-radeon1",
46+
"libdrm2",
47+
"libdw1",
48+
"libedit2",
49+
"libegl-mesa0",
50+
"libegl1",
51+
"libelf1",
52+
"libelogind0",
53+
"libevdev2",
54+
"libexpat1",
55+
"libffi8",
56+
"libfontconfig1",
57+
"libfreetype6",
58+
"libgbm1",
59+
"libgcc-s1",
60+
"libgcrypt20",
61+
"libgl1-mesa-dri",
62+
"libgl1",
63+
"libglapi-mesa",
64+
"libglib2.0-0",
65+
"libglvnd0",
66+
"libglx-mesa0",
67+
"libglx0",
68+
"libgmp10",
69+
"libgnutls30",
70+
"libgpg-error0",
71+
"libgraphite2-3",
72+
"libgssapi-krb5-2",
73+
"libgstreamer-plugins-base1.0-0",
74+
"libgstreamer1.0-0",
75+
"libgudev-1.0-0",
76+
"libharfbuzz0b",
77+
"libhogweed6",
78+
"libhyphen0",
79+
"libice6",
80+
"libicu72",
81+
"libidn2-0",
82+
"libinput-bin",
83+
"libinput10",
84+
"libjpeg62-turbo",
85+
"libk5crypto3",
86+
"libkeyutils1",
87+
"libkrb5-3",
88+
"libkrb5support0",
89+
"libldap-2.5-0",
90+
"libllvm15",
91+
"liblzma5",
92+
"libmd0",
93+
"libmd4c0",
94+
"libmount1",
95+
"libmtdev1",
96+
"libnettle8",
97+
"libnghttp2-14",
98+
"liborc-0.4-0",
99+
"libp11-kit0",
100+
"libpcre2-16-0",
101+
"libpcre2-8-0",
102+
"libpng16-16",
103+
"libpsl5",
104+
"libqt5core5a",
105+
"libqt5dbus5",
106+
"libqt5gui5",
107+
"libqt5network5",
108+
"libqt5positioning5",
109+
"libqt5printsupport5",
110+
"libqt5qml5",
111+
"libqt5qmlmodels5",
112+
"libqt5quick5",
113+
"libqt5sensors5",
114+
"libqt5svg5",
115+
"libqt5webchannel5",
116+
"libqt5webkit5",
117+
"libqt5widgets5",
118+
"librtmp1",
119+
"libsasl2-2",
120+
"libsasl2-modules-db",
121+
"libselinux1",
122+
"libsensors-config",
123+
"libsensors5",
124+
"libsm6",
125+
"libsqlite3-0",
126+
"libssh2-1",
127+
"libssl3",
128+
"libstdc++6",
129+
"libtasn1-6",
130+
"libtinfo6",
131+
"libudev1",
132+
"libunistring2",
133+
"libunwind8",
134+
"libuuid1",
135+
"libwacom-common",
136+
"libwacom9",
137+
"libwayland-client0",
138+
"libwayland-server0",
139+
"libwebp7",
140+
"libwoff1",
141+
"libx11-6",
142+
"libx11-data",
143+
"libx11-xcb1",
144+
"libxau6",
145+
"libxcb-dri2-0",
146+
"libxcb-dri3-0",
147+
"libxcb-glx0",
148+
"libxcb-icccm4",
149+
"libxcb-image0",
150+
"libxcb-keysyms1",
151+
"libxcb-present0",
152+
"libxcb-randr0",
153+
"libxcb-render-util0",
154+
"libxcb-render0",
155+
"libxcb-shape0",
156+
"libxcb-shm0",
157+
"libxcb-sync1",
158+
"libxcb-util1",
159+
"libxcb-xfixes0",
160+
"libxcb-xinerama0",
161+
"libxcb-xinput0",
162+
"libxcb-xkb1",
163+
"libxcb1",
164+
"libxdmcp6",
165+
"libxext6",
166+
"libxfixes3",
167+
"libxkbcommon-x11-0",
168+
"libxkbcommon0",
169+
"libxml2",
170+
"libxrender1",
171+
"libxshmfence1",
172+
"libxslt1.1",
173+
"libxxf86vm1",
174+
"libz3-4",
175+
"libzstd1",
176+
"lsb-base",
177+
"openssl",
178+
"shared-mime-info",
179+
"sysvinit-utils",
180+
"tar",
181+
"wkhtmltopdf",
182+
"x11-common",
183+
"xkb-data",
184+
"zlib1g",
172185
]
186+
187+
return [_pkg(package) for package in packages]
173188

‎containers/ops/deploy-images/go.mod‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎containers/ops/deploy-images/go.sum‎

Whitespace-only changes.

0 commit comments

Comments
 (0)