Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e5fc413
Update .squash.yml
wisedrette May 8, 2019
118664a
Delete test1
wisedrette May 8, 2019
d62a46f
minor app update to test
wisedrette May 8, 2019
8a980ed
added workdir
wisedrette May 8, 2019
5056771
updated dockerfile
wisedrette May 8, 2019
f06867c
trigger auto deployment
wisedrette May 16, 2019
78ea5d5
Update .squash.yml
wisedrette May 30, 2019
16d3c10
trigger deployment check
wisedrette Jun 11, 2019
8d7d770
Merge branch 'auto-deploy' of github.com:wisedrette/docker-test into …
wisedrette Jun 11, 2019
06ef32f
trigger deployment check
wisedrette Jun 11, 2019
d397ba3
Update .squash.yml
wisedrette Jun 14, 2019
279ec7f
Update .squash.yml
wisedrette Jun 14, 2019
f2794f3
Update .squash.yml
wisedrette Jun 20, 2019
bf2a100
Update .squash.yml
wisedrette Jun 20, 2019
d30418c
Update .squash.yml
wisedrette Jun 25, 2019
27d9b0f
Update .squash.yml
wisedrette Jun 26, 2019
191ef22
Update .squash.yml
wisedrette Jun 26, 2019
56b2412
Update .squash.yml
wisedrette Jun 26, 2019
ed52be3
Update .squash.yml
wisedrette Jun 26, 2019
8902de7
Update .squash.yml
wisedrette Jun 26, 2019
385259c
added basic selenium test
wisedrette Jun 27, 2019
093473b
Merge branch 'auto-deploy' of github.com:wisedrette/docker-test into …
wisedrette Jun 27, 2019
69ae340
Update .squash.yml
wisedrette Jun 27, 2019
9101942
Update Dockerfile
wisedrette Jun 27, 2019
3a4fd2c
Update .squash.yml
wisedrette Jun 27, 2019
1060fe0
Update selenium_test.py
wisedrette Jun 27, 2019
202132b
Update selenium_test.py
wisedrette Jun 27, 2019
8dfb701
Update selenium_test.py
wisedrette Jun 27, 2019
51cae68
Update .squash.yml
wisedrette Oct 2, 2019
95b3719
Update .squash.yml
wisedrette Oct 2, 2019
65ecd9f
Update .squash.yml
wisedrette Oct 2, 2019
f05d06f
Update .squash.yml
wisedrette Oct 2, 2019
96e3e6e
Update .squash.yml
wisedrette Oct 2, 2019
98dcaa1
Update .squash.yml
wisedrette Oct 3, 2019
b78d9cc
Update .squash.yml
wisedrette Oct 3, 2019
f6246cf
Update .squash.yml
wisedrette Oct 3, 2019
a6db967
Update .squash.yml
wisedrette Dec 23, 2019
5829da4
Update .squash.yml
wisedrette Dec 23, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 25 additions & 89 deletions .squash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,104 +2,40 @@ deployments:
default:
vm_size: 1G
vm_storage_gb: 10G
environment:
TEST_VAL=42
ready_wait: 120
backend_wait: 20
copy_files: /abcd ~/code
check_root_url: true
auto_deploy_on_commits: true
squash_pr_comments: true
subdomain_port_mapping:
- test:81
- test--test:81
- another-test:8000
- and--another-test:8000
deployment_page_commands:
list something:
- ls -la ./
- sleep 40 && echo branch id is $SQUASH_BRANCH_WITH_ID
echo awesome:
- echo awesome
echo target:
stuff-service:
- echo awesome
/PI:
squash_pr_comments: true
pipelines:
- default:
scripts:
- echo true
- sleep 30 && ls -la
branch:
vm_size: 1
vm_storage_gb: 130
deployment_type: kubernetes
environment:
TEST_VAL=42
ready_wait:
120
filename:
./stuff/Dockerfile
dockerfileonly: true
run_options: --env TEST_VAL2=${SQUASH_BRANCH_WITH_ID} --restart always
context_path: ./stuff
subdomains:
Awesome Name:
- awesomedomain,/?que=99764QQ
Awesomness x2:
- subd,/abc
Awesomness x3:
- plain
deployment_page_commands:
list something:
- ls -la ./
- sleep 40 && echo branch id is $SQUASH_BRANCH_WITH_ID
branchA:
vm_size: 6
environment:
TEST_VAL=4242
ready_wait:
120
filename:
./stuff/DockerfileA
dockerfileonly: true
run_options: --env TEST_VAL2=43
context_path: ./stuff
post_launch:
- target: 'stuff-service'
command: exec
docker: true
options: -it {target} bash -c 'echo TEST_VAL2 is $TEST_VAL2'
- target: 'stuff-service'
command: exec
docker: true
options: -it {target} bash -c 'echo TEST_VAL is $TEST_VAL'
branchB:
vm_size: 8GB
environment:
TEST_VAL=424242
ready_wait:
120
filename:
./stuff/DockerfileB
vm_storage_gb: 13
ready_wait: 120
filename: ./stuff/Dockerfile
dockerfileonly: true
run_options: --env TEST_VAL2=${SQUASH_DOMAIN}
context_path: ./stuff
post_launch:
- target: 'stuff-service'
command: exec
docker: true
options: -it {target} bash -c 'echo TEST_VAL2 is $TEST_VAL2'
- target: 'stuff-service'
command: exec
docker: true
options: -it {target} bash -c 'echo TEST_VAL is $TEST_VAL'
dockerQ:
ready_wait: 10
filename:
./stuff/DockerfileQ
context_path: ./stuff
branchCompose:
filename:
./docker-compose.yml
pipelines:
- default:
scripts:
- echo true
- secondary:
scripts:
- sleep 30 && ls -la
nodocker:
dockerimage:
r.cfcr.io/wisedrette/wisedrette/dockertest:master
docker_registry:
server: r.cfcr.io
username: wisedrette
password: $REGISTRY_PASSWORD
pipelines:
- default:
scripts:
- echo true
- secondary:
scripts:
- sleep 30 && ls -la

1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ services:
ports:
- 80:80
environment:
- TEST_VAL
- SQUASH_BRANCH_WITH_ID
- SQUASH_DOMAIN
- SQUASH_MASTER_DEPLOYMENT
Expand Down
4 changes: 3 additions & 1 deletion stuff/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM python:3.6.1-onbuild
FROM joyzoursky/python-chromedriver:3.6-selenium

COPY . /usr/src/app
WORKDIR /usr/src/app
RUN pip install -r requirements.txt
CMD ["bash", "run_server.sh"]
4 changes: 0 additions & 4 deletions stuff/DockerfileA

This file was deleted.

4 changes: 0 additions & 4 deletions stuff/DockerfileB

This file was deleted.

29 changes: 0 additions & 29 deletions stuff/DockerfileQ

This file was deleted.

1 change: 1 addition & 0 deletions stuff/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
flask
selenium==3.13.0
20 changes: 20 additions & 0 deletions stuff/selenium_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env python3.6
import os
import sys
from selenium import webdriver
from selenium.webdriver.common.keys import Keys
from selenium.common.exceptions import NoSuchElementException

chrome_options = webdriver.ChromeOptions()
chrome_options.add_argument('--no-sandbox')
chrome_options.add_argument('--window-size=1420,1080')
chrome_options.add_argument('--headless')
chrome_options.add_argument('--disable-gpu')
driver = webdriver.Chrome(chrome_options=chrome_options)
driver.get('https://{}'.format(os.environ.get('SQUASH_DOMAIN', '')))
try:
driver.find_element_by_tag_name('body')
driver.close()
sys.exit(0)
except NoSuchElementException:
sys.exit(1)
2 changes: 1 addition & 1 deletion stuff/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def run_job():
@app.route('/')
def index():
logging.warning(request.referrer)
return '<body>Hello world. <a href="/about/">About this page</a>.</body>'
return '<body>Hello new world. <a href="/about/">About this page</a>.</body>'


@app.route('/about/')
Expand Down
31 changes: 0 additions & 31 deletions stuff/serverA.py

This file was deleted.

31 changes: 0 additions & 31 deletions stuff/serverB.py

This file was deleted.

1 change: 0 additions & 1 deletion test1

This file was deleted.