-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Parameterize jdk and nginx base images for better M1 support (#11262)
currently on m1 macs, switching between building for arm vs amd64 architectures is a bit cumbersome because some of the base docker images have not been parameterized yet, so you will run into build errors unless you untag those base images every time you switch between architectures. This PR should allow you switch freely between the two without needing that manual step. This PR also adds a single env var BUILD_ARCH that can be used to switch between building for arm vs amd64. With this PR we can build and push images for individual platform components which is much faster than trying to redeploy everything when iterating on changes that are limited to only a few components. Ideally we'd have a github action that allowed us to deploy individual platform components, but until that exists this seems like a reasonable solution for faster iteration.
- Loading branch information
Showing
8 changed files
with
19 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
FROM nginx:1.19-alpine as webapp | ||
ARG NGINX_IMAGE=nginx:1.19-alpine | ||
FROM ${NGINX_IMAGE} as webapp | ||
|
||
EXPOSE 80 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters