Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
de0e065d
Commit
de0e065d
authored
Apr 24, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use AdoptOpenJDK for Ubuntu launch script integration tests
Closes gh-16633
parent
c11e847d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
16 deletions
+14
-16
pom.xml
...integration-tests/spring-boot-launch-script-tests/pom.xml
+2
-2
Dockerfile
...src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
+6
-7
Dockerfile
...src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile
+6
-7
No files found.
spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml
View file @
de0e065d
...
...
@@ -17,7 +17,7 @@
</organization>
<properties>
<main.basedir>
${basedir}/../..
</main.basedir>
<jersey.version>
2.2
3.1
</jersey.version>
<jersey.version>
2.2
7
</jersey.version>
</properties>
<dependencies>
<dependency>
...
...
@@ -37,7 +37,7 @@
<dependency>
<groupId>
com.github.docker-java
</groupId>
<artifactId>
docker-java
</artifactId>
<version>
3.
0.14
</version>
<version>
3.
1.2
</version>
<scope>
test
</scope>
</dependency>
<dependency>
...
...
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile
View file @
de0e065d
FROM
ubuntu:trusty-20160914
RUN
apt-get update
&&
\
apt-get
install
-y
software-properties-common
&&
\
add-apt-repository ppa:webupd8team/java
-y
&&
\
apt-get update
&&
\
echo
oracle-java7-installer shared/accepted-oracle-license-v1-1
select
true
| /usr/bin/debconf-set-selections
&&
\
apt-get
install
-y
oracle-java8-installer
&&
\
apt-get
install
-y
curl
&&
\
apt-get clean
apt-get
install
-y
software-properties-common curl
&&
\
mkdir
-p
/opt/openjdk
&&
\
cd
/opt/openjdk
&&
\
curl
-L
https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz |
tar
zx
--strip-components
=
1
ENV
JAVA_HOME /opt/openjdk
ENV
PATH $JAVA_HOME/bin:$PATH
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile
View file @
de0e065d
FROM
ubuntu:xenial-20160914
RUN
apt-get update
&&
\
apt-get
install
-y
software-properties-common
&&
\
add-apt-repository ppa:webupd8team/java
-y
&&
\
apt-get update
&&
\
echo
oracle-java7-installer shared/accepted-oracle-license-v1-1
select
true
| /usr/bin/debconf-set-selections
&&
\
apt-get
install
-y
oracle-java8-installer
&&
\
apt-get
install
-y
curl
&&
\
apt-get clean
apt-get
install
-y
software-properties-common curl
&&
\
mkdir
-p
/opt/openjdk
&&
\
cd
/opt/openjdk
&&
\
curl
-L
https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz |
tar
zx
--strip-components
=
1
ENV
JAVA_HOME /opt/openjdk
ENV
PATH $JAVA_HOME/bin:$PATH
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment