Skip to content

Commit 01ad278

Browse files
committed
TUN-5551: Change internally published debian package to be FIPS compliant
This changes existing Makefile targets to make it obvious that they are used to publish debian packages for internal Cloudflare usage. Those are now FIPS compliant, with no alternative provided. This only affects amd64 builds (and we only publish internally for Linux). This new Makefile target is used by all internal builds (including nightly that is used for e2e tests). Note that this Makefile target renames the artifact to be just `cloudflared` so that this is used "as is" internally, without expecting people to opt-in to the new `cloudflared-fips` package (as we are giving them no alternative).
1 parent 6822e4f commit 01ad278

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ endef
156156
cloudflared-deb: cloudflared
157157
$(call build_package,deb)
158158

159+
.PHONY: cloudflared-internal-deb
160+
cloudflared-internal-deb: cloudflared-deb
161+
bash -c 'for f in cloudflared-fips_*.deb; do mv -- "$$f" "$${f/-fips/}"; done'
162+
159163
.PHONY: cloudflared-rpm
160164
cloudflared-rpm: cloudflared
161165
$(call build_package,rpm)

cfsetup.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ stretch: &stretch
8282
- export GOOS=linux
8383
- export GOARCH=amd64
8484
- make cloudflared-deb
85-
build-fips-deb:
85+
build-fips-internal-deb:
8686
build_dir: *build_dir
87-
builddeps:
87+
builddeps: &build_fips_deb_deps
8888
- *pinned_go_fips
8989
- build-essential
9090
- fakeroot
@@ -93,15 +93,16 @@ stretch: &stretch
9393
- export GOOS=linux
9494
- export GOARCH=amd64
9595
- export FIPS=true
96-
- make cloudflared-deb
97-
build-deb-nightly:
96+
- make cloudflared-internal-deb
97+
build-fips-internal-deb-nightly:
9898
build_dir: *build_dir
99-
builddeps: *build_deb_deps
99+
builddeps: *build_fips_deb_deps
100100
post-cache:
101101
- export GOOS=linux
102102
- export GOARCH=amd64
103103
- export NIGHTLY=true
104-
- make cloudflared-deb
104+
- export FIPS=true
105+
- make cloudflared-internal-deb
105106
build-deb-arm64:
106107
build_dir: *build_dir
107108
builddeps: *build_deb_deps

0 commit comments

Comments
 (0)