diff --git a/Dockerfile b/Dockerfile index b787672..4fb3505 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,14 +21,19 @@ FROM alpine/java:21-jdk MAINTAINER Etienne Vrignaud "evrignaud@gmail.com" -ADD build/distributions /fim +ADD build/distributions /build/distributions # install Fim -RUN cd /fim && \ - tar zxvf fim-shadow*.tar && \ - ls -la +RUN \ + cd /build/distributions && \ + tar xvf fim-shadow*.tar && \ + mkdir /fim && \ + mv fim-shadow*/* /fim && \ + ls -la /fim && \ + ls -la /fim/bin -ENV PATH $PATH:/fim + +ENV PATH $PATH:/fim/bin # mount this folder with the Fim repository root folder VOLUME /fim_repository diff --git a/build-docker-image b/build-docker-image index f8d9ad8..3ce63aa 100755 --- a/build-docker-image +++ b/build-docker-image @@ -18,6 +18,10 @@ # along with Fim. If not, see . #----------------------------------------------------------------------------------------------------------------------- +# compile java : +docker run --rm -v "$(pwd):/home/gradle/src" -w /home/gradle/src gradle:8.4.0-jdk21 gradle build -x test -x checkstyleMain + +# build image docker build -t evrignaud/fim . #----------------------------------------------------------------------------------------------------------------------- diff --git a/fim-docker b/fim-docker index d6c78dd..3db2d3d 100755 --- a/fim-docker +++ b/fim-docker @@ -18,6 +18,9 @@ # along with Fim. If not, see . #----------------------------------------------------------------------------------------------------------------------- +# Use an alias +# alias fim="//fim-docker" + CURRENT_DIRECTORY="$PWD" REPOSITORY_ROOT="${CURRENT_DIRECTORY}" DOCKER_IMAGE=evrignaud/fim:latest diff --git a/src/main/java/org/fim/util/FileOperationInterruptedException.java b/src/main/java/org/fim/util/FileOperationInterruptedException.java index fc06907..1c69554 100644 --- a/src/main/java/org/fim/util/FileOperationInterruptedException.java +++ b/src/main/java/org/fim/util/FileOperationInterruptedException.java @@ -4,4 +4,4 @@ public class FileOperationInterruptedException extends RuntimeException { public FileOperationInterruptedException(String message) { super(message); } -} \ No newline at end of file +}