Skip to content

Commit ffd6ccc

Browse files
authored
Fix a default Java version in a docker container (#25)
1 parent cbf1e81 commit ffd6ccc

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ README.html
3636
# VSCode files
3737
.vscode
3838

39+
# Metals
40+
.metals
41+
3942
# Test data files #
4043

4144
java/data

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ matrix:
77
language: scala
88
scala:
99
- 2.13.1
10-
before_install:
11-
- docker pull daunnc/pdal-debian:2.0.0
1210
services:
1311
- docker
1412

@@ -17,8 +15,6 @@ matrix:
1715
language: scala
1816
scala:
1917
- 2.12.10
20-
before_install:
21-
- docker pull daunnc/pdal-debian:2.0.0
2218
services:
2319
- docker
2420

.travis/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ else
99
-v $TRAVIS_BUILD_DIR:/pdal-java \
1010
-e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION \
1111
-e TRAVIS_COMMIT=$TRAVIS_COMMIT \
12-
-e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal-debian:2.0.0 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
12+
-e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal-debian:2.0.1 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
1313
fi

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.6
1+
sbt.version=1.3.8

sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
set -o pipefail
88

9-
declare -r sbt_release_version="1.3.6"
10-
declare -r sbt_unreleased_version="1.3.6"
9+
declare -r sbt_release_version="1.3.8"
10+
declare -r sbt_unreleased_version="1.3.8"
1111

1212
declare -r latest_213="2.13.1"
1313
declare -r latest_212="2.12.10"

scripts/crosscompile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ docker run -it --rm \
2121
-v $PWD:/pdal-java \
2222
-v $HOME/.ivy2:/root/.ivy2 \
2323
-v $HOME/.sbt:/root/.sbt \
24-
daunnc/pdal-debian:2.0.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
24+
daunnc/pdal-debian:2.0.1 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
2525

2626
# docker run -it --rm \
2727
# -v $PWD:/workdir \

scripts/docker/2.0.0/debian/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ RUN set -ex && \
77
openjdk-8-jdk \
88
ca-certificates-java -y
99

10-
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd64
10+
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd6
11+
RUN update-alternatives --set java `update-alternatives --list java | grep java-8`
1112

1213
# https://tracker.debian.org/pkg/pdal
1314
RUN apt-get -y install pdal libpdal-dev bash gcc g++ cmake

0 commit comments

Comments
 (0)