From 8560b09444045f793100ef19c542abbd3fbac59f Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 15 Mar 2020 15:19:33 +0000 Subject: [PATCH] Switch to JDK 11 This mirrors the corresponding change in the main OpenRS2 repository. It also allows us to switch away from the AdoptOpenJDK builds and use OpenJDK from Debian instead. This simplifies the process for building the image. --- Dockerfile | 16 ++++++++-------- adoptopenjdk.gpg | Bin 2252 -> 0 bytes 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 adoptopenjdk.gpg diff --git a/Dockerfile b/Dockerfile index 0f56f30..e1919b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM debian:10-slim ENV LANG C.UTF-8 -COPY adoptopenjdk.gpg /etc/apt/trusted.gpg.d/ -RUN apt-get update && \ - apt-get install -y apt-transport-https ca-certificates && \ - echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb buster main' > /etc/apt/sources.list.d/adoptopenjdk.list && \ +RUN mkdir -p /usr/share/man/man1 && \ apt-get update && \ - mkdir -p /usr/share/man/man1 && \ - apt-get install -y --no-install-recommends adoptopenjdk-8-hotspot && \ - apt-get install -y --no-install-recommends gcc libc6-dev libgl1-mesa-dev libxt-dev maven && \ - apt-get autoremove --purge -y && \ + apt-get install -y --no-install-recommends \ + gcc \ + libc6-dev \ + libgl1-mesa-dev \ + libxt-dev \ + maven \ + openjdk-11-jdk && \ rm -rf /var/lib/apt/lists/* diff --git a/adoptopenjdk.gpg b/adoptopenjdk.gpg deleted file mode 100644 index a5aee1f90d974abed1afeb111c85b68bb7b18136..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2252 zcmV;-2s8JY0u2OQ$RqCo5CGEhu{0b9L{F%8E;>P-2Z!wiIpHkDWtf!15m(p&%RLx9m(0Ol(KIhMw@mGp!Sok6!J@ z7ePz%(=mVV{ALmd%$9%$pO9{FNeeDGUGoYqALP;3^Z3y*_Lw!vf(h0eGO*hl>b*Wv z;S~N&kjwWDEp^#or&1o$jm10P^zyPCh4qm>rny0*_q4w4Ju?rq>gi!B!H@tVRg^oC z^eSkNqT8Ss_Mx3&7{wJrLf~H`4N+xM$5zU1b;o}QU*DQkev@*J@*aiw3w1YM)1jRd z%CD?PJx9G%yX6280RRECO+jRDaCA>_Wo}ADOCTt9b7f>8W^ZyJaCKsAX>(|4Zf77; zP)#6VZe$=tMM5BEX>4V4DIh#yWN&bEZ*XO9YGi9bXKi6=Y%XJOZ9a(tI0O>`0stZf z0$j)=?*bbG1`7!Y2Ll2I6$kcsy2^y~q-DHBe4k~aMrBS9?tj~my5o_{)qU0{3L(gb(G3-N{F?$GoS^gyqxeyuy! z4-^ImV9{JL@m6j{9%;;nYt&V;6GBtTM-HVsG0&2)1H^OuPQv?I`Cy~kVj@Ka1!KI(E8`Owm=Nnr8!w5?mr8}d|yc$%(h z*KYZKCyRG1EFlpdKlm`YAOAoeJTHb$n1neHPtU9SLMu&$z{-(Rtw;HQBe3>>`%{p* z{MO3EAqF^I_8e*jtPcH7IiXi*VXaoNeJ;SD2vzO(A-@LWQ?bCgUoB{0K%m;)M5&@v zU+D{D-NDch9<^LP@AMv*ZgbVuXZqz*bIC$oVRR)&I{nOltMxCzcps|?9^RHVpI{rv z0w(53ioFT@Ba3gFQZ-RrW@xj7nKah8#?RpAYCA8Gc|9XVuT1kaHyGQ4;cHgAo>m3hZ6}y?VGXrA5FW|IqeouwClXRbAlzmB#RcVN5&REDmYo^6pYn<9Q5b`}lu#5q!pb+IUOLKdS+j^W9WO#SZJX5tgsT2p+zkm1oFuh4rvZ z@sY3_^(P{caxY5j;PdE1)OkjOGyU$<2@sai^A9U^5}>OH2&gLvD^Mcj$~&qEL|44) z%d@wFf|5qV{V(6BT=`@UxqMmX@4lh+!9m4wPg)?Br=HR#FLlqjM$maKw?L0Gp$1AR zYW1nKF6_y_v}HMq|D@y$qM?*h*o9gB;9`FWXjm)swO$LK-Hn*|Bk)o!5?USjS{{Q^ zaK5*;C?TCj8VfAkLp94GoYkv6PfbJH-gPE@p}1v~%vmtxY;$dg7*>n%!e1bhM}C zewl||?=+D-J`uD74u(M@htJTqj6KqEn;TNWB3wf}ShN)jMQL!=?=}H}V~2{>+#=#K zK4N-{OH<~?#bt+D3<2tcMJO}YtmlvIvxuosycE)XH4$ae8?sUA@7tD+M%c}-o& z!1!GN)+~nU2_;R*->xM*sv`ni0s*IIcsL$)W^Ik4PPK@EpfD6l22-$ph($=&hWT^c zwDXs|P@sE3d-avS*IX$C*hP;=YeQ{K1+pr3(lb;oD!g$9>q#lYw`p*Uyp2vH15kKX z9(#;7OG( zIfsNvQpX^l=LXZuo52zBO^6h2&qacod8e|zwHaai#?c~7Iivg=#>E^2*{ui@33&k| z$QwLy9Hb`gQVzx6U%`N6xGK%JDO}=gK7-6OmKtpwDZJD+xK8HJbO