Skip to content

Commit 0a0032e

Browse files
committed
Update version
1 parent fde0260 commit 0a0032e

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM codeworksio/ubuntu:18.04-20180203
1+
FROM codeworksio/ubuntu:18.04-20180210
22

33
# SEE: https://github.com/docker-library/openjdk/blob/master/8-jdk/Dockerfile
44

@@ -9,21 +9,21 @@ ENV JAVA_VERSION="8u151" \
99
CA_CERTIFICATES_JAVA_VERSION="20170930" \
1010
JAVA_HOME="/java-home"
1111

12-
RUN set -ex \
12+
RUN set -ex; \
1313
\
14-
&& if [ -n "$APT_PROXY" ]; then echo "Acquire::http { Proxy \"http://${APT_PROXY}\"; };" > /etc/apt/apt.conf.d/00proxy; fi \
15-
&& if [ -n "$APT_PROXY_SSL" ]; then echo "Acquire::https { Proxy \"https://${APT_PROXY_SSL}\"; };" > /etc/apt/apt.conf.d/00proxy; fi \
16-
&& apt-get --yes update \
17-
&& apt-get --yes install \
14+
if [ -n "$APT_PROXY" ]; then echo "Acquire::http { Proxy \"http://${APT_PROXY}\"; };" > /etc/apt/apt.conf.d/00proxy; fi; \
15+
if [ -n "$APT_PROXY_SSL" ]; then echo "Acquire::https { Proxy \"https://${APT_PROXY_SSL}\"; };" > /etc/apt/apt.conf.d/00proxy; fi; \
16+
apt-get --yes update; \
17+
apt-get --yes install \
1818
openjdk-8-jdk=$JAVA_UBUNTU_VERSION \
1919
ca-certificates-java=$CA_CERTIFICATES_JAVA_VERSION \
20+
; \
21+
ln -sT "/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)" $JAVA_HOME; \
22+
update-alternatives --get-selections | awk -v home="$(readlink -f $JAVA_HOME)" 'index($3, home) == 1 { $2 = "manual"; print | "update-alternatives --set-selections" }'; \
23+
/var/lib/dpkg/info/ca-certificates-java.postinst configure; \
2024
\
21-
&& ln -sT "/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)" $JAVA_HOME \
22-
&& update-alternatives --get-selections | awk -v home="$(readlink -f $JAVA_HOME)" 'index($3, home) == 1 { $2 = "manual"; print | "update-alternatives --set-selections" }' \
23-
&& /var/lib/dpkg/info/ca-certificates-java.postinst configure \
24-
\
25-
&& rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/* \
26-
&& rm -f /etc/apt/apt.conf.d/00proxy
25+
rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/*; \
26+
rm -f /etc/apt/apt.conf.d/00proxy
2727

2828
### METADATA ###################################################################
2929

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ log:
4242

4343
test:
4444
docker exec --interactive --tty \
45-
--user "ubuntu" \
45+
--user ubuntu \
4646
$(NAME) \
4747
java -version
4848

4949
bash:
5050
docker exec --interactive --tty \
51+
--user root \
5152
$(NAME) \
5253
/bin/bash --login ||:
5354

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ Testing
2121
-------
2222

2323
make build start log
24+
make stop

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.151-20180203
1+
8.151-20180210

0 commit comments

Comments
 (0)