From 34993109443143142c1232fab27b87a1752f8e0c Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 5 Apr 2020 23:51:26 +0200 Subject: [PATCH] CircleCI config --- .circleci/config.yml | 9 +++++++++ .circleci/script/docker | 2 +- Dockerfile | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 191af3d8..d41b04e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,6 +12,7 @@ jobs: environment: LEIN_ROOT: "true" BABASHKA_PLATFORM: linux # could be used in jar name + resource_class: large steps: - checkout - run: @@ -70,6 +71,8 @@ jobs: GRAALVM_HOME: /home/circleci/graalvm-ce-java8-19.3.1 BABASHKA_PLATFORM: linux # used in release script BABASHKA_TEST_ENV: native + BABASHKA_XMX: "-J-Xmx7g" + resource_class: large steps: - checkout - run: @@ -139,6 +142,8 @@ jobs: BABASHKA_PLATFORM: linux-static # used in release script BABASHKA_TEST_ENV: native BABASHKA_STATIC: true + BABASHKA_XMX: "-J-Xmx7g" + resource_class: large steps: - checkout - run: @@ -205,6 +210,8 @@ jobs: GRAALVM_HOME: /Users/distiller/graalvm-ce-java8-19.3.1/Contents/Home BABASHKA_PLATFORM: macos # used in release script BABASHKA_TEST_ENV: native + BABASHKA_XMX: "-J-Xmx7g" + resource_class: large steps: - checkout - run: @@ -259,6 +266,7 @@ jobs: command: | ./bb .circleci/script/publish_artifact.clj deploy: + resource_class: large docker: - image: circleci/clojure:lein-2.8.1 working_directory: ~/repo @@ -282,6 +290,7 @@ jobs: - ~/.m2 key: v1-dependencies-{{ checksum "project.clj" }} docker: + resource_class: large docker: - image: circleci/buildpack-deps:stretch steps: diff --git a/.circleci/script/docker b/.circleci/script/docker index d2bda10e..e615932e 100755 --- a/.circleci/script/docker +++ b/.circleci/script/docker @@ -17,7 +17,7 @@ fi if [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" = "master" ]; then echo "Building Docker image $image_name:$image_tag" echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin - docker build -t "$image_name" . + docker build -t "$image_name" --build-arg BABASHKA_XMX="-J-Xmx7g" . docker tag "$image_name:$latest_tag" "$image_name:$image_tag" # we only update latest when it's not a SNAPSHOT version if [ "false" = "$snapshot" ]; then diff --git a/Dockerfile b/Dockerfile index 5b1d5687..97b44d1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,18 @@ FROM clojure:lein-2.9.1 AS BASE +ARG BABASHKA_XMX="-J-Xmx3g" RUN apt update RUN apt install --no-install-recommends -yy curl unzip build-essential zlib1g-dev WORKDIR "/opt" RUN curl -sLO https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/graalvm-ce-java8-linux-amd64-19.3.1.tar.gz RUN tar -xzf graalvm-ce-java8-linux-amd64-19.3.1.tar.gz + ENV GRAALVM_HOME="/opt/graalvm-ce-java8-19.3.1" ENV JAVA_HOME="/opt/graalvm-ce-java8-19.3.1/bin" ENV PATH="$PATH:$JAVA_HOME" ENV BABASHKA_STATIC="true" +ENV BABASHKA_XMX=$BABASHKA_XMX + COPY . . RUN ./script/compile