Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android/docker: update makefile and dockerfile for build automation #394

Merged
merged 1 commit into from
Jun 4, 2024

Conversation

barnstar
Copy link
Member

@barnstar barnstar commented May 14, 2024

Updates tailsale/corp#19670

Added a dockerfile where can run full release build in addition to dropping into a shell.

The build will now look for JKS_PASSWORD in the environment for completing the signing step without user interaction.

Several smaller recipes added to the makefile for building the docker builder image, running and cleaning it up.

Makefile Outdated Show resolved Hide resolved
Makefile Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@@ -82,7 +85,7 @@ tailscale-debug: $(DEBUG_APK) ## Build the debug APK

.PHONY: release
release: tailscale.jks $(RELEASE_AAB) ## Build the release AAB
jarsigner -sigalg SHA256withRSA -digestalg SHA-256 -keystore tailscale.jks $(RELEASE_AAB) tailscale
jarsigner -sigalg SHA256withRSA -digestalg SHA-256 -keystore tailscale.jks -storepass $(JKS_PASSWORD) $(RELEASE_AAB) tailscale
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this fail if i make a release build but I don't have a password?

Copy link
Member Author

@barnstar barnstar May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The release build always required that you enter the JKS password manually. There will be a check in the corp builder to ensure JKS_PASSWORD is set and we'll error out before we try the build (and defer the remove-image job). I'll also add a post build check to make sure things are properly signed.

Updates tailsale/corp#19670

Added a dockerfile to run the full release build in addition to the
shell environment.

The build will now look for JKS_PASSWORD in the environment for
completing the signing step without user interaction.

Several smaller recipes added to the makefile for building the
docker builder image, running and cleaning it up independently
to make debugging issues quicker.

Signed-off-by: Jonathan Nobels <jonathan@tailscale.com>
@barnstar barnstar merged commit a74e30d into main Jun 4, 2024
4 checks passed
@barnstar barnstar deleted the jonathan/docker_make branch June 4, 2024 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants