Skip to content

Commit

Permalink
Don't set environment variable which is bad style
Browse files Browse the repository at this point in the history
  • Loading branch information
@mernst
mernst committed Dec 30, 2019
1 parent e4dd034 commit 47f0907
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 29 deletions.
11 changes: 6 additions & 5 deletions checker/bin-devel/Dockerfile-ubuntu-jdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
FROM ubuntu
MAINTAINER Michael Ernst <mernst@cs.washington.edu>

ENV DEBIAN_FRONTEND noninteractive

# According to
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/:
# * Put "apt-get update" and "apt-get install" and apt cleanup in the same RUN command.
# * Do not run "apt-get upgrade"; instead get upstream to update.

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
openjdk-11-jdk

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
ant \
cpp \
Expand All @@ -31,5 +31,6 @@ RUN apt-get -qqy update \
unzip \
wget

RUN apt-get clean \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
14 changes: 8 additions & 6 deletions checker/bin-devel/Dockerfile-ubuntu-jdk11-plus
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
FROM ubuntu
MAINTAINER Michael Ernst <mernst@cs.washington.edu>

ENV DEBIAN_FRONTEND noninteractive

## Keep this file in sync with ../../docs/manual/troubleshooting.tex

# According to
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/:
# * Put "apt-get update" and "apt-get install" and apt cleanup in the same RUN command.
# * Do not run "apt-get upgrade"; instead get upstream to update.

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
openjdk-11-jdk

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
ant \
cpp \
Expand All @@ -33,7 +33,8 @@ RUN apt-get -qqy update \
unzip \
wget

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
dia \
hevea \
Expand All @@ -52,5 +53,6 @@ RUN apt-get -qqy update \

RUN pip3 install html5validator

RUN apt-get clean \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
17 changes: 10 additions & 7 deletions checker/bin-devel/Dockerfile-ubuntu-jdk11-plus-buildjdk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
FROM ubuntu
MAINTAINER Michael Ernst <mernst@cs.washington.edu>

ENV DEBIAN_FRONTEND noninteractive

## Keep this file in sync with ../../docs/manual/troubleshooting.tex

# According to
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/:
# * Put "apt-get update" and "apt-get install" and apt cleanup in the same RUN command.
# * Do not run "apt-get upgrade"; instead get upstream to update.

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
openjdk-11-jdk

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
ant \
cpp \
Expand All @@ -33,7 +33,8 @@ RUN apt-get -qqy update \
unzip \
wget

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
dia \
hevea \
Expand All @@ -52,7 +53,8 @@ RUN apt-get -qqy update \

RUN pip3 install html5validator

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
autoconf \
libasound2-dev \
Expand All @@ -72,5 +74,6 @@ RUN wget https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulB
RUN git config --global user.email "you@example.com" \
&& git config --global user.name "Your Name"

RUN apt-get clean \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
11 changes: 6 additions & 5 deletions checker/bin-devel/Dockerfile-ubuntu-jdk8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
FROM ubuntu
MAINTAINER Michael Ernst <mernst@cs.washington.edu>

ENV DEBIAN_FRONTEND noninteractive

# According to
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/:
# * Put "apt-get update" and "apt-get install" and apt cleanup in the same RUN command.
# * Do not run "apt-get upgrade"; instead get upstream to update.

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
openjdk-8-jdk \
&& update-java-alternatives --set java-1.8.0-openjdk-amd64

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
ant \
cpp \
Expand All @@ -32,5 +32,6 @@ RUN apt-get -qqy update \
unzip \
wget

RUN apt-get clean \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
14 changes: 8 additions & 6 deletions checker/bin-devel/Dockerfile-ubuntu-jdk8-plus
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
FROM ubuntu
MAINTAINER Michael Ernst <mernst@cs.washington.edu>

ENV DEBIAN_FRONTEND noninteractive

## Keep this file in sync with ../../docs/manual/troubleshooting.tex

# According to
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/:
# * Put "apt-get update" and "apt-get install" and apt cleanup in the same RUN command.
# * Do not run "apt-get upgrade"; instead get upstream to update.

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
openjdk-8-jdk \
&& update-java-alternatives --set java-1.8.0-openjdk-amd64

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
ant \
cpp \
Expand All @@ -34,7 +34,8 @@ RUN apt-get -qqy update \
unzip \
wget

RUN apt-get -qqy update \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -qqy update \
&& apt-get -qqy install \
dia \
hevea \
Expand All @@ -53,5 +54,6 @@ RUN apt-get -qqy update \

RUN pip3 install html5validator

RUN apt-get clean \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

0 comments on commit 47f0907

Please sign in to comment.