use 3.1.0 stable

This commit is contained in:
Andy 2017-12-13 01:31:31 +01:00
parent f15f3d77b9
commit 399e605ce4
Signed by: arno
GPG Key ID: 368DDA2E9A471EAC
2 changed files with 5 additions and 6 deletions

View File

@ -32,7 +32,7 @@ WORKDIR $DATA
RUN ln -svf /bin/bash /bin/sh RUN ln -svf /bin/bash /bin/sh
# Install taiga-back # 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 \ && source /usr/share/virtualenvwrapper/virtualenvwrapper.sh \
&& mkvirtualenv -p /usr/bin/python3.5 venvtaiga \ && mkvirtualenv -p /usr/bin/python3.5 venvtaiga \
&& workon venvtaiga \ && workon venvtaiga \
@ -42,7 +42,7 @@ RUN git clone -b stable https://github.com/taigaio/taiga-back.git taiga-back \
&& deactivate && deactivate
# Install taiga-front (compiled) # 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 COPY robots.txt taiga-front-dist/dist/robots.txt
USER root USER root

View File

@ -1,15 +1,14 @@
NS ?= andrey01 NS ?= andrey01
NAME ?= taiga NAME ?= taiga
VERSION ?= 0.1 VERSION ?= 3.1.0
default: build default: build
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: publish:
docker push $(NS)/$(NAME):$(VERSION) docker push $(NS)/$(NAME):$(VERSION)
docker push $(NS)/$(NAME):latest
check: check:
docker run --rm -i $(NS)/$(NAME):$(VERSION) sh -c "set -x; exit 0" 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) docker run --rm -ti --entrypoint sh $(NS)/$(NAME):$(VERSION)
clean: clean:
docker rmi $(NS)/$(NAME):$(VERSION) $(NS)/$(NAME):latest docker rmi $(NS)/$(NAME):$(VERSION)