From 84abc18eccc645fa3658adabd7b926a11e9e9461 Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Wed, 28 Feb 2018 10:14:16 +0000
Subject: [PATCH] Push build and push docker image in travis
---
.travis.yml | 7 +++++++
opendj-packages/opendj-docker/Dockerfile | 14 ++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e4ad805..f39776d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@
include:
- os: linux
jdk: openjdk8
+ sudo: required
+ services:
+ - docker
before_deploy:
- git config --local user.name "Open Identity Platform Community" && git config --local user.email "open-identity-platform-opendj@googlegroups.com"
- git checkout -f $TRAVIS_BRANCH
@@ -35,6 +38,10 @@
- travis
after_deploy:
- echo 'after_deploy'
+ - echo 'build and push Docker'
+ - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+ - docker build ./opendj-packages/opendj-docker/ -t $DOCKER_USERNAME/opendj
+ - docker push $DOCKER_USERNAME/opendj
- os: linux
jdk: oraclejdk8
- os: osx
diff --git a/opendj-packages/opendj-docker/Dockerfile b/opendj-packages/opendj-docker/Dockerfile
index 0b51a03..3c517f1 100644
--- a/opendj-packages/opendj-docker/Dockerfile
+++ b/opendj-packages/opendj-docker/Dockerfile
@@ -2,12 +2,6 @@
MAINTAINER Open Identity Platform <open-identity-platform@googlegroups.com>
-WORKDIR /opt
-
-RUN apt-get install -y wget unzip
-
-RUN wget --quiet https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/4.0.3/opendj-4.0.3.zip && unzip opendj-4.0.3.zip && rm -r opendj-4.0.3.zip
-
ENV PORT 1389
ENV LDAPS_PORT 1636
@@ -18,6 +12,14 @@
ENV ROOT_PASSWORD password
+ENV git_version 4.1.1
+
+WORKDIR /opt
+
+RUN apt-get install -y wget unzip
+
+RUN wget --quiet https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/$git_version/opendj-$git_version.zip && unzip opendj-$git_version.zip && rm -r opendj-$git_version.zip
+
RUN /opt/opendj/setup --cli -p $PORT --ldapsPort $LDAPS_PORT --enableStartTLS --generateSelfSignedCertificate --baseDN "$BASE_DN" -h localhost --rootUserDN "$ROOT_USER_DN" --rootUserPassword $ROOT_PASSWORD --acceptLicense --no-prompt --doNotStart
CMD ["/opt/opendj/bin/start-ds", "--nodetach"]
--
Gitblit v1.10.0