Skip to content

Fix a default Java version in a docker container #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2020
Merged

Fix a default Java version in a docker container #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ README.html
# VSCode files
.vscode

# Metals
.metals

# Test data files #

java/data
Expand Down
4 changes: 0 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ matrix:
language: scala
scala:
- 2.13.1
before_install:
- docker pull daunnc/pdal-debian:2.0.0
services:
- docker

Expand All @@ -17,8 +15,6 @@ matrix:
language: scala
scala:
- 2.12.10
before_install:
- docker pull daunnc/pdal-debian:2.0.0
services:
- docker

Expand Down
2 changes: 1 addition & 1 deletion .travis/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ else
-v $TRAVIS_BUILD_DIR:/pdal-java \
-e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION \
-e TRAVIS_COMMIT=$TRAVIS_COMMIT \
-e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal-debian:2.0.0 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
-e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal-debian:2.0.1 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
fi
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.6
sbt.version=1.3.8
4 changes: 2 additions & 2 deletions sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

set -o pipefail

declare -r sbt_release_version="1.3.6"
declare -r sbt_unreleased_version="1.3.6"
declare -r sbt_release_version="1.3.8"
declare -r sbt_unreleased_version="1.3.8"

declare -r latest_213="2.13.1"
declare -r latest_212="2.12.10"
Expand Down
2 changes: 1 addition & 1 deletion scripts/crosscompile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker run -it --rm \
-v $PWD:/pdal-java \
-v $HOME/.ivy2:/root/.ivy2 \
-v $HOME/.sbt:/root/.sbt \
daunnc/pdal-debian:2.0.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
daunnc/pdal-debian:2.0.1 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"

# docker run -it --rm \
# -v $PWD:/workdir \
Expand Down
3 changes: 2 additions & 1 deletion scripts/docker/2.0.0/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ RUN set -ex && \
openjdk-8-jdk \
ca-certificates-java -y

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

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