Merge pull request #11 from gmemstr/master

Update TravisCI in vue-admin branch

.travis.yml

@@ -1,5 +1,7 @@
 language: go
 sudo: false
+services:
+  - docker
 matrix:
   include:
     - go: 1.7
@@ -14,9 +16,15 @@ matrix:
 
   install:
     - godep restore
-  
+    
   script: 
     - go vet .
     - go test
     - go build
-    - ls -al
+    - ls -al
+
+script: 
+  - docker build -t gmemstr/pogo .
+  - docker run -d --name pogo  -p 3000:3000 gmemstr/pogo
+  - sleep 10
+  - docker ps -a | grep gmemstr/pogo

Dockerfile

@@ -1,11 +1,17 @@
 # Use latest golang image
 FROM golang:latest
 
+RUN  mkdir -p /go/src \
+  && mkdir -p /go/bin \
+  && mkdir -p /go/pkg
+ENV GOPATH=/go
+ENV PATH=$GOPATH/bin:$PATH
+
 # Set working directory
-WORKDIR /POGO
+WORKDIR $GOPATH/src/github.com/gmemstr/pogo
 
 # Add source to container so we can build
-ADD . /POGO
+ADD . $GOPATH/src/github.com/gmemstr/pogo
 
 # 1. Install make and dependencies
 # 2. Install Go dependencies
@@ -13,8 +19,9 @@ ADD . /POGO
 # 4. List directory structure (for debugging really)\
 # 5. Make empty podcast direcory
 # 6. Create empty feed files
-RUN godep restore && \
-	make linux && chmod +x pogoapp && \
+RUN ls -al && go get github.com/tools/godep && \
+	godep restore && \
+	go build -o pogoapp && chmod +x pogoapp && \
 	ls -al && \
 	mkdir podcasts && \
 	touch assets/web/feed.rss assets/web/feed.json && \
@@ -22,6 +29,6 @@ RUN godep restore && \
 	echo '{}' >assets/config/users.json && \
 	echo '{}' >assets/config/config.json
 
-EXPOSE 8000
+EXPOSE 3000
 
-CMD ./pogoapp
+CMD ./go/src/github.com/gmemstr/pogoapp

README.md

@@ -31,7 +31,7 @@ To produce a product that is easy to deploy and easier to use when hosting a pod
 ```
 godep restore
 go build
-# Set enviornment variable
+# Set environment variable
 export POGO_SECRET=secret
 # Windows
 # set POGO_SECRET=secret
@@ -43,7 +43,6 @@ export POGO_SECRET=secret
 Pogo uses a flat file structure for managing podcast episodes. As such, files have a special naming convention.
 
 For podcast audio files, filenames take the form of YEAR-MONTH-DAY followed by the title. The two values are
-seperated by underscores (`YYYY-MM-DD_TITLE.mp3`).
-
-Shownote fils are markdown formatted and simply append `_SHOWNOTES.md` to the existing filename (sans .mp3 of course). 
+separated by underscores (`YYYY-MM-DD_TITLE.mp3`).
 
+"Shownote" files are markdown formatted and simply append `_SHOWNOTES.md` to the existing filename (sans .mp3 of course).