Skip to content

Commit 5adfbb9

Browse files
committed
Docker setup
1 parent d05d146 commit 5adfbb9

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

build.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ schedules:
33
schedule: adhoc
44
os:
55
- osx/high-sierra
6-
- ubuntu/trusty64
7-
java:
8-
- oraclejdk8
6+
- ubuntu/xenial64
97
build:
108
- script: |
119
echo "OS VERSION ===== $OS_VERSION"
1210
if [ "$OS_VERSION" = "osx/high-sierra" ]; then
1311
mvn -B clean -DskipTests
14-
mvn -B -pl transport-native-unix-common,transport-native-kqueue -Partifactory deploy -DskipTests -DaltDeploymentRepository="artifactory::default::https://repo.sjc.dsinternal.org/artifactory/datastax-releases-local"
12+
mvn -B -U -pl transport-native-unix-common,transport-native-kqueue -Partifactory deploy -DskipTests -DaltDeploymentRepository="artifactory::default::https://repo.sjc.dsinternal.org/artifactory/datastax-releases-local"
1513
else
1614
./docker-datastax-release.sh
1715
fi

dev-tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<groupId>io.netty</groupId>
2727
<artifactId>netty-dev-tools</artifactId>
28-
<version>4.1.25.5.dse</version>
28+
<version>4.1.25.6.dse</version>
2929

3030
<name>Netty/Dev-Tools</name>
3131

docker-datastax-release.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,5 @@ if [ ! -f /usr/bin/docker ]; then
1111
sudo apt-get install -y docker-ce
1212
fi
1313

14-
docker build -f docker/Dockerfile-netty-centos6 . -t netty-centos6
15-
16-
docker run -it -v ~/.m2:/root/.m2 -v ~/.ssh:/root/.ssh -v ~/.gnupg:/root/.gnupg -v `pwd`:/code -w /code --entrypoint="" netty-centos6 bash -ic "mvn -B clean deploy -Partifactory -DskipTests -DaltDeploymentRepository=\"artifactory::default::https://repo.sjc.dsinternal.org/artifactory/datastax-releases-local\""
17-
14+
sudo docker build -f docker/Dockerfile-netty-centos6 -t netty-centos6 .
15+
sudo docker run -t -v ~/.m2:/root/.m2 -v ~/.ssh:/root/.ssh -v ~/.gnupg:/root/.gnupg -v `pwd`:/code -w /code --entrypoint="" netty-centos6 bash -ic "mvn -B clean deploy -Partifactory -DskipTests -DaltDeploymentRepository=\"artifactory::default::https://repo.sjc.dsinternal.org/artifactory/datastax-releases-local\""

docker/Dockerfile-netty-centos6

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MAINTAINER [email protected]
33
ENTRYPOINT /bin/bash
44

55
ENV SOURCE_DIR $HOME/source
6-
ENV MAVEN_VERSION 3.5.2
6+
ENV MAVEN_VERSION 3.2.5
77
ENV JAVA_VERSION 1.8.0
88

99
RUN mkdir $SOURCE_DIR
@@ -24,11 +24,13 @@ RUN yum install -y \
2424
openssl-devel \
2525
tar \
2626
wget \
27-
libaio
27+
libaio \
28+
libaio-devel
2829

2930
RUN wget -q http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz && tar xfz apache-maven-$MAVEN_VERSION-bin.tar.gz && mv apache-maven-$MAVEN_VERSION /opt/
3031

3132
RUN echo 'PATH=/opt/apache-maven-$MAVEN_VERSION/bin:$PATH' >> ~/.bashrc
33+
3234
RUN echo 'export JAVA_HOME="/usr/lib/jvm/java-$JAVA_VERSION/"' >> ~/.bashrc
3335

3436
RUN rm -rf $SOURCE_DIR

0 commit comments

Comments
 (0)