Shane Kilkelly пре 7 година
родитељ
комит
394fd17dfa
3 измењених фајлова са 23 додато и 4 уклоњено
  1. 3 2
      services/git-bridge/Dockerfile
  2. 3 2
      services/git-bridge/Makefile
  3. 17 0
      services/git-bridge/docker-compose.yml

+ 3 - 2
services/git-bridge/Dockerfile

@@ -5,11 +5,12 @@ FROM ubuntu:latest
 
 
 
 
 RUN apt-get update && \
 RUN apt-get update && \
-  apt-get install -y git make maven openjdk-8-jdk && \
+  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/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 --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 java /usr/lib/jvm/java-8-openjdk-amd64/bin/java && \
   update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
   update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
 
 
 
 
-RUN mkdir /app
+RUN mkdir /app
+WORKDIR /app

+ 3 - 2
services/git-bridge/Makefile

@@ -1,6 +1,7 @@
 # git-bridge makefile
 # git-bridge makefile
 
 
-run:
+
+run: package
 	java -jar target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar conf/local.json
 	java -jar target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar conf/local.json
 
 
 
 
@@ -20,4 +21,4 @@ package:
 	mvn package
 	mvn package
 
 
 
 
-.PHONY: build clean test
+.PHONY: run package build clean test

+ 17 - 0
services/git-bridge/docker-compose.yml

@@ -0,0 +1,17 @@
+version: "3"
+
+networks:
+  default:
+    external:
+      name: sharelatex_overleaf
+
+services:
+  git_bridge:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - .:/app
+    command: make run
+    ports:
+      - 8000:8000