inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved the docker image, pulls variables from bamboo, and updated the README

Browse Source
This commit is contained in:
Gethin James
2017-01-31 15:39:18 +01:00
parent 1513ae83ec
commit a04e7ca2a0
3 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/buildAndTest.sh
+4 -7
View File
@@ -1,5 +1,5 @@
#!/bin/bash
set -e
set -e
[ "$DEBUG" ] && set -x
@@ -7,13 +7,10 @@ set -e
cd "$(dirname "$0")"
nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'`
dockerImage="docker-internal.alfresco.com/search-services:${nicebranch}-latest"
dockerImage="docker-internal.alfresco.com/search-services:$bamboo_maven_version"
echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version"
echo "Building $dockerImage..."
rm -f src/docker/alfresco-search-services-*.zip
cp target/alfresco-search-services-*.zip src/docker
docker build -t $dockerImage src/docker
docker build --build-arg solrBranch=$nicebranch --build-arg solrVer=$bamboo_maven_version -t $dockerImage src/docker
echo "Running tests"
docker run --rm "$dockerImage" [ -d /opt/alfresco-solr/solr ] || (echo "solr dir does not exist" && exit 1)
packaging/src/docker/Dockerfile
+24 -23
View File
@@ -1,33 +1,34 @@
# Alfresco Solr 6 Docker image
#
FROM openjdk:8
# Alfresco Solr Docker image
FROM openjdk:8u111-jdk-alpine
MAINTAINER Gethin James, gethin.james@alfresco.com
ENV SOLR_ZIP alfresco-search-services-*.zip
ENV DIST_DIR /opt/alfresco-solr
ARG solrUrl
ARG solrBranch
ARG solrVer
ENV SOLR_URL ${solrUrl:-nightlybuilds.alfresco.com/SearchServices/$solrBranch/LATEST/Distribution/alfresco-search-services-$solrVer.zip}
ENV SOLR_ZIP alfresco-search-services.zip
ENV DIST_DIR /opt/alfresco-search
ENV LANG C.UTF-8
RUN groupadd -r solr && useradd -m -r -g solr -s /bin/bash solr
RUN apt-get update && apt-get install -y \
RUN addgroup solr && adduser -s /bin/bash -D -G solr solr
RUN set -x \
&& apk add --no-cache --virtual .fetch-deps \
ca-certificates \
vim curl unzip lsof \
--no-install-recommends && rm -r /var/lib/apt/lists/*
vim unzip lsof \
bash openssl wget \
&& mkdir -p $DIST_DIR/data/content \
&& wget --no-check-certificate -O "$SOLR_ZIP" "$SOLR_URL" \
&& unzip "$SOLR_ZIP" -d $DIST_DIR/ && rm "$SOLR_ZIP"\
&& mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ \
&& chown -R solr:solr $DIST_DIR \
&& echo '#Docker Setup' >> $DIST_DIR/solr.in.sh \
&& echo 'SOLR_OPTS="$SOLR_OPTS -Dsolr.data.dir.root=/opt/alfresco-search/data -Dsolr.solr.content.dir=/opt/alfresco-search/data/content -Dsolr.solr.model.dir=/opt/alfresco-search/data/alfrescoModels"' >> $DIST_DIR/solr.in.sh
COPY $SOLR_ZIP $DIST_DIR/
WORKDIR $DIST_DIR
RUN unzip *.zip -d $DIST_DIR/ && rm *.zip && \
mkdir -p $DIST_DIR/data/content && \
mv $DIST_DIR/solrhome/alfrescoModels $DIST_DIR/data/ && \
chown -R solr:solr $DIST_DIR
RUN echo '\n##Docker Setup' >> $DIST_DIR/solr.in.sh \
&& echo 'SOLR_OPTS="$SOLR_OPTS -Dsolr.data.dir.root=/opt/alfresco-solr/data -Dsolr.solr.content.dir=/opt/alfresco-solr/data/content -Dsolr.solr.model.dir=/opt/alfresco-solr/data/alfrescoModels"' >> $DIST_DIR/solr.in.sh
#&& echo 'SOLR_HOME=$DIST_DIR/solrhome' >> $DIST_DIR/solr.in.sh \
VOLUME /opt/alfresco-solr/data
VOLUME /opt/alfresco-solr/solrhome
VOLUME /opt/alfresco-search/data
VOLUME /opt/alfresco-search/solrhome
EXPOSE 8983
USER solr
CMD [ "/opt/alfresco-solr/solr/bin/solr", "start", "-f" ]
CMD [ "/opt/alfresco-search/solr/bin/solr", "start", "-f" ]