[WIP] Docker / go 1.6 updates

Dockerfile

@@ -1,36 +1,9 @@
-FROM ubuntu:14.04
+FROM golang:1.6.0
 MAINTAINER Yann Malet <[email protected]>
 
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV PATH /usr/src/go/bin:$PATH
-ENV GOPATH /go
-ENV PATH /go/bin:$PATH
-ENV GOLANG_VERSION 1.3.1
+ADD . /go/src/github.com/BotBotMe/botbot-bot/
+WORKDIR /go/src/github.com/BotBotMe/botbot-bot/
 
+RUN go get -u github.com/kardianos/govendor
 
-# SCMs for "go get", gcc for cgo
-RUN DEBIAN_FRONTEND=noninteractive apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    ca-certificates curl gcc libc6-dev \
-    bzr git mercurial
-RUN rm -rf /var/lib/apt/lists/*
-RUN curl -sSL http://golang.org/dl/go$GOLANG_VERSION.src.tar.gz | tar -v -C /usr/src -xz
-
-RUN cd /usr/src/go/src && ./make.bash --no-clean 2>&1
-
-RUN mkdir -p /go/src
-WORKDIR /go
-
-ENV GOPACKAGE github.com/BotBotMe/botbot-bot
-# Copy the local package files to the container's workspace.
-ADD . /go/src/$GOPACKAGE
-
-# Build the $GOPACKAGE command inside the container.
-# (You may fetch or manage dependencies here,
-# either manually or with a tool like "godep".)
-RUN go get $GOPACKAGE
-
-ENTRYPOINT /go/bin/botbot-bot -logtostderr=true
+CMD go run main.go -logtostderr=true

botbot.go → botbot/botbot.go

@@ -1,4 +1,4 @@
-package main
+package botbot
 
 import (
 	"strconv"
@@ -52,7 +52,7 @@ func NewBotBot(storage common.Storage, queue common.Queue) *BotBot {
 }
 
 // Listen for incoming commands
-func (bot *BotBot) listen(queueName string) {
+func (bot *BotBot) Listen(queueName string) {
 
 	var msg []byte
 	var err error
@@ -71,7 +71,7 @@ func (bot *BotBot) listen(queueName string) {
 	}
 }
 
-func (bot *BotBot) mainLoop() {
+func (bot *BotBot) MainLoop() {
 	// TODO (yml) comment out bot.recordUserCounts because I think it is
 	// leaking postgres connection.
 	//go bot.recordUserCounts()
@@ -169,6 +169,6 @@ func (bot *BotBot) recordUserCounts() {
 }
 
 // Stop
-func (bot *BotBot) shutdown() {
+func (bot *BotBot) Shutdown() {
 	bot.netMan.Shutdown()
 }

common/queue.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"fmt"
 	"net"
 	"net/url"
 	"os"
@@ -109,7 +110,17 @@ type RedisQueue struct {
 func NewRedisQueue() Queue {
 	redisUrlString := os.Getenv("REDIS_PLUGIN_QUEUE_URL")
 	if redisUrlString == "" {
-		glog.Fatal("REDIS_PLUGIN_QUEUE_URL cannot be empty.\nexport REDIS_PLUGIN_QUEUE_URL=redis://host:port/db_number")
+
+		// try to connect via docker links if they exist.
+		if os.Getenv("REDIS_PORT_6379_TCP_ADDR") != "" {
+			redisUrlString = fmt.Sprintf("redis://%s:%s/0",
+				os.Getenv("REDIS_PORT_6379_TCP_ADDR"),
+				os.Getenv("REDIS_PORT_6379_TCP_PORT"),
+			)
+		} else {
+			glog.Fatal("REDIS_PLUGIN_QUEUE_URL cannot be empty.\nexport REDIS_PLUGIN_QUEUE_URL=redis://host:port/db_number")
+
+		}
 	}
 	redisUrl, err := url.Parse(redisUrlString)
 	if err != nil {

common/storage.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"database/sql"
+	"fmt"
 	"os"
 	"time"
 
@@ -56,11 +57,25 @@ type PostgresStorage struct {
 // Connect to the database.
 func NewPostgresStorage() *PostgresStorage {
 	postgresUrlString := os.Getenv("STORAGE_URL")
+
 	if glog.V(2) {
 		glog.Infoln("postgresUrlString: ", postgresUrlString)
 	}
 	if postgresUrlString == "" {
-		glog.Fatal("STORAGE_URL cannot be empty.\nexport STORAGE_URL=postgres://user:password@host:port/db_name")
+
+		// Try to make the connection string from docker links
+		if os.Getenv("DB_ENV_POSTGRES_USER") != "" {
+			glog.Infoln("STORAGE_URL not in the environment. Try to create from docker links.")
+
+			postgresUrlString = fmt.Sprintf("postgres://%s:%s@%s:%s/botbot",
+				os.Getenv("DB_ENV_POSTGRES_USER"),
+				os.Getenv("DB_ENV_POSTGRES_PASSWORD"),
+				os.Getenv("DB_PORT_5432_TCP_ADDR"),
+				os.Getenv("DB_PORT_5432_TCP_PORT"),
+			)
+		} else {
+			glog.Fatal("STORAGE_URL cannot be empty.\nexport STORAGE_URL=postgres://user:password@host:port/db_name")
+		}
 	}
 	dataSource, err := pq.ParseURL(postgresUrlString)
 	if err != nil {

docker-compose.yaml

@@ -0,0 +1,23 @@
+bot:
+  build: .
+  links:
+    - redis
+    - db
+  volumes:
+    - ./:/go/src/github.com/BotBotMe/botbot-bot/
+
+redis:
+  image: redis:latest
+  ports:
+    - 6379
+
+db:
+  image: postgres:9.5
+  ports:
+    - "5432:5432"
+  volumes:
+      - ./init-db:/docker-entrypoint-initdb.d/
+      - ./sql:/pg-tmp/
+  environment:
+    POSTGRES_PASSWORD: docker
+    POSTGRES_USER: postgres

init-db/init-db.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
+    CREATE DATABASE botbot;
+    GRANT ALL PRIVILEGES ON DATABASE botbot TO postgres;
+EOSQL
+
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" botbot -c 'CREATE EXTENSION hstore;'
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" botbot < /pg-tmp/schema.sql

main.go

@@ -9,10 +9,10 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/BotBotMe/botbot-bot/botbot"
 	"github.com/BotBotMe/botbot-bot/common"
 	"github.com/golang/glog"
 	_ "net/http/pprof"
-
 )
 
 const (
@@ -29,13 +29,13 @@ func main() {
 
 	queue := common.NewRedisQueue()
 
-	botbot := NewBotBot(storage, queue)
+	bot := botbot.NewBotBot(storage, queue)
 
 	// Listen for incoming commands
-	go botbot.listen(LISTEN_QUEUE_PREFIX)
+	go bot.Listen(LISTEN_QUEUE_PREFIX)
 
 	// Start the main loop
-	go botbot.mainLoop()
+	go bot.MainLoop()
 
 	// Start and http server to serve the stats from expvar
 	log.Fatal(http.ListenAndServe(":3030", nil))
@@ -48,7 +48,7 @@ func main() {
 	for {
 		<-kill
 		glog.Infoln("Graceful shutdown")
-		botbot.shutdown()
+		bot.Shutdown()
 		break
 	}
 

main_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/BotBotMe/botbot-bot/botbot"
 	"github.com/BotBotMe/botbot-bot/common"
 	"github.com/golang/glog"
 )
@@ -41,9 +42,9 @@ func TestBotBotIRC(t *testing.T) {
 
 	// Run BotBot
 	time.Sleep(time.Second) // Sleep of one second to avoid the 5s backoff
-	botbot := NewBotBot(storage, queue)
-	go botbot.listen("testcmds")
-	go botbot.mainLoop()
+	bot := botbot.NewBotBot(storage, queue)
+	go bot.Listen("testcmds")
+	go bot.MainLoop()
 	waitForServer(server, 4)
 
 	// this sleep allow us to keep the answer in the right order
@@ -84,7 +85,7 @@ func TestBotBotIRC(t *testing.T) {
 
 	// test shutdown - should probably be separate test
 
-	botbot.shutdown()
+	bot.Shutdown()
 
 	tries = 0
 	val := 5

scripts/test.sh

@@ -0,0 +1 @@
+docker-compose run bot go test -v ./...

sql/schema.sql

@@ -7,7 +7,8 @@ CREATE TABLE "bots_chatbot" (
     "server_password" varchar(100),
     "nick" varchar(64) NOT NULL,
     "password" varchar(100),
-    "real_name" varchar(250) NOT NULL
+    "real_name" varchar(250) NOT NULL,
+    "server_identifier" varchar(164)
 )
 ;
 CREATE TABLE "bots_channel" (
@@ -18,7 +19,9 @@ CREATE TABLE "bots_channel" (
     "password" varchar(250),
     "is_public" boolean NOT NULL,
     "is_active" boolean NOT NULL,
-    "is_featured" boolean NOT NULL
+    "is_featured" boolean NOT NULL,
+    "fingerprint" varchar(36),
+    "status" varchar(20)
 )
 ;
 CREATE TABLE "bots_usercount" (