docker deployment

Author: Swierczewski Michal

Dockerfile

@@ -33,8 +33,8 @@ FROM alpine:${ALPINE_VERSION}
 ARG VERSION
 ARG APPNAME
 
-ENV SERVICE_ADDR="8080"
-ENV DNS_NAME="localhost"
+ENV SERVICE_ADDR "8080"
+ENV DNS_NAME "localhost"
 
 COPY --from=builder /tmp/dummy/${APPNAME}-${VERSION} /usr/bin/${APPNAME}
 

Makefile

@@ -11,6 +11,8 @@ LAST_COMMIT_USER ?= $(shell git log -1 --format='%cn <%ce>')
 LAST_COMMIT_HASH ?= $(shell git log -1 --format=%H)
 LAST_COMMIT_TIME ?= $(shell git log -1 --format=%cd --date=format:'%Y-%m-%d %H:%M:%S')
 
+REDIS_HOST ?= localhost
+REDIS_PORT ?= 6379
 SERVICE_ADDR ?= 8080
 DNS_NAME ?= localhost
 
@@ -26,6 +28,8 @@ test:
 
 go-run: 		## Run redis client - no binary
 	$(info -run - no binary-)
+	REDIS_HOST=$(REDIS_HOST) \
+	REDIS_PORT=$(REDIS_PORT) \
 	SERVICE_ADDR=$(SERVICE_ADDR) \
 	DNS_NAME=$(DNS_NAME) \
 	go run .	
@@ -65,6 +69,8 @@ docker-run:		## Once docker image is ready run with default parameters
 	$(info -run docker-)
 	docker run -d --rm \
 	--name $(APPNAME) \
+	-e REDIS_HOST=$(REDIS_HOST) \
+	-e REDIS_PORT=$(REDIS_PORT) \
 	-p $(SERVICE_ADDR):$(SERVICE_ADDR) \
 	$(DOCKER_REPO)/$(APPNAME):latest
 

README.md

@@ -6,10 +6,15 @@
 $ docker run --rm -d --name redis -p 6379:6379 redis
 
 
-# CLIENT
+# RUN
 
 $ make go-run
 
+OR
+
+$ REDIS_HOST=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' redis)
+$ REDIS_HOST=$REDIS_HOST make docker-run
+
 
 # POST
 

apis/apis.go

@@ -27,21 +27,21 @@ func SetRedis(logger *log.Logger, client *redis.Client) func(w http.ResponseWrit
 		var user User
 		err := json.NewDecoder(r.Body).Decode(&user)
 		if err != nil {
-			logger.Printf("Error: %v", err)
+			logger.Printf("Error SET decode: %v", err)
 			w.WriteHeader(http.StatusBadRequest)
 		}
 
 		json, err := json.Marshal(User{Name: user.Name, Age: user.Age})
 		if err != nil {
-			logger.Printf("Error: %v", err)
+			logger.Printf("Error SET marshal: %v", err)
 			w.WriteHeader(http.StatusBadRequest)
 		}
 
 		kids := fmt.Sprintf("id%d", kid)
 		err = client.Set(kids, json, 0).Err()
 		if err != nil {
 			logger.Printf("Error SET: %v", err)
-			w.WriteHeader(http.StatusInternalServerError)
+			w.WriteHeader(http.StatusBadRequest)
 		} else {
 			logger.Printf("New entry added with id (key): %s", kids)
 			kid++
@@ -58,7 +58,7 @@ func GetRedis(logger *log.Logger, client *redis.Client) func(w http.ResponseWrit
 		val, err := client.Get(kids).Result()
 		if err != nil {
 			logger.Printf("Error GET: %v", err)
-			w.WriteHeader(http.StatusInternalServerError)
+			w.WriteHeader(http.StatusBadRequest)
 		}
 		w.Write([]byte(val))
 	}

redclient.go renamed to main.go

@@ -22,13 +22,13 @@ func main() {
 	fmt.Println("Go Redis Client")
 	logger := log.New(os.Stdout, "redisClient ", log.LstdFlags|log.Lshortfile)
 
-	Rhost := "localhost"
-	Rport := "6379"
+	RedisHost := os.Getenv("REDIS_HOST")
+	RedisPort := os.Getenv("REDIS_PORT")
 	ServiceAddr := os.Getenv("SERVICE_ADDR")
 	APIPath := "/red"
 
 	// redis client
-	client := rclient.NewClient(Rhost, Rport)
+	client := rclient.NewClient(RedisHost, RedisPort)
 
 	r := mux.NewRouter()
 	prefix := r.PathPrefix(APIPath).Subrouter()