update dockerfile, bump version

topfreegames · Aug 22, 2017 · 877c60c · 877c60c
1 parent f8e5039
commit 877c60c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/.Dockerignore b/.Dockerignore
@@ -0,0 +1 @@
+bin
diff --git a/Dockerfile b/Dockerfile
@@ -31,14 +31,15 @@ RUN go get -u github.com/jteeuwen/go-bindata/...
 
 ADD . /go/src/github.com/topfreegames/maestro
 RUN cd /go/src/github.com/topfreegames/maestro && \
+  make build && \
   make plugins-linux && \
-  mv bin/grpc.so /app/bin/grpc.so
-COPY ./bin/maestro-linux-amd64 /app/maestro
-COPY ./config/local.yaml /app/config/local.yaml
-COPY ./Makefile /app/Makefile
-COPY ./scripts/drop.sql /app/scripts/drop.sql
-COPY ./migrations /app/migrations
-
+  mv bin/maestro /app/maestro && \
+  mv bin/grpc.so /app/bin/grpc.so && \
+  mv config /app/config && \
+  mv scripts /app/scripts && \
+  mv migrations /app/migrations && \
+  mv Makefile /app/Makefile
+  
 WORKDIR /app
 RUN make assets
 

diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ setup-ci:
 build:
 	@mkdir -p bin && go build -o ./bin/maestro main.go
 
-build-docker: cross-build-linux-amd64
+build-docker:
 	@docker build -t maestro .
 
 cross-build-linux-amd64:

diff --git a/helm/charts/maestro/Chart.yaml b/helm/charts/maestro/Chart.yaml
@@ -1,7 +1,7 @@
 name: maestro
 home: https://github.com/topfreegames/maestro
 description: Maestro api and worker
-version: 3.4.3
+version: 3.4.4
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com
diff --git a/metadata/version.go b/metadata/version.go
@@ -8,7 +8,7 @@
 package metadata
 
 //Version of Maestro
-var Version = "3.4.3"
+var Version = "3.4.4"
 
 //KubeVersion is the desired Kubernetes version
 var KubeVersion = "v1.7.0"
diff --git a/migrations/migrations.go b/migrations/migrations.go