From 877c60c53e4f677b3adf7d3c2f1db3c34d84d4a5 Mon Sep 17 00:00:00 2001 From: Felipe Cavalcanti Date: Tue, 22 Aug 2017 18:05:06 -0300 Subject: [PATCH] update dockerfile, bump version --- .Dockerignore | 1 + Dockerfile | 15 ++++++++------- Makefile | 2 +- helm/charts/maestro/Chart.yaml | 2 +- metadata/version.go | 2 +- migrations/migrations.go | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 .Dockerignore diff --git a/.Dockerignore b/.Dockerignore new file mode 100644 index 000000000..ba077a403 --- /dev/null +++ b/.Dockerignore @@ -0,0 +1 @@ +bin diff --git a/Dockerfile b/Dockerfile index 8f96451db..9c08437cc 100644 --- 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 index 84e5021e7..095545ef4 100644 --- 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 index 2b9e20bda..d73538964 100644 --- 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 index e3694a74f..d2e05e4ab 100644 --- 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 index b3eb733d7..36151d675 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -84,7 +84,7 @@ func migrations0001CreateschedulertableSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/0001-CreateSchedulerTable.sql", size: 716, mode: os.FileMode(420), modTime: time.Unix(1495042893, 0)} + info := bindataFileInfo{name: "migrations/0001-CreateSchedulerTable.sql", size: 716, mode: os.FileMode(420), modTime: time.Unix(1494349030, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -104,7 +104,7 @@ func migrations0002CreateusertableSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/0002-CreateUserTable.sql", size: 658, mode: os.FileMode(420), modTime: time.Unix(1496674916, 0)} + info := bindataFileInfo{name: "migrations/0002-CreateUserTable.sql", size: 658, mode: os.FileMode(420), modTime: time.Unix(1497548667, 0)} a := &asset{bytes: bytes, info: info} return a, nil }