mirrors/pgloader
1
0
Fork 0
mirror of https://github.com/dimitri/pgloader.git synced 2026-05-04 10:31:02 +02:00
Code Issues Projects Releases Wiki Activity

Improve the Dockerfile and the versioning.

Browse Source 
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.
This commit is contained in:
Dimitri Fontaine 2016-01-07 10:21:52 +01:00
parent ee2a68f924
commit d1a2e3f46b
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -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

2
Makefile
View File

@ -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

4
src/params.lisp
View File

@ -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."