diff --git a/Dockerfile b/Dockerfile index 8fbac41..b1da243 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ WORKDIR $DATA RUN ln -svf /bin/bash /bin/sh # Install taiga-back -RUN git clone -b stable https://github.com/taigaio/taiga-back.git taiga-back \ +RUN git clone -b 3.1.0 https://github.com/taigaio/taiga-back.git taiga-back \ && source /usr/share/virtualenvwrapper/virtualenvwrapper.sh \ && mkvirtualenv -p /usr/bin/python3.5 venvtaiga \ && workon venvtaiga \ @@ -42,7 +42,7 @@ RUN git clone -b stable https://github.com/taigaio/taiga-back.git taiga-back \ && deactivate # Install taiga-front (compiled) -RUN git clone -b stable https://github.com/taigaio/taiga-front-dist.git taiga-front-dist +RUN git clone -b 3.1.0-stable https://github.com/taigaio/taiga-front-dist.git taiga-front-dist COPY robots.txt taiga-front-dist/dist/robots.txt USER root diff --git a/Makefile b/Makefile index 14e9b2b..8c78bf5 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,14 @@ NS ?= andrey01 NAME ?= taiga -VERSION ?= 0.1 +VERSION ?= 3.1.0 default: build build: - docker build --pull -t $(NS)/$(NAME):$(VERSION) -t $(NS)/$(NAME):latest -f Dockerfile . + docker build --pull -t $(NS)/$(NAME):$(VERSION) -f Dockerfile . publish: docker push $(NS)/$(NAME):$(VERSION) - docker push $(NS)/$(NAME):latest check: docker run --rm -i $(NS)/$(NAME):$(VERSION) sh -c "set -x; exit 0" @@ -18,4 +17,4 @@ console: docker run --rm -ti --entrypoint sh $(NS)/$(NAME):$(VERSION) clean: - docker rmi $(NS)/$(NAME):$(VERSION) $(NS)/$(NAME):latest + docker rmi $(NS)/$(NAME):$(VERSION)