epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-20 23:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #267 from frappe/master

Browse source 
chore: sync master and develop
This commit is contained in:
Revant Nandgaonkar 2020-06-17 13:32:49 +05:30 committed by GitHub
commit 4b0fa201bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -8,3 +8,5 @@ sites
development development
!development/README.md !development/README.md
deploy_key
deploy_key.pub

2
.travis.yml
View file

@ -6,6 +6,8 @@ services:
- docker - docker
before_install: before_install:
- openssl aes-256-cbc -K $encrypted_189e52c2c347_key -iv $encrypted_189e52c2c347_iv
-in deploy_key.enc -out deploy_key -d
- if [[ "$BUILD" != "development" ]]; then - if [[ "$BUILD" != "development" ]]; then
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
sudo apt-get update && sudo apt-get -y install git; sudo apt-get update && sudo apt-get -y install git;

BIN
deploy_key.enc Normal file
View file

Binary file not shown.