Skip to content

Commit fe3c262

Browse files
committed
Fix bad native dependencies, debian usage instead of alpine to build linux dependecnies
1 parent 9e7e7b3 commit fe3c262

File tree

6 files changed

+22
-9
lines changed

6 files changed

+22
-9
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ matrix:
88
scala:
99
- 2.11.12
1010
before_install:
11-
- docker pull daunnc/pdal:1.7.1
11+
- docker pull daunnc/pdal-debian:1.7.1
1212
services:
1313
- docker
1414

@@ -18,7 +18,7 @@ matrix:
1818
scala:
1919
- 2.12.5
2020
before_install:
21-
- docker pull daunnc/pdal:1.7.1
21+
- docker pull daunnc/pdal-debian:1.7.1
2222
services:
2323
- docker
2424

.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:1.7.1 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
12+
-e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal-debian:1.7.1 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
1313
fi

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ resolvers ++= Seq(
1616
)
1717

1818
libraryDependencies ++= Seq(
19-
"io.pdal" %% "pdal" % "1.7.0-RC2", // core library
20-
"io.pdal" % "pdal-native" % "1.7.0-RC2" // jni bindings
19+
"io.pdal" %% "pdal" % "1.7.0-RC3", // core library
20+
"io.pdal" % "pdal-native" % "1.7.0-RC3" // jni bindings
2121
)
2222
```
2323

@@ -39,8 +39,8 @@ Scala API to build pipeline expressions instead of writing a raw JSON.
3939

4040
```scala
4141
libraryDependencies ++= Seq(
42-
"io.pdal" %% "pdal-scala" % "1.7.0-RC2", // scala core library
43-
"io.pdal" % "pdal-native" % "1.7.0-RC2" // jni bindings
42+
"io.pdal" %% "pdal-scala" % "1.7.0-RC3", // scala core library
43+
"io.pdal" % "pdal-native" % "1.7.0-RC3" // jni bindings
4444
)
4545
```
4646

examples/pdal-jni/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ resolvers ++= Seq(
2121

2222
fork := true
2323

24-
val pdalVersion = "1.7.0-RC2"
24+
val pdalVersion = "1.7.0-RC3"
2525

2626
libraryDependencies ++= Seq(
2727
"io.pdal" %% "pdal" % pdalVersion,

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:1.7.1 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
24+
daunnc/pdal-debian:1.7.1 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
2525

2626
# docker run -it --rm \
2727
# -v $PWD:/workdir \
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM debian:sid
2+
MAINTAINER Grigory Pomadchin <[email protected]>
3+
4+
RUN set -ex && \
5+
apt update -y && \
6+
apt install \
7+
openjdk-8-jdk \
8+
ca-certificates-java -y
9+
10+
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd64
11+
12+
# https://tracker.debian.org/pkg/pdal
13+
RUN apt-get -y install pdal libpdal-dev bash gcc g++ cmake

0 commit comments

Comments
 (0)