Skip to content

Update bootstrap.sh URLs, docker image bases, and add RPi Docker file #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 31, 2019
Merged

Update bootstrap.sh URLs, docker image bases, and add RPi Docker file #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d7494f
Changes bootstrap.js url to use https
chigozienri Jan 29, 2019
e192a10
Changes base docker images to openjdk on docker hub
chigozienri Jan 29, 2019
0bdf703
Added Dockerfile compatible with ARM devices such as RPi
chigozienri Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fiji-openjdk-6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WORKDIR /fiji

# Install Fiji.
RUN \
curl -O http://update.imagej.net/bootstrap.js && \
curl -O https://update.imagej.net/bootstrap.js && \
jrunscript bootstrap.js update-force-pristine

# Add fiji to the PATH
Expand Down
4 changes: 2 additions & 2 deletions fiji-openjdk-7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

# Pull base JDK-7 image.
FROM dockerfile/java:openjdk-7-jdk
FROM openjdk:7

# Define maintainer.
MAINTAINER Mark Hiner <[email protected]>
Expand All @@ -13,7 +13,7 @@ WORKDIR /fiji

# Install Fiji.
RUN \
curl -O http://update.imagej.net/bootstrap.js && \
curl -O https://update.imagej.net/bootstrap.js && \
jrunscript bootstrap.js update-force-pristine

# Add fiji to the PATH
Expand Down
6 changes: 3 additions & 3 deletions fiji-openjdk-8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Fiji + Java 8 Dockerfile
#

# Pull base JDK-6 image.
FROM java:8-jdk
# Pull base JDK-8 image.
FROM openjdk:8

# Define maintainer.
MAINTAINER Mark Hiner <[email protected]>
Expand All @@ -13,7 +13,7 @@ WORKDIR /fiji

# Install Fiji.
RUN \
curl -O http://update.imagej.net/bootstrap.js && \
curl -O https://update.imagej.net/bootstrap.js && \
jrunscript bootstrap.js update-force-pristine

# Add fiji to the PATH
Expand Down
2 changes: 1 addition & 1 deletion fiji-oracle-jdk6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WORKDIR /fiji

# Install Fiji.
RUN \
curl -O http://update.imagej.net/bootstrap.js && \
curl -O https://update.imagej.net/bootstrap.js && \
jrunscript bootstrap.js update-force-pristine

# Add fiji to the PATH
Expand Down
2 changes: 1 addition & 1 deletion fiji-oracle-jdk7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WORKDIR /fiji

# Install Fiji.
RUN \
curl -O http://update.imagej.net/bootstrap.js && \
curl -O https://update.imagej.net/bootstrap.js && \
jrunscript bootstrap.js update-force-pristine

# Add fiji to the PATH
Expand Down
41 changes: 41 additions & 0 deletions fiji-oracle-jdk8-arm32v7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Fiji & Oracle Java 8 Dockerfile for ARM32v7
#
# Derived from https://github.com/dockerfile/java/tree/master/oracle-java8
#

# Pull base ubuntu image
FROM arm32v7/ubuntu

# Define maintainer.
MAINTAINER Mark Hiner <[email protected]>

# Install Oracle Java 8
RUN apt-get -y update \
&& apt-get -y install software-properties-common \
&& echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections \
&& add-apt-repository -y ppa:webupd8team/java \
&& apt-get -y update \
&& apt-get -y install oracle-java8-installer \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /var/cache/oracle-jdk8-installer

# Define commonly used JAVA_HOME variable
ENV JAVA_HOME /usr/lib/jvm/java-8-oracle

# Define working directory.
WORKDIR /fiji

# Install Fiji.
RUN apt-get -y update \
&& apt-get install -y wget \
&& apt-get install -y unzip \
&& wget https://downloads.imagej.net/fiji/latest/fiji-nojre.zip \
&& unzip fiji-nojre.zip \
&& wget -P ./Fiji.app https://raw.githubusercontent.com/imagej/imagej/master/bin/ImageJ.sh \
&& chmod u+x ./Fiji.app/ImageJ.sh

# Add fiji to the PATH
ENV PATH $PATH:/fiji/Fiji.app

# Define default command.
CMD ImageJ.sh --headless