Skip to content

Commit 6706ff5

Browse files
committed
Use two separate Dockerfiles to build on Hub
1 parent e3346b4 commit 6706ff5

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
FROM prantlf/node-git:lts-alpine
1+
FROM prantlf/node-git-chromium:lts-alpine
22
LABEL maintainer="Ferdinand Prantl <[email protected]>"
33

44
# From https://github.com/docker-library/openjdk/tree/dd54ae37bc44d19ecb5be702d36d664fed2c68e4
5-
ARG JAVER=11
65
ENV LANG C.UTF-8
76
ENV JAVA_HOME /usr/lib/jvm/default-jvm/jre
87
ENV PATH $PATH:/usr/lib/jvm/default-jvm/jre/bin:/usr/lib/jvm/default-jvm/bin
9-
RUN apk --no-cache add openjdk${JAVER}-jre
8+
RUN apk --no-cache add openjdk11-jre

Dockerfile.8

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM prantlf/node-git-chromium:lts-alpine
2+
LABEL maintainer="Ferdinand Prantl <[email protected]>"
3+
4+
# From https://github.com/docker-library/openjdk/tree/dd54ae37bc44d19ecb5be702d36d664fed2c68e4
5+
ENV LANG C.UTF-8
6+
ENV JAVA_HOME /usr/lib/jvm/default-jvm/jre
7+
ENV PATH $PATH:/usr/lib/jvm/default-jvm/jre/bin:/usr/lib/jvm/default-jvm/bin
8+
RUN apk --no-cache add openjdk8-jre

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ lint ::
1010
build :: build8 build11
1111

1212
build8 ::
13-
docker build --no-cache --build-arg JAVER=8 -t node-git-chromium-java .
13+
docker build --no-cache -t node-git-chromium-java -f Dockerfile.8 .
1414
docker tag node-git-chromium-java prantlf/node-git-chromium-java:lts-alpine-java8
1515

1616
build11 ::
17-
docker build --no-cache --build-arg JAVER=8 -t node-git-chromium-java .
17+
docker build --no-cache -t node-git-chromium-java -f Dockerfile.11 .
1818
docker tag node-git-chromium-java prantlf/node-git-chromium-java:lts-alpine-openjdk
1919

2020
run ::

0 commit comments

Comments
 (0)