From f85f9d788fdf04fc2d0644d1702ade91daf1d913 Mon Sep 17 00:00:00 2001 From: Ola Tarkowska Date: Tue, 21 May 2019 15:09:45 +0100 Subject: [PATCH 1/2] update java-8 container --- fiji-openjdk-8/Dockerfile | 12 ++---------- fiji-openjdk-8/{demo.py => macro.ijm} | 0 2 files changed, 2 insertions(+), 10 deletions(-) rename fiji-openjdk-8/{demo.py => macro.ijm} (100%) diff --git a/fiji-openjdk-8/Dockerfile b/fiji-openjdk-8/Dockerfile index 9ac837c..de13f11 100644 --- a/fiji-openjdk-8/Dockerfile +++ b/fiji-openjdk-8/Dockerfile @@ -8,12 +8,8 @@ FROM openjdk:8 # Define maintainer. LABEL maintainer="https://gitter.im/fiji/fiji" -# Create a user. -RUN useradd -u 1000 -ms /bin/bash fiji -USER fiji - # Define working directory. -WORKDIR /home/fiji +WORKDIR /opt/fiji # Install Fiji. RUN wget -q https://downloads.imagej.net/fiji/latest/fiji-nojre.zip \ @@ -24,9 +20,5 @@ RUN wget -q https://downloads.imagej.net/fiji/latest/fiji-nojre.zip \ ENV PATH $PATH:/home/fiji/Fiji.app # Define entrypoint. -COPY entrypoint.sh /home/fiji +COPY entrypoint.sh /opt/fiji ENTRYPOINT ["./entrypoint.sh"] - -# Run once to create Java preferences. -COPY demo.py /home/fiji/ -RUN ./entrypoint.sh --headless --ij2 --console --run ./demo.py 'name="test"' diff --git a/fiji-openjdk-8/demo.py b/fiji-openjdk-8/macro.ijm similarity index 100% rename from fiji-openjdk-8/demo.py rename to fiji-openjdk-8/macro.ijm From 17046ad070ccc21bfb59b01e541598e21882a663 Mon Sep 17 00:00:00 2001 From: Ola Tarkowska Date: Tue, 21 May 2019 15:10:00 +0100 Subject: [PATCH 2/2] add travis --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d49cfe0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +sudo: required +services: + - docker + +env: + - JAVA_VERSION=openjdk-8 + +script: + - docker build -t fiji-$JAVA_VERSION fiji-$JAVA_VERSION + - docker run --rm -v fiji-$JAVA_VERSION/macro.ijm:/opt/macro.ijm fiji-$JAVA_VERSION -macro /opt/macro.ijm test