Merge pull request #60 from skerschb/DOCSP-8124

Docsp 8124

Author: skerschb

Dockerfile

@@ -27,15 +27,17 @@ RUN apt-get install --yes build-essential
 RUN useradd -ms /bin/bash docsworker
 RUN npm -g config set user root
 USER docsworker
+
 WORKDIR /home/docsworker
 
 # install snooty parser
 RUN python3 -m pip uninstall -y snooty
 RUN python3 -m pip install --upgrade pip flit
-RUN git clone https://github.com/mongodb/snooty-parser.git snooty-parser && \
+RUN git clone https://github.com/mongodb/snooty-parser.git && \
 	cd snooty-parser && \
-	git fetch --all && \
-	git reset --hard origin/master && \
+	git fetch --tags && \
+	latestTag=$(git describe --tags `git rev-list --tags --max-count=1`) && \
+	git checkout "$latestTag" && \
 	FLIT_ROOT_INSTALL=1 python3 -m flit install
 ENV PATH="${PATH}:/home/docsworker/.local/bin"
 
@@ -55,9 +57,8 @@ COPY worker/ .
 RUN npm install
 
 # where repo work will happen
-#RUN mv repos repos_tmp
-RUN mkdir repos && chmod 777 repos
+RUN mkdir repos && chmod 755 repos
 
 # entry to kick-off the worker
 EXPOSE 3000
-CMD ["npm", "start"]
+CMD ["npm", "start"]

Dockerfile.xlarge

@@ -33,10 +33,11 @@ WORKDIR /home/docsworker-xlarge
 # install snooty parser
 RUN python3 -m pip uninstall -y snooty
 RUN python3 -m pip install --upgrade pip flit
-RUN git clone https://github.com/mongodb/snooty-parser.git snooty-parser && \
+RUN git clone https://github.com/mongodb/snooty-parser.git && \
 	cd snooty-parser && \
-	git fetch --all && \
-	git reset --hard origin/master && \
+	git fetch --tags && \
+	latestTag=$(git describe --tags `git rev-list --tags --max-count=1`) && \
+	git checkout "$latestTag" && \
 	FLIT_ROOT_INSTALL=1 python3 -m flit install
 ENV PATH="${PATH}:/home/docsworker-xlarge/.local/bin"