github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master' into misc/docker-build

Browse source 
# Conflicts:
#	Dockerfile
This commit is contained in:
Jakob Ackermann 2019-05-05 18:32:35 +02:00
commit 5907172463
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/git-bridge/Dockerfile
View file

@ -1,18 +1,9 @@
# Dockerfile for git-bridge # Dockerfile for git-bridge
FROM maven:3-jdk-8
FROM ubuntu:latest RUN apt-get update && apt-get install -y make git curl
RUN apt-get update && \
apt-get install -y git make maven openjdk-8-jdk curl && \
update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-8-openjdk-amd64/bin/java 100 && \
update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac 100 && \
update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/bin/java && \
update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
RUN mkdir /app
WORKDIR /app WORKDIR /app
COPY . /app COPY . /app