1
0
mirror of https://github.com/ru-de/faq.git synced 2024-11-09 20:21:01 +00:00

fix docker-compose local

This commit is contained in:
Evgeniy Sokolov 2018-08-08 16:35:21 +02:00
parent 6da1b22184
commit d08c98ae7d
3 changed files with 10 additions and 10 deletions

View File

@ -2,7 +2,6 @@ language: go
sudo: required sudo: required
dist: trusty dist: trusty
group: deprecated-2017Q4
git: git:
depth: 3 depth: 3

View File

@ -1,9 +1,10 @@
# check https://docs.travis-ci.com/user/common-build-problems/#Running-a-Container-Based-Docker-Image-Locally # check https://docs.travis-ci.com/user/common-build-problems/#troubleshooting-locally-in-a-docker-image
FROM travisci/ci-garnet:packer-1512502276-986baf0 FROM travisci/ci-garnet:packer-1512502276-986baf0
MAINTAINER Evgenii Sokolov <e.sokolov@sevensenders.com> MAINTAINER Evgenii Sokolov <e.sokolov@sevensenders.com>
USER travis
ENV GOPATH "/home/travis/gopath" ENV GOPATH "/home/travis/gopath"
ENV GOROOT "/home/travis/.gimme/versions/go1.7.4.linux.amd64" ENV GOROOT "/home/travis/.gimme/versions/go1.7.4.linux.amd64"
ENV PATH "$GOPATH/bin:$GOROOT/bin:$PATH" ENV PATH "$GOPATH/bin:$GOROOT/bin:$PATH"
COPY check-install.sh /tmp COPY . $GOPATH/src/github.com/ru-de/faq/files
RUN bash /tmp/check-install.sh RUN cd $GOPATH/src/github.com/ru-de/faq && sudo env PATH=$PATH GOPATH=$GOPATH bash files/check-install.sh

View File

@ -29,6 +29,12 @@ for dic in $dicList
cat /usr/share/hunspell/$dic.aff | iconv --from ISO8859-1 --to UTF-8 | sed 's/SET ISO8859-1/SET UTF-8/' > /usr/share/hunspell/$dic-utf8.aff cat /usr/share/hunspell/$dic.aff | iconv --from ISO8859-1 --to UTF-8 | sed 's/SET ISO8859-1/SET UTF-8/' > /usr/share/hunspell/$dic-utf8.aff
done done
(cat $DIR/dictionary.dic; echo) | sed '/^$/d' | wc -l > /tmp/dictionary.dic
(cat $DIR/dictionary.dic; echo) | sed '/^$/d' >> /tmp/dictionary.dic
echo "SET UTF-8" >> /tmp/dictionary.aff
mv /tmp/dictionary.* /usr/share/hunspell
go get ./... go get ./...
go get -u github.com/ewgRa/ci-utils/cmd/diff_liner go get -u github.com/ewgRa/ci-utils/cmd/diff_liner
go get -u github.com/ewgRa/ci-utils/cmd/hunspell_parser go get -u github.com/ewgRa/ci-utils/cmd/hunspell_parser
@ -37,9 +43,3 @@ go get -u github.com/ewgRa/ci-utils/cmd/github_comments_send
go build -o /tmp/check_spell $DIR/go/check_spell/main.go go build -o /tmp/check_spell $DIR/go/check_spell/main.go
go build -o /tmp/check_links $DIR/go/check_links/main.go go build -o /tmp/check_links $DIR/go/check_links/main.go
(cat $DIR/dictionary.dic; echo) | sed '/^$/d' | wc -l > /tmp/dictionary.dic
(cat $DIR/dictionary.dic; echo) | sed '/^$/d' >> /tmp/dictionary.dic
echo "SET UTF-8" >> /tmp/dictionary.aff
sudo mv /tmp/dictionary.* /usr/share/hunspell