diff --git a/.gitignore b/.gitignore index 3c34e46..0acc83e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ *.bin *.gz + +*.class diff --git a/Dockerfile b/Dockerfile index 678c431..bf86e03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,16 +4,21 @@ RUN cd /goroot/src/ && GOOS=linux GOARCH=386 ./make.bash --no-clean RUN apt-get update && apt-get install ruby vim-common -y -# Install Java -# RUN apt-get install -y software-properties-common python-software-properties -# RUN add-apt-repository -y ppa:webupd8team/java -# RUN apt-get update -y -# RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections -# RUN apt-get install -y oracle-java8-installer +# Install Java for middleware testing +RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list +RUN echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 +RUN apt-get update -y +RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections +RUN apt-get install oracle-java8-installer -y + +RUN wget http://apache-mirror.rbc.ru/pub/apache//commons/io/binaries/commons-io-2.4-bin.tar.gz -P /tmp +RUN tar xzf /tmp/commons-io-2.4-bin.tar.gz -C /tmp WORKDIR /gopath/src/github.com/buger/gor/ - ADD . /gopath/src/github.com/buger/gor/ +RUN javac -cp /tmp/commons-io-2.4/commons-io-2.4.jar ./examples/middleware/echo.java + RUN go get -u github.com/golang/lint/golint RUN go get \ No newline at end of file diff --git a/Makefile b/Makefile index 29de44d..339df03 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ drun: docker run -v `pwd`:$(SOURCE_PATH) -t -i gor go run $(SOURCE) --input-dummy=0 --output-http="http://localhost:9000" --input-raw :9000 --input-http :9000 --verbose --debug --middleware "./examples/middleware/echo.sh" drun-2: - docker run -v `pwd`:$(SOURCE_PATH) -t -i gor go run $(SOURCE) --input-file="./fixtures/requests.gor" --output-dummy --verbose --debug --middleware "./examples/middleware/echo.sh" + docker run -v `pwd`:$(SOURCE_PATH) -t -i gor go run $(SOURCE) --input-file="./fixtures/requests.gor" --output-dummy=0 --verbose --debug --middleware "java -cp ./examples/middleware echo" drecord: docker run -v `pwd`:$(SOURCE_PATH) -t -i gor go run $(SOURCE) --input-dummy=0 --output-file=requests.gor --verbose --debug diff --git a/examples/middleware/echo.java b/examples/middleware/echo.java index e37cf72..707193e 100644 --- a/examples/middleware/echo.java +++ b/examples/middleware/echo.java @@ -4,7 +4,7 @@ import java.io.InputStreamReader; import org.apache.commons.io.IOUtils; -public class Echo { +public class echo { public static void main(String[] args) { if(args != null){ for(String arg : args){