Skip to content

Commit 257a70b

Browse files
anders-swansonanders-swanson
authored
Multiarch builds (#345)
* multiarch builds Signed-off-by: Anders Swanson <[email protected]>
1 parent c40e85f commit 257a70b

File tree

80 files changed

+274
-145
lines changed

Some content is hidden

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

80 files changed

+274
-145
lines changed

‎Makefile‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ go-build-linux-amd64:
4343
go-build-linux-arm64:
4444
CGO_ENABLED=1 GOOS=linux GOARCH=arm64 $(MAKE) go-build -j2
4545

46+
.PHONY: go-build-linux-gcc-arm64
47+
go-build-linux-gcc-arm64:
48+
CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOOS=linux GOARCH=arm64 $(MAKE) go-build -j2
49+
4650
.PHONY: go-build-darwin-amd64
4751
go-build-darwin-amd64:
4852
CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 $(MAKE) go-build -j2
@@ -59,6 +63,8 @@ go-build-windows-amd64:
5963
go-build-windows-x86:
6064
CGO_ENABLED=1 GOOS=windows GOARCH=386 $(MAKE) go-build -j2
6165

66+
dist: go-build-linux-gcc-arm64 go-build-linux-amd64
67+
6268
go-lint:
6369
@echo "Linting codebase"
6470
docker run --rm -v $(shell pwd):/app -v ~/.cache/golangci-lint/v1.50.1:/root/.cache -w /app golangci/golangci-lint:v1.50.1 golangci-lint run -v
@@ -91,12 +97,15 @@ docker-arm:
9197
push-oraclelinux-image:
9298
docker push $(IMAGE_ID)
9399

100+
# build multiarch (linux-amd64, linux-arm64) images with podman
94101
podman-build:
95-
podman manifest create $(IMAGE_ID)
96-
podman build --platform linux/amd64,linux/arm64 --manifest $(IMAGE_ID)
102+
podman manifest rm $(IMAGE_ID) || true
103+
podman manifest create $(IMAGE_ID)
104+
podman build --platform linux/amd64 --manifest $(IMAGE_ID) --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) --build-arg GOARCH=amd64 --build-arg GOOS=linux --build-arg VERSION=$(VERSION) .
105+
podman build --platform linux/arm64 --manifest $(IMAGE_ID) --build-arg BASE_IMAGE=$(ORACLE_LINUX_BASE_IMAGE) --build-arg GOARCH=arm64 --build-arg GOOS=linux --build-arg VERSION=$(VERSION) .
97106

98107
podman-push:
99-
podman manifest push $(IMAGE_ID)
108+
podman manifest push $(IMAGE_ID)
100109

101110
podman-release: podman-build podman-push
102111

‎docs/404.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="UTF-8">
55
<meta name="generator" content="Docusaurus v3.8.1">
66
<title data-rh="true">Page Not Found | Oracle Database Metrics Exporter</title><meta data-rh="true" name="viewport" content="width=device-width,initial-scale=1"><meta data-rh="true" name="twitter:card" content="summary_large_image"><meta data-rh="true" property="og:image" content="https://oracle.github.io/oracle-db-appdev-monitoring/img/logo.png"><meta data-rh="true" name="twitter:image" content="https://oracle.github.io/oracle-db-appdev-monitoring/img/logo.png"><meta data-rh="true" property="og:url" content="https://oracle.github.io/oracle-db-appdev-monitoring/404.html"><meta data-rh="true" property="og:locale" content="en"><meta data-rh="true" name="docusaurus_locale" content="en"><meta data-rh="true" name="docusaurus_tag" content="default"><meta data-rh="true" name="docsearch:language" content="en"><meta data-rh="true" name="docsearch:docusaurus_tag" content="default"><meta data-rh="true" property="og:title" content="Page Not Found | Oracle Database Metrics Exporter"><link data-rh="true" rel="icon" href="/oracle-db-appdev-monitoring/img/favicon-32x32.png"><link data-rh="true" rel="canonical" href="https://oracle.github.io/oracle-db-appdev-monitoring/404.html"><link data-rh="true" rel="alternate" href="https://oracle.github.io/oracle-db-appdev-monitoring/404.html" hreflang="en"><link data-rh="true" rel="alternate" href="https://oracle.github.io/oracle-db-appdev-monitoring/404.html" hreflang="x-default"><link rel="stylesheet" href="/oracle-db-appdev-monitoring/assets/css/styles.d329a656.css">
7-
<script src="/oracle-db-appdev-monitoring/assets/js/runtime~main.95cf334f.js" defer="defer"></script>
8-
<script src="/oracle-db-appdev-monitoring/assets/js/main.18854bed.js" defer="defer"></script>
7+
<script src="/oracle-db-appdev-monitoring/assets/js/runtime~main.b2cba22f.js" defer="defer"></script>
8+
<script src="/oracle-db-appdev-monitoring/assets/js/main.9ece61cd.js" defer="defer"></script>
99
</head>
1010
<body class="navigation-with-keyboard">
1111
<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"><defs>

‎docs/assets/js/c539bf3f.a6cb2bc6.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/js/c539bf3f.b7391771.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/assets/js/cd35152c.e4fd7d9e.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/js/cf0dfdd1.1f08fe6e.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)