chore: Upgraded base image to graalvm 22.x

devatherock · devatherock · commit fb9ba1caa287 · 2022-05-17T19:41:55.000-05:00
Closes #1
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,22 +1,34 @@
-docker_image: &docker_image
-  docker:
-    - image: docker:19.03.6
-
 slack_image: &slack_image
   docker:
-    - image: devatherock/simple-slack:0.4.0
+    - image: devatherock/simple-slack:0.7.0
+      auth:
+        username: $DOCKER_USERNAME
+        password: $DOCKER_PASSWORD
 
 work_directory: &work_directory
   working_directory: ~/java-to-native
 
 resource_class: &resource_class
   resource_class: small
+  
+executors:
+  jdk-executor:
+    docker:
+      - image: cimg/openjdk:11.0
+        auth:
+          username: $DOCKER_USERNAME
+          password: $DOCKER_PASSWORD
+    <<: *resource_class
+    <<: *work_directory  
 
 version: 2.1
 jobs:
   groovy_script_to_jar:
     docker:
       - image: devatherock/vela-groovy-script-to-jar:0.6.2
+        auth:
+          username: $DOCKER_USERNAME
+          password: $DOCKER_PASSWORD
     <<: *resource_class
     <<: *work_directory
     environment:
@@ -29,21 +41,34 @@ jobs:
           paths:
             - CreateNativeImage.jar
   publish:
-    <<: *docker_image
-    <<: *resource_class
-    <<: *work_directory
+    executor: jdk-executor
     steps:
       - checkout
       - setup_remote_docker
       - attach_workspace:
           at: ~/java-to-native
       - run: |
-          TAG=0.1.3
+          TAG=${CIRCLE_SHA1:0:8}
           docker build -t devatherock/java-to-native:$TAG .
           docker tag devatherock/java-to-native:$TAG devatherock/java-to-native:latest
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
           docker push devatherock/java-to-native:$TAG
           docker push devatherock/java-to-native:latest
+          
+  publish_release:
+    executor: jdk-executor
+    steps:
+      - checkout
+      - setup_remote_docker
+      - attach_workspace:
+          at: ~/java-to-native
+      - run: |
+          TAG=${CIRCLE_TAG#v}
+          DEV_TAG=${CIRCLE_SHA1:0:8}
+          docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+          docker pull devatherock/java-to-native:$DEV_TAG
+          docker tag devatherock/java-to-native:$DEV_TAG devatherock/java-to-native:$TAG
+          docker push devatherock/java-to-native:$TAG               
 
   notify_success:
     <<: *slack_image
@@ -55,40 +80,46 @@ jobs:
       TITLE: "Build completed"
     steps:
       - run: /bin/simpleslack
-  notify_failure:
-    <<: *slack_image
-    <<: *resource_class
-    environment:
-      TEXT: "Failure: {{.CircleBuildUrl}} by {{.CircleUsername}}"
-      COLOR: "#a1040c"
-      CHANNEL: general
-      TITLE: "Build completed"
-    steps:
-      - run:
-          name: Failure notification
-          command: /bin/simpleslack
-          when: on_fail
 
 workflows:
   version: 2.1
   build_publish:
     jobs:
       - groovy_script_to_jar:
+          context:
+            - docker-credentials
           filters:
             branches:
               only: master
       - publish:
+          context:
+            - docker-credentials
           requires:
             - groovy_script_to_jar
       - notify_success:
           requires:
             - publish
-      - notify_failure:
+  release:
+    jobs:
+      - publish_release:
+          context:
+            - docker-credentials
+          filters:
+            branches:
+              only: non-existent-branch
+            tags:
+              only: /^v[0-9\.]+$/
+      - notify_success:
+          context:
+            - docker-credentials
+            - slack-webhook
           requires:
-            - publish
+            - publish_release
   pr_check:
     jobs:
       - groovy_script_to_jar:
+          context:
+            - docker-credentials
           filters:
             branches:
               ignore: master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Unreleased]
+### Changed
+- [#1](https://github.com/devatherock/java-to-native/issues/1): Upgraded base image to graalvm 22.x
+
 ## [0.1.3] - 2020-06-21
 ### Changed
 - Fixed the bug that was making config file mandatory
diff --git a/CreateNativeImage.groovy b/CreateNativeImage.groovy
@@ -107,8 +107,8 @@ def nativeImageCommand = ['native-image', '-cp', classPath]
 if (config[CONFIG_BUILD_OVERRIDE_ARGS]) {
     nativeImageCommand.addAll(config[CONFIG_BUILD_OVERRIDE_ARGS])
 } else {
-    nativeImageCommand.addAll([ARG_GRAPE_DISABLE, '--no-server', '--static', '--allow-incomplete-classpath',
-                               '--no-fallback', '--report-unsupported-elements-at-runtime', '--initialize-at-build-time',
+    nativeImageCommand.addAll([ARG_GRAPE_DISABLE, '--static',
+                               '--no-fallback', '--report-unsupported-elements-at-runtime',
                                '--enable-url-protocols=http,https', "-H:ConfigurationFileDirectories=${reflectConfigPath}"])
 
     if (config[CONFIG_BUILD_ADDITIONAL_ARGS]) {
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,13 @@
-FROM oracle/graalvm-ce:20.1.0-java11
+FROM devatherock/graalvm:ol8-java11-22.1.0-2
 
 LABEL maintainer="devatherock@gmail.com"
-LABEL io.github.devatherock.version="0.1.0"
+LABEL io.github.devatherock.version="1.0.0"
 
-RUN gu install native-image
+RUN microdnf -y install xz \
+	&& microdnf clean all \
+	&& curl --location --output upx-3.96-amd64_linux.tar.xz "https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz" \
+	&& tar -xJf upx-3.96-amd64_linux.tar.xz \
+	&& cp upx-3.96-amd64_linux/upx /bin/
 
 COPY entry-point.sh /scripts/entry-point.sh
 COPY CreateNativeImage.jar /scripts/CreateNativeImage.jar
diff --git a/Makefile b/Makefile
@@ -0,0 +1,10 @@
+DOCKER_TAG=latest
+
+jar-build:
+	docker run --rm \
+	-v $(CURDIR):/work \
+	-w=/work \
+	-e PARAMETER_SCRIPT_PATH=CreateNativeImage.groovy \
+	devatherock/vela-groovy-script-to-jar:0.6.2
+docker-build:
+	docker build -t devatherock/java-to-native:$(DOCKER_TAG) .
diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 [![Version](https://img.shields.io/docker/v/devatherock/java-to-native?sort=date)](https://hub.docker.com/r/devatherock/java-to-native/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/devatherock/java-to-native.svg)](https://hub.docker.com/r/devatherock/java-to-native/)
 [![Docker Image Size](https://img.shields.io/docker/image-size/devatherock/java-to-native.svg?sort=date)](https://hub.docker.com/r/devatherock/java-to-native/)
-[![Docker Image Layers](https://img.shields.io/microbadger/layers/devatherock/java-to-native.svg)](https://microbadger.com/images/devatherock/java-to-native)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 # java-to-native
 CI plugin to convert a java program into a [graalvm native image](https://www.graalvm.org/docs/reference-manual/native-image/). 
@@ -14,8 +13,10 @@ Execute from the working directory:
 
 ```
 docker run --rm \
-  -e PLUGIN_JAR_NAME=YamlValidator.jar \
-  -e PLUGIN_CONFIG_FILE=config/graal.yml \
+  -v path/to/jar:/work \
+  -w=/work \
+  -e PLUGIN_JAR_NAME=/work/build/native/libs/YamlValidator.jar \
+  -e PLUGIN_CONFIG_FILE=/work/config/graal.yml \
   devatherock/java-to-native:0.1.3
 ```
 
