From d1a2e3f46bfad5848544fd4aea5c2bb297ab8f5f Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Thu, 7 Jan 2016 10:21:52 +0100 Subject: [PATCH] Improve the Dockerfile and the versioning. When building from sources within the git environement, the version number is ok, but it was wrong when building in the docker image. Fix the version number to 3.3.0.50 to show that we're talking about a development snapshot that is leading to version 3.3.1. Yeah, 4 parts version numbers. That happens, apparently. --- Dockerfile | 7 ++++--- Makefile | 2 +- src/params.lisp | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 80a7541..fd58868 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,10 @@ RUN apt-get install -y wget curl make git bzip2 time libzip-dev libssl1.0.0 open RUN apt-get install -y patch unzip libsqlite3-dev gawk freetds-dev sbcl ADD ./ /opt/src/pgloader +WORKDIR /opt/src/pgloader -# we have build in the .dockerignore file, but we actually need it now -RUN mkdir -p /opt/src/pgloader/build/bin -RUN make PWD=/opt/src/pgloader -C /opt/src/pgloader +# build/ is in the .dockerignore file, but we actually need it now +RUN mkdir -p build/bin +RUN make RUN cp /opt/src/pgloader/build/bin/pgloader /usr/local/bin diff --git a/Makefile b/Makefile index d2c831a..d2eb57c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # pgloader build tool APP_NAME = pgloader -VERSION = 3.2.1.preview +VERSION = 3.3.0.50 # development version for 3.3.0 # use either sbcl or ccl CL = sbcl diff --git a/src/params.lisp b/src/params.lisp index efcd491..caaae99 100644 --- a/src/params.lisp +++ b/src/params.lisp @@ -31,8 +31,8 @@ (defparameter *release* nil "non-nil when this build is a release build.") -(defparameter *major-version* "3.2") -(defparameter *minor-version* "1") +(defparameter *major-version* "3.3") +(defparameter *minor-version* "0.50") (defun git-hash () "Return the current abbreviated git hash of the development tree."