Skip to content

Conversation

@ravisingal
Copy link
Contributor

No description provided.

defaultImage {
imageName.set("java")
setTagNameTransform { tag -> "11-${tag.name}" }
setTagNameTransform { tag -> "11.0.8" }
Copy link
Contributor

Choose a reason for hiding this comment

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

tag name transform is to modify existing tags (we'd be mapping multiple to the same here, and couldn't support multiple). It seems like we just want to create our own tags here, so instead, let's remove the built in tags and add the ones we want.

  defaultImage {
    imageName.set("java")
    tags.forEach { it.onlyIf { false } }
    tag("11.0.8") // IMO, this one isn't needed but we can discuss
    tag("11")
  }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated the tags of the image. IMO, it is a good practice to publish the minor version so that we can always pin version in our services.

defaultImage {
imageName.set("java")
setTagNameTransform { tag -> "11-${tag.name}" }
setTagNameTransform { tag -> "11.0.8" }
Copy link
Contributor

Choose a reason for hiding this comment

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

The minor version isn't specified anywhere but in our own tag - so we're assuming that azul/zulu-openjdk-debian:11 will be on 11.0.8 - which is build time dependent. In other words, this can't be rebuilt consistently. If we think the minor version is important (I'm skeptical), we should parameterize it so we're using a from version that matches our own tag.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

pinned azul image version in Dockerfile.

Copy link
Contributor

Choose a reason for hiding this comment

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

could we make that a parameter from gradle (it supports build args) - that way, the version is only defined in place and we don't accidentally get out of sync.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

@aaron-steinfeld
Copy link
Contributor

Also a heads up, this sill isn't publishing. Since we're not using the tag in the version, we can also removing creating and pushing the tag.

aaron-steinfeld
aaron-steinfeld previously approved these changes Aug 7, 2020
Copy link
Contributor

@aaron-steinfeld aaron-steinfeld left a comment

Choose a reason for hiding this comment

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

Approving, but I assume we want to bring in publishing before merging this? Here are my local changes to remove versioning and restore publishing:

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 401a25b..948cfe4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,12 +53,6 @@ jobs:
     executor: gradle_docker
     steps:
       - setup_build_environment
-      - gradle:
-          args: :tag -Prelease
-      - add_ssh_keys:
-          fingerprints:
-            - '9f:bb:a7:39:fa:3d:39:04:bd:c6:66:27:79:b1:49:86'
-      - run: git push origin $(./gradlew -q :printVersion)
       - gradle:
           args: dockerPushImages
 
@@ -67,11 +61,11 @@ workflows:
   build-and-publish:
     jobs:
       - build
-#      - publish:
-#          context: hypertrace-publishing
-#          requires:
-#            - build
-#          filters:
-#            branches:
-#              only:
-#                - main
+      - publish:
+          context: hypertrace-publishing
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - main
diff --git a/semantic-build-versioning.gradle b/semantic-build-versioning.gradle
deleted file mode 100644
index 9bc1676..0000000
--- a/semantic-build-versioning.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-// Follows https://www.conventionalcommits.org/en/v1.0.0/#summary with one change: any commit is treated as a release,
-// patch being the default if major or minor is not detected.
-
-autobump {
-  // match any message starting with a type/scope suffixed with !, or with a line starting with "BREAKING CHANGE:"
-  majorPattern = ~/(?m)(\A[^:]+(?<=!): |^BREAKING CHANGE:)/
-  // match any commit message starting with "feat: " or "feat(any scope): "
-  minorPattern = ~/^feat(\([^)]+\))?: /
-  newPreReleasePattern = null // Not used - no prereleases
-  promoteToReleasePattern = null // Not used - every merge is a release
-}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2f9ac12..c79b4ee 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,10 +6,5 @@ pluginManagement {
   }
 }
 
-plugins {
-  id("org.hypertrace.version-settings") version "0.1.5"
-}
-
-
 include(":java-8")
 include(":java-11")
\ No newline at end of file

aaron-steinfeld
aaron-steinfeld previously approved these changes Aug 7, 2020
@ravisingal ravisingal changed the title Add docker jre images for java 8, 11 and 14 Add docker jre images for java 11 and 14 Aug 10, 2020
# improve performance.
RUN cd / && jlink --no-header-files --no-man-pages --compress=0 --strip-debug \
--add-modules java.base,java.logging,\
# java.desktop includes java.beans which is used by Spring
Copy link
Contributor

Choose a reason for hiding this comment

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

@ravisingal we don't use spring right? do we need these?

Copy link
Contributor

@buchi-busireddy buchi-busireddy left a comment

Choose a reason for hiding this comment

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

Though I don't have full context on this, re-approving since @aaron-steinfeld seems to have already reviewed and approved it and he's offline now. This will be unblocking @ravisingal
If there are any comments, let's take them as new PRs.

@ravisingal ravisingal merged commit 6aae656 into main Aug 10, 2020
@ravisingal ravisingal deleted the java-base-images branch August 10, 2020 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants