FIX Dockerfile https://github.com/OpenIdentityPlatform/OpenDJ/issues/35

Maxim Thomas

07.30.2019 10cfa870051109a7beb4711338be212a5f450c91

FIX Dockerfile https://github.com/OpenIdentityPlatform/OpenDJ/issues/35 

 .travis.yml

@@ -35,7 +35,7 @@
        - "opendj-packages/opendj-deb/opendj-deb-standard/target/*.deb"
        - "opendj-packages/opendj-rpm/opendj-rpm-standard/target/rpm/opendj/RPMS/noarch/*.rpm"
        - "opendj-packages/opendj-msi/opendj-msi-standard/target/*.msi"
        - "opendj-packages/opendj-docker/target/Dockerfile"
        - "opendj-packages/opendj-docker/target/Dockerfile.zip"
        - "opendj-packages/opendj-openshift-template/*.yaml"
        - "opendj-doc-generated-ref/target/*.zip"
        - "opendj-dsml-servlet/target/*.war"
@@ -57,7 +57,7 @@
      -   cd $TRAVIS_BUILD_DIR
      - echo 'build and push Docker'
      -   docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
      -   docker build ./opendj-packages/opendj-docker/target -t $DOCKER_USERNAME/opendj -t $DOCKER_USERNAME/opendj:$git_version
      -   docker build ./opendj-packages/opendj-docker/target/opendj-docker -t $DOCKER_USERNAME/opendj -t $DOCKER_USERNAME/opendj:$git_version
      -   docker push $DOCKER_USERNAME/opendj:$git_version
      -   docker push $DOCKER_USERNAME/opendj
  - os: linux

 opendj-packages/opendj-docker/Dockerfile

@@ -20,9 +20,7 @@

ENV OPENDJ_REPLICATION_TYPE=${OPENDJ_REPLICATION_TYPE}

ENV VERSION=@project_version@

#ENV VERSION=4.3.1
ARG VERSION=@project_version@

ENV OPENDJ_USER="opendj"

@@ -33,9 +31,6 @@
  unzip opendj-$VERSION.zip && \
  rm -r opendj-$VERSION.zip

RUN echo "/opt/opendj/data" > /opt/opendj/instance.loc  && \
    mkdir -p /opt/opendj/data/lib/extensions

ADD bootstrap/ /opt/opendj/bootstrap/

ADD run.sh /opt/opendj/run.sh
@@ -43,7 +38,10 @@
RUN useradd -m -r -u 1001 -G root,sudo $OPENDJ_USER

RUN chgrp -R 0 /opt/opendj && \
    chmod -R g=u /opt/opendj
    chmod -R g=u /opt/opendj && \
    chmod +x /opt/opendj/run.sh \
     /opt/opendj/bootstrap/setup.sh \
     /opt/opendj/bootstrap/replicate.sh

EXPOSE $PORT $LDAPS_PORT 4444


 opendj-packages/opendj-docker/pom.xml

@@ -48,16 +48,17 @@
                        <phase>prepare-package</phase>
                        <configuration>
                          <tasks>
                            <copy todir="${project.build.directory}">
                            <copy todir="${project.build.directory}/opendj-docker/">
                                    <fileset dir="${basedir}">
                                      <include name="Dockerfile" />  <!--NOTE DIFFERENCE HERE-->
                        <include name="bootstrap/**" />
                        <include name="run.sh" />
                                    </fileset>
                                  </copy>
                            <replace token="@project_version@" value="${project.version}" dir="target/">
                            <replace token="@project_version@" value="${project.version}" dir="${project.build.directory}/opendj-docker/">
                              <include name="Dockerfile" />
                            </replace>
                    <zip basedir="${project.build.directory}" destfile="${project.build.directory}/Dockerfile.zip" includes="opendj-docker/**" />
                          </tasks>
                        </configuration>
                        <goals>

 opendj-packages/opendj-docker/run.sh

@@ -10,6 +10,11 @@

cd /opt/opendj

#if defaul data folder exists do not change it
if [ ! -d ./db ] ; then
  echo "/opt/opendj/data" > /opt/opendj/instance.loc  && \
    mkdir -p /opt/opendj/data/lib/extensions
fi

# Instance dir does not exist? Then we need to run setup
if [ ! -d ./data/config ] ; then
@@ -33,6 +38,7 @@
      /opt/opendj/bootstrap/replicate.sh
   fi
else
 sh ./upgrade -n
 exec ./bin/start-ds --nodetach
 return
fi
@@ -56,9 +62,8 @@
   while true; do sleep 100000; done
fi

echo "Try to upgrade OpenDJ"
sh ./upgrade -n

echo "Starting OpenDJ"

#

exec ./bin/start-ds --nodetach

 opendj-packages/opendj-openshift-template/opendj-openshift-template.yaml