Skip to content

Allow to use custom configuration files #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aarranz merged 2 commits into from
Nov 19, 2018
Merged

Allow to use custom configuration files #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c77cdf
Test the image works using a read-only config file
aarranz Nov 19, 2018
4114299
Fix docker-entrypoint.sh when using a read-only config file
aarranz Nov 19, 2018
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
62 changes: 62 additions & 0 deletions 1.2/docker-compose-config-file.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
version: "3"

services:

nginx:
restart: always
image: nginx:latest
ports:
- 80:80
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
- ./wirecloud-static:/var/www/static:ro
depends_on:
- wirecloud


postgres:
restart: always
image: postgres:latest
environment:
- POSTGRES_PASSWORD=wirepass # Change this password!
volumes:
- ./postgres-data:/var/lib/postgresql/data


elasticsearch:
restart: always
image: elasticsearch:2.4
volumes:
- ./elasticsearch-data:/usr/share/elasticsearch/data
command: elasticsearch -Des.index.max_result_window=50000


memcached:
restart: always
image: memcached:1
command: memcached -m 2048m


wirecloud:
restart: always
image: fiware/wirecloud:1.2
depends_on:
- postgres
- elasticsearch
- memcached
environment:
- DEBUG=False
# - DEFAULT_THEME=wirecloud.defaulttheme
- DB_HOST=postgres
- DB_PASSWORD=wirepass # Change this password!
- FORWARDED_ALLOW_IPS=*
- ELASTICSEARCH2_URL=http://elasticsearch:9200/
- MEMCACHED_LOCATION=memcached:11211
# Uncomment the following environment variables to enable IDM integration
#- FIWARE_IDM_SERVER=${FIWARE_IDM_SERVER}
#- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY}
#- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET}
volumes:
- ./wirecloud-data:/opt/wirecloud_instance/data
- ./wirecloud-static:/var/www/static
- ./settings.py:/opt/wirecloud_instance/wirecloud_instance/settings.py:ro
2 changes: 1 addition & 1 deletion 1.2/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

# allow the container to be started with `--user`
if [ "$(id -u)" = '0' ]; then
chown -R wirecloud .
chown -R wirecloud data
chown -R wirecloud /var/www/static
fi

Expand Down
63 changes: 59 additions & 4 deletions 1.2/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,30 @@
import requests
import sh

POLL_FREQUENCY = 0.5 # How long to sleep inbetween calls to the method


class TimeoutException(Exception):
"""
Thrown when a command does not complete in enough time.
"""
pass


def wait_until_running(timeout=120):
end_time = time.time() + timeout
while True:
try:
response = requests.get("http://localhost/api/version")
if response.status_code != 502:
return
except requests.exceptions.ConnectionError:
pass
time.sleep(POLL_FREQUENCY)
if time.time() > end_time:
break
raise TimeoutException()


class WireCloudTests(object):

Expand Down Expand Up @@ -48,11 +72,12 @@ class StandaloneTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing standalone test case")
print("#\n")
sh.docker_compose("-f", "docker-compose-standalone.yml", "up", d=True, remove_orphans=True, _fg=True)
time.sleep(30)
wait_until_running()
print()

@classmethod
Expand All @@ -71,11 +96,12 @@ class SimpleTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing simple test case")
print("#\n")
sh.docker_compose("-f", "docker-compose-simple.yml", "up", d=True, remove_orphans=True, _fg=True)
time.sleep(30)
wait_until_running()
print()

@classmethod
Expand All @@ -94,11 +120,39 @@ class ComposedTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing composed test case")
print("#\n")
sh.docker_compose.up(d=True, remove_orphans=True, _fg=True)
time.sleep(30)
wait_until_running()
print()

@classmethod
def tearDownClass(cls):
print()
print("#")
print("# Removing containers and volumes")
print("#\n")
sh.docker_compose.down(remove_orphans=True, v=True, _fg=True)
shutil.rmtree('wirecloud-data')
shutil.rmtree('wirecloud-static')
shutil.rmtree('elasticsearch-data')
shutil.rmtree('postgres-data')
print()


class ReadOnlyConfigTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing read-only config test case")
print("#\n")

sh.docker_compose("-f", "docker-compose-config-file.yml", "up", d=True, remove_orphans=True, _fg=True)
wait_until_running()
print()

@classmethod
Expand All @@ -119,6 +173,7 @@ class IDMTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing idm test case")
print("#\n")
Expand All @@ -129,7 +184,7 @@ def setUpClass(cls):
env["SOCIAL_AUTH_FIWARE_KEY"] = "wirecloud_test_client_id"
env["SOCIAL_AUTH_FIWARE_SECRET"] = "notused"
sh.docker_compose("-f", "docker-compose-idm.yml", "up", d=True, remove_orphans=True, _env=env, _fg=True)
time.sleep(45)
wait_until_running()
print()

@classmethod
Expand Down
62 changes: 62 additions & 0 deletions dev/docker-compose-config-file.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
version: "3"

services:

nginx:
restart: always
image: nginx:latest
ports:
- 80:80
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
- ./wirecloud-static:/var/www/static:ro
depends_on:
- wirecloud


postgres:
restart: always
image: postgres:latest
environment:
- POSTGRES_PASSWORD=wirepass # Change this password!
volumes:
- ./postgres-data:/var/lib/postgresql/data


elasticsearch:
restart: always
image: elasticsearch:2.4
volumes:
- ./elasticsearch-data:/usr/share/elasticsearch/data
command: elasticsearch -Des.index.max_result_window=50000


memcached:
restart: always
image: memcached:1
command: memcached -m 2048m


wirecloud:
restart: always
image: fiware/wirecloud:dev
depends_on:
- postgres
- elasticsearch
- memcached
environment:
- DEBUG=False
# - DEFAULT_THEME=wirecloud.defaulttheme
- DB_HOST=postgres
- DB_PASSWORD=wirepass # Change this password!
- FORWARDED_ALLOW_IPS=*
- ELASTICSEARCH2_URL=http://elasticsearch:9200/
- MEMCACHED_LOCATION=memcached:11211
# Uncomment the following environment variables to enable IDM integration
#- FIWARE_IDM_SERVER=${FIWARE_IDM_SERVER}
#- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY}
#- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET}
volumes:
- ./wirecloud-data:/opt/wirecloud_instance/data
- ./wirecloud-static:/var/www/static
- ./settings.py:/opt/wirecloud_instance/wirecloud_instance/settings.py:ro
2 changes: 1 addition & 1 deletion dev/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

# allow the container to be started with `--user`
if [ "$(id -u)" = '0' ]; then
chown -R wirecloud .
chown -R wirecloud data
chown -R wirecloud /var/www/static
fi

Expand Down
63 changes: 59 additions & 4 deletions dev/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,30 @@
import requests
import sh

POLL_FREQUENCY = 0.5 # How long to sleep inbetween calls to the method


class TimeoutException(Exception):
"""
Thrown when a command does not complete in enough time.
"""
pass


def wait_until_running(timeout=120):
end_time = time.time() + timeout
while True:
try:
response = requests.get("http://localhost/api/version")
if response.status_code != 502:
return
except requests.exceptions.ConnectionError:
pass
time.sleep(POLL_FREQUENCY)
if time.time() > end_time:
break
raise TimeoutException()


class WireCloudTests(object):

Expand Down Expand Up @@ -48,11 +72,12 @@ class StandaloneTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing standalone test case")
print("#\n")
sh.docker_compose("-f", "docker-compose-standalone.yml", "up", d=True, remove_orphans=True, _fg=True)
time.sleep(40)
wait_until_running()
print()

@classmethod
Expand All @@ -71,11 +96,12 @@ class SimpleTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing simple test case")
print("#\n")
sh.docker_compose("-f", "docker-compose-simple.yml", "up", d=True, remove_orphans=True, _fg=True)
time.sleep(40)
wait_until_running()
print()

@classmethod
Expand All @@ -94,11 +120,39 @@ class ComposedTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing composed test case")
print("#\n")
sh.docker_compose.up(d=True, remove_orphans=True, _fg=True)
time.sleep(40)
wait_until_running()
print()

@classmethod
def tearDownClass(cls):
print()
print("#")
print("# Removing containers and volumes")
print("#\n")
sh.docker_compose.down(remove_orphans=True, v=True, _fg=True)
shutil.rmtree('wirecloud-data')
shutil.rmtree('wirecloud-static')
shutil.rmtree('elasticsearch-data')
shutil.rmtree('postgres-data')
print()


class ReadOnlyConfigTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing read-only config test case")
print("#\n")

sh.docker_compose("-f", "docker-compose-config-file.yml", "up", d=True, remove_orphans=True, _fg=True)
wait_until_running()
print()

@classmethod
Expand All @@ -119,6 +173,7 @@ class IDMTests(unittest.TestCase, WireCloudTests):

@classmethod
def setUpClass(cls):
print("\n################################################################################\n")
print("#")
print("# Initializing idm test case")
print("#\n")
Expand All @@ -129,7 +184,7 @@ def setUpClass(cls):
env["SOCIAL_AUTH_FIWARE_KEY"] = "wirecloud_test_client_id"
env["SOCIAL_AUTH_FIWARE_SECRET"] = "notused"
sh.docker_compose("-f", "docker-compose-idm.yml", "up", d=True, remove_orphans=True, _env=env, _fg=True)
time.sleep(45)
wait_until_running()
print()

@classmethod
Expand Down