From d3cd922c3d7b2d85a09f31f2b5a590f3759e4139 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 6 Feb 2017 23:02:21 +0100 Subject: [PATCH 1/8] Improve serverspec wrapper --- tests/serverspec/serverspec.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/serverspec/serverspec.sh b/tests/serverspec/serverspec.sh index d9fd3e54d..c3b01ac12 100644 --- a/tests/serverspec/serverspec.sh +++ b/tests/serverspec/serverspec.sh @@ -18,4 +18,34 @@ if [[ ! -f "${DOCKERFILE}" ]]; then fi fi +# Check if DOCKER_IMAGE is set, needed for test +if [[ -z "$DOCKER_IMAGE" ]]; then + echo "Environment variable 'DOCKER_IMAGE' not set" + exit 1 +fi + +# Check if DOCKER_TAG is set, needed for test +if [[ -z "$DOCKER_TAG" ]]; then + echo "Environment variable 'DOCKER_TAG' not set" + exit 1 +fi + +# Check if OS_FAMILY is set, needed for test +if [[ -z "$OS_FAMILY" ]]; then + echo "Environment variable 'OS_FAMILY' not set" + exit 1 +fi + +# Check if OS_FAMILY is set, needed for test +if [[ -z "$OS_VERSION" ]]; then + echo "Environment variable 'OS_FAMILY' not set" + exit 1 +fi + +echo "Starting serverspec" +echo " OS: ${OS_FAMILY} Version ${OS_VERSION}" +echo " Docker image: ${DOCKER_IMAGE}:${DOCKER_TAG}" +echo " Dockerfile: ${DOCKERFILE}" +echo "" + exec bundle exec rspec "$@" From 26cae5e65068d0c1f10f529d7a1d95352fdedc92 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 6 Feb 2017 23:05:10 +0100 Subject: [PATCH 2/8] Update serverspec gems --- tests/serverspec/Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/serverspec/Gemfile.lock b/tests/serverspec/Gemfile.lock index b456ea773..6ae9d55bf 100644 --- a/tests/serverspec/Gemfile.lock +++ b/tests/serverspec/Gemfile.lock @@ -1,16 +1,16 @@ GEM remote: https://rubygems.org/ specs: - diff-lcs (1.2.5) - docker-api (1.33.1) + diff-lcs (1.3) + docker-api (1.33.2) excon (>= 0.38.0) json excon (0.54.0) - json (2.0.2) + json (2.0.3) multi_json (1.12.1) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.2.0) + net-ssh (4.0.1) net-telnet (0.1.1) rake (12.0.0) rspec (3.5.0) @@ -31,15 +31,15 @@ GEM rspec-retry (0.5.3) rspec-core (> 3.3, < 3.6) rspec-support (3.5.0) - serverspec (2.37.2) + serverspec (2.38.0) multi_json rspec (~> 3.0) rspec-its specinfra (~> 2.53) sfl (2.3) - specinfra (2.66.3) + specinfra (2.66.8) net-scp - net-ssh (>= 2.7, < 4.0) + net-ssh (>= 2.7, < 5.0) net-telnet sfl From 966582650622d49f3476e4cd3a680724d2e2c6a2 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 6 Feb 2017 23:10:34 +0100 Subject: [PATCH 3/8] Add dependency for testsuite Keep order in every run --- bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py | 4 ++++ bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index c2dc0528c..037134577 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -40,6 +40,10 @@ def generate_task_list(self, dockerfile_list): 'actions': [(BaseTaskLoader.task_runner, [DockerTestServerspecTaskLoader.task_run, [dockerfile, self.configuration]])], 'task_dep': [] } + + if dockerfile['dependency']: + task['task_dep'].append('DockerTestServerspec|%s' % dockerfile['dependency']) + tasklist.append(task) # task = { diff --git a/bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py b/bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py index d0f1800e7..b74835fe4 100644 --- a/bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py @@ -40,6 +40,10 @@ def generate_task_list(self, dockerfile_list): 'actions': [(BaseTaskLoader.task_runner, [DockerTestTestinfraTaskLoader.task_run, [dockerfile, self.configuration]])], 'task_dep': [] } + + if dockerfile['dependency']: + task['task_dep'].append('DockerTestTestinfra|%s' % dockerfile['dependency']) + tasklist.append(task) # task = { From e10296d048e66ea83a31862c5448fff15c17b9e0 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 6 Feb 2017 23:10:51 +0100 Subject: [PATCH 4/8] Fix styleguide issues --- bin/webdevops/taskloader/DockerBuildTaskLoader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/webdevops/taskloader/DockerBuildTaskLoader.py b/bin/webdevops/taskloader/DockerBuildTaskLoader.py index 97eb6dffc..3ef95a450 100644 --- a/bin/webdevops/taskloader/DockerBuildTaskLoader.py +++ b/bin/webdevops/taskloader/DockerBuildTaskLoader.py @@ -39,7 +39,7 @@ def generate_task_list(self, dockerfileList): } if dockerfile['dependency']: - task['task_dep'].append('DockerBuild|%s' % dockerfile['dependency']); + task['task_dep'].append('DockerBuild|%s' % dockerfile['dependency']) tasklist.append(task) From 1759c7d4c72b4308c43261f5755f22e651109d78 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Tue, 7 Feb 2017 00:06:18 +0100 Subject: [PATCH 5/8] Cleanup spec_helper --- tests/serverspec/spec/spec_helper.rb | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tests/serverspec/spec/spec_helper.rb b/tests/serverspec/spec/spec_helper.rb index 2110ab12b..ffa8fc105 100644 --- a/tests/serverspec/spec/spec_helper.rb +++ b/tests/serverspec/spec/spec_helper.rb @@ -6,19 +6,10 @@ Dir[base_spec_dir.join('shared/**/*.rb')].sort.each{ |f| require f } Dir[base_spec_dir.join('collection/**.rb')].sort.each{ |f| require f } -if not ENV['DOCKERFILE'] - raise 'Environment variable "OCKERFILE" not set' -end - -if not File.exist?(ENV['DOCKERFILE']) - raise 'Dockerfile \"' + ENV['DOCKERFILE'] + '\" not found' -end - set :backend, :docker set :docker_container, ENV['DOCKER_IMAGE'] set :os, :family => ENV['OS_FAMILY'], :version => ENV['OS_VERSION'], :arch => 'x86_64' - Excon.defaults[:write_timeout] = 1000 Excon.defaults[:read_timeout] = 1000 @@ -83,16 +74,3 @@ $testConfiguration[:phpBlackfire] = true $testConfiguration[:phpXdebug] = false end - -def wait_retry(time, increment = 1, elapsed_time = 0, &block) - begin - yield - rescue Exception => e - if elapsed_time >= time - raise e - else - sleep increment - wait_retry(time, increment, elapsed_time + increment, &block) - end - end -end From c46c05fde4a0bc0f0fc72a57db782127873b8c36 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Tue, 7 Feb 2017 00:28:11 +0100 Subject: [PATCH 6/8] Possible fix for environment variable issues --- bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index 037134577..d0a45127a 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -162,12 +162,12 @@ def generate_serverspec_environment(path, dockerfile, configuration, is_toolimag # add default vars default_env_list = configuration.get('dockerTest.environment.default', False) if default_env_list: - ret = default_env_list.to_dict() + ret = default_env_list.to_dict().copy() # add docker image specific vars image_env_list = configuration.get('dockerTest.environment.image') if image_env_list: - image_env_list = image_env_list.to_dict() + image_env_list = image_env_list.to_dict().copy() for term in image_env_list: if term in dockerfile['image']['fullname']: for key in image_env_list[term]: From 8f51707300806c75df3c6aa27fe979f8c1bfa086 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 12 Feb 2017 01:16:59 +0100 Subject: [PATCH 7/8] Serverspec fixes (#165) * Fix parallel execution environment * Add more verbose messages for spec init/run * Reduce python cpu usage for wait loop * Set threads to auto for test target --- Makefile | 2 +- bin/webdevops/Command.py | 21 +++-- bin/webdevops/command/DoitCommand.py | 2 +- .../DockerTestServerspecTaskLoader.py | 38 ++++----- conf/console.yml | 3 +- tests/serverspec/Rakefile | 45 ++++++++--- tests/serverspec/serverspec.sh | 56 +++---------- tests/serverspec/spec/docker/ansible_spec.rb | 5 +- .../serverspec/spec/docker/apache-dev_spec.rb | 5 +- tests/serverspec/spec/docker/apache_spec.rb | 5 +- tests/serverspec/spec/docker/base-app_spec.rb | 5 +- tests/serverspec/spec/docker/base_spec.rb | 5 +- .../serverspec/spec/docker/bootstrap_spec.rb | 5 +- tests/serverspec/spec/docker/certbot_spec.rb | 5 +- .../spec/docker/hhvm-apache_spec.rb | 5 +- .../serverspec/spec/docker/hhvm-nginx_spec.rb | 5 +- tests/serverspec/spec/docker/hhvm_spec.rb | 5 +- .../serverspec/spec/docker/liquibase_spec.rb | 5 +- .../spec/docker/mail-sandbox_spec.rb | 7 +- .../serverspec/spec/docker/nginx-dev_spec.rb | 6 +- tests/serverspec/spec/docker/nginx_spec.rb | 6 +- .../spec/docker/php-apache-dev_spec.rb | 5 +- .../serverspec/spec/docker/php-apache_spec.rb | 6 +- tests/serverspec/spec/docker/php-dev_spec.rb | 5 +- .../spec/docker/php-nginx-dev_spec.rb | 5 +- .../serverspec/spec/docker/php-nginx_spec.rb | 5 +- tests/serverspec/spec/docker/php_spec.rb | 5 +- tests/serverspec/spec/docker/postfix_spec.rb | 5 +- .../spec/docker/samson-deployment_spec.rb | 5 +- tests/serverspec/spec/docker/sphinx_spec.rb | 5 +- tests/serverspec/spec/docker/ssh_spec.rb | 5 +- tests/serverspec/spec/docker/varnish_spec.rb | 5 +- tests/serverspec/spec/docker/vsftp_spec.rb | 5 +- tests/serverspec/spec/image.rb | 10 --- tests/serverspec/spec/spec_autoload.rb | 4 + tests/serverspec/spec/spec_config.rb | 81 +++++++++++++++++++ tests/serverspec/spec/spec_helper.rb | 79 +----------------- tests/serverspec/spec/spec_init.rb | 14 ++++ 38 files changed, 237 insertions(+), 253 deletions(-) delete mode 100644 tests/serverspec/spec/image.rb create mode 100644 tests/serverspec/spec/spec_autoload.rb create mode 100644 tests/serverspec/spec/spec_config.rb create mode 100644 tests/serverspec/spec/spec_init.rb diff --git a/Makefile b/Makefile index df22fda9a..962f2ef84 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ requirements: cd tests/serverspec && bundle install --path=vendor test: - python bin/console test:serverspec --threads=auto/2 -v + python bin/console test:serverspec --threads=auto -v baselayout: python bin/console generate:provision --baselayout diff --git a/bin/webdevops/Command.py b/bin/webdevops/Command.py index 3b179aefd..c7979e8d3 100644 --- a/bin/webdevops/Command.py +++ b/bin/webdevops/Command.py @@ -18,7 +18,7 @@ # OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import os, subprocess, tempfile +import os, subprocess, tempfile, copy, time def execute(cmd, cwd=False, env=None): """ @@ -27,9 +27,20 @@ def execute(cmd, cwd=False, env=None): print 'Execute: %s' % ' '.join(cmd) - # remove _ from env (prevent errors) - if env is not None and '_' in env: - del env['_'] + if env is not None: + env = copy.deepcopy(env) + env['PWD'] = os.environ['PWD'] + env['LC_CTYPE'] = os.environ['LC_CTYPE'] + env['SHELL'] = os.environ['SHELL'] + + if '_' in env: + del env['_'] + + # add system env vars + system_env_vars = ['PWD', 'PATH', 'LC_CTYPE', 'SHELL', 'DOCKER_HOST', 'DOCKER_CERT_PATH', 'DOCKER_MACHINE_NAME', 'DOCKER_TLS_VERIFY'] + for var_name in system_env_vars: + if not var_name in env and var_name in os.environ: + env[var_name] = os.environ[var_name] # set current working directory path_current = os.getcwd() @@ -51,7 +62,7 @@ def execute(cmd, cwd=False, env=None): # wait for process end while proc.poll() is None: - pass + time.sleep(1) # output stdout with open(file_stdout.name, 'r') as f: diff --git a/bin/webdevops/command/DoitCommand.py b/bin/webdevops/command/DoitCommand.py index a805bfb95..c7d1dc3ed 100644 --- a/bin/webdevops/command/DoitCommand.py +++ b/bin/webdevops/command/DoitCommand.py @@ -28,7 +28,7 @@ def run_doit(self, task_loader, configuration): extra_configuration = {} if 'threads' in configuration and configuration.get('threads') > 1: - arguments.extend(['-n', str(configuration.get('threads'))]) + arguments.extend(['-n', str(configuration.get('threads')), '--parallel-type', 'process']) if 'doitConfig' in configuration: extra_configuration = configuration.get('doitConfig') diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index d0a45127a..eacac8c02 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -18,7 +18,7 @@ # OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import os, re, tempfile, json +import os, re, tempfile, json, base64 from webdevops import Command from .BaseDockerTaskLoader import BaseDockerTaskLoader from .BaseTaskLoader import BaseTaskLoader @@ -75,18 +75,18 @@ def task_run(dockerfile, configuration, task): tmp_suffix = '.%s_%s_%s.tmp' % (dockerfile['image']['repository'], dockerfile['image']['imageName'], dockerfile['image']['tag']) test_dockerfile = tempfile.NamedTemporaryFile(prefix='Dockerfile.', suffix=tmp_suffix, dir=configuration.get('serverspecPath'), bufsize=0, delete=False) - # serverspec options - serverspec_opts = [] - serverspec_opts.extend(['--pattern', spec_path]) - - # serverspec env - serverspec_env = DockerTestServerspecTaskLoader.generate_serverspec_environment( + # serverspec conf + serverspec_conf = DockerTestServerspecTaskLoader.generate_serverspec_configuration( path=os.path.basename(test_dockerfile.name), dockerfile=dockerfile, configuration=configuration, is_toolimage=is_toolimage ) + # serverspec options + serverspec_opts = [] + serverspec_opts.extend([spec_path, dockerfile['image']['fullname'], base64.b64encode(json.dumps(serverspec_conf)), os.path.basename(test_dockerfile.name)]) + # dockerfile content dockerfile_content = DockerTestServerspecTaskLoader.generate_dockerfile( dockerfile=dockerfile, @@ -103,15 +103,13 @@ def task_run(dockerfile, configuration, task): print ' path: %s' % (spec_path) print ' args: %s' % (' '.join(serverspec_opts)) print '' - print 'environment:' - print '------------' - print json.dumps(serverspec_env, indent=4, sort_keys=True) + print 'spec configuration:' + print '-------------------' + print json.dumps(serverspec_conf, indent=4, sort_keys=True) print '' print 'Dockerfile:' print '-----------' print dockerfile_content - - os.remove(test_dockerfile.name) return True # check if we have any tests @@ -123,10 +121,6 @@ def task_run(dockerfile, configuration, task): cmd = ['bash', 'serverspec.sh'] cmd.extend(serverspec_opts) - # Set environment variables - env = os.environ.copy() - env.update(serverspec_env) - # create Dockerfile with open(test_dockerfile.name, mode='w', buffering=0) as f: f.write(dockerfile_content) @@ -137,7 +131,7 @@ def task_run(dockerfile, configuration, task): test_status = False for retry_count in range(0, configuration.get('retry')): try: - test_status = Command.execute(cmd, cwd=configuration.get('serverspecPath'), env=env) + test_status = Command.execute(cmd, cwd=configuration.get('serverspecPath')) except Exception as e: print e pass @@ -149,23 +143,22 @@ def task_run(dockerfile, configuration, task): else: print ' failed, giving up' - os.remove(test_dockerfile.name) return test_status @staticmethod - def generate_serverspec_environment(path, dockerfile, configuration, is_toolimage=False): + def generate_serverspec_configuration(path, dockerfile, configuration, is_toolimage=False): """ - Generate serverspec environment dict + Generate serverspec configuration dict """ ret = {} # add default vars - default_env_list = configuration.get('dockerTest.environment.default', False) + default_env_list = configuration.get('dockerTest.configuration.default', False) if default_env_list: ret = default_env_list.to_dict().copy() # add docker image specific vars - image_env_list = configuration.get('dockerTest.environment.image') + image_env_list = configuration.get('dockerTest.configuration.image') if image_env_list: image_env_list = image_env_list.to_dict().copy() for term in image_env_list: @@ -191,6 +184,7 @@ def generate_dockerfile(dockerfile, configuration, is_toolimage=False): ret.append('FROM %s' % dockerfile['image']['fullname']) ret.append('COPY conf/ /') + ret.append('RUN echo "%s" > /DOCKER.IMAGENAME' % dockerfile['image']['fullname']) if is_toolimage: ret.append('RUN chmod +x /loop-entrypoint.sh') diff --git a/conf/console.yml b/conf/console.yml index ce162c082..216e32e28 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -7,6 +7,7 @@ imagePath: 'documentation/docs/resources/images/' baselayoutPath: 'baselayout' testinfraPath: 'tests/testinfra' serverspecPath: 'tests/serverspec' +testDockerfilePath: 'tests/dockerfile' blacklistFile: 'BLACKLIST' docker: @@ -35,7 +36,7 @@ dockerTest: '/varnish': - 'ENV VARNISH_BACKEND_HOST webdevops.io' - environment: + configuration: default: OS_FAMILY: 'ubuntu' OS_VERSION: '16.04' diff --git a/tests/serverspec/Rakefile b/tests/serverspec/Rakefile index 296e546f9..019d4253e 100644 --- a/tests/serverspec/Rakefile +++ b/tests/serverspec/Rakefile @@ -1,13 +1,36 @@ -require 'rake' -require 'rspec/core/rake_task' - -RSpec.configure do |config| - # show retry status in spec process - config.verbose_retry = true - # show exception that triggers a retry if verbose_retry is set to true - config.display_try_failure_messages = true -end +begin + require 'rake' + require 'json' + require 'base64' + require 'docker' + require 'rspec' + require 'serverspec' + require 'rspec/retry' + require 'rspec/core/rake_task' + + RSpec::Core::RakeTask.new(:spec, :pattern, :dockerImageName, :configuration) do |t, task_args| + t.pattern = task_args[:pattern] + t.fail_on_error = true + + # hide command + t.verbose = false + + $specConfiguration = JSON.parse(Base64.decode64(task_args[:configuration])) + + $dockerImage = Docker::Image.build_from_dir('.', { 'dockerfile' => $specConfiguration['DOCKERFILE'] }) + $specConfiguration['DOCKERIMAGE_ID'] = $dockerImage.id + + print "\n" + print "Environment configuration\n" + print "-------------------------\n" + $specConfiguration.each do |key, value| + print " " + key + ':' + value + "\n" + ENV[key] = value + end + print "\n" + print "\n" + end -RSpec::Core::RakeTask.new(:"spec") do |t, args| - #t.pattern = 'spec/base/*_spec.rb' +rescue LoadError + # no rspec available end diff --git a/tests/serverspec/serverspec.sh b/tests/serverspec/serverspec.sh index c3b01ac12..9a6cd6518 100644 --- a/tests/serverspec/serverspec.sh +++ b/tests/serverspec/serverspec.sh @@ -1,51 +1,19 @@ #!/usr/bin/env bash -# Check if DOCKERFILE is set, needed for test -if [[ -z "$DOCKERFILE" ]]; then - echo "Environment variable 'DOCKERFILE' not set" - exit 1 -fi +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value -# Check if dockerfile exists -if [[ ! -f "${DOCKERFILE}" ]]; then - # Filesystem is maybe not synced? - sync +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - # recheck if file is now available - if [[ ! -f "${DOCKERFILE}" ]]; then - echo "Dockerfile $DOCKERFILE' not found" - exit 1 - fi -fi +PARAM_SPEC_FILE="$1" +PARAM_DOCKER_IMAGE="$2" +PARAM_SPEC_CONF="$3" -# Check if DOCKER_IMAGE is set, needed for test -if [[ -z "$DOCKER_IMAGE" ]]; then - echo "Environment variable 'DOCKER_IMAGE' not set" - exit 1 -fi +# LOGFILE="${PARAM_DOCKER_IMAGE//:/_}" +# LOGFILE="${PARAM_DOCKER_IMAGE//\//_}" +# LOGFILE="${SCRIPT_DIR}/logs/${LOGFILE}.log" -# Check if DOCKER_TAG is set, needed for test -if [[ -z "$DOCKER_TAG" ]]; then - echo "Environment variable 'DOCKER_TAG' not set" - exit 1 -fi +exec bundle exec rake spec["$PARAM_SPEC_FILE","$PARAM_DOCKER_IMAGE","$PARAM_SPEC_CONF"] -# Check if OS_FAMILY is set, needed for test -if [[ -z "$OS_FAMILY" ]]; then - echo "Environment variable 'OS_FAMILY' not set" - exit 1 -fi - -# Check if OS_FAMILY is set, needed for test -if [[ -z "$OS_VERSION" ]]; then - echo "Environment variable 'OS_FAMILY' not set" - exit 1 -fi - -echo "Starting serverspec" -echo " OS: ${OS_FAMILY} Version ${OS_VERSION}" -echo " Docker image: ${DOCKER_IMAGE}:${DOCKER_TAG}" -echo " Dockerfile: ${DOCKERFILE}" -echo "" - -exec bundle exec rspec "$@" diff --git a/tests/serverspec/spec/docker/ansible_spec.rb b/tests/serverspec/spec/docker/ansible_spec.rb index 380e528d2..fcf450086 100644 --- a/tests/serverspec/spec/docker/ansible_spec.rb +++ b/tests/serverspec/spec/docker/ansible_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/apache-dev_spec.rb b/tests/serverspec/spec/docker/apache-dev_spec.rb index 704ba62c4..4d839f035 100644 --- a/tests/serverspec/spec/docker/apache-dev_spec.rb +++ b/tests/serverspec/spec/docker/apache-dev_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/apache_spec.rb b/tests/serverspec/spec/docker/apache_spec.rb index 704ba62c4..4d839f035 100644 --- a/tests/serverspec/spec/docker/apache_spec.rb +++ b/tests/serverspec/spec/docker/apache_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/base-app_spec.rb b/tests/serverspec/spec/docker/base-app_spec.rb index 80d086a46..9871aa576 100644 --- a/tests/serverspec/spec/docker/base-app_spec.rb +++ b/tests/serverspec/spec/docker/base-app_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/base_spec.rb b/tests/serverspec/spec/docker/base_spec.rb index 053be94ce..43f41f759 100644 --- a/tests/serverspec/spec/docker/base_spec.rb +++ b/tests/serverspec/spec/docker/base_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/bootstrap_spec.rb b/tests/serverspec/spec/docker/bootstrap_spec.rb index 380e528d2..fcf450086 100644 --- a/tests/serverspec/spec/docker/bootstrap_spec.rb +++ b/tests/serverspec/spec/docker/bootstrap_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/certbot_spec.rb b/tests/serverspec/spec/docker/certbot_spec.rb index d4dae3595..e4c5b0180 100644 --- a/tests/serverspec/spec/docker/certbot_spec.rb +++ b/tests/serverspec/spec/docker/certbot_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/hhvm-apache_spec.rb b/tests/serverspec/spec/docker/hhvm-apache_spec.rb index fbe867530..1a817e502 100644 --- a/tests/serverspec/spec/docker/hhvm-apache_spec.rb +++ b/tests/serverspec/spec/docker/hhvm-apache_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/hhvm-nginx_spec.rb b/tests/serverspec/spec/docker/hhvm-nginx_spec.rb index b26cc05da..3d270c747 100644 --- a/tests/serverspec/spec/docker/hhvm-nginx_spec.rb +++ b/tests/serverspec/spec/docker/hhvm-nginx_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/hhvm_spec.rb b/tests/serverspec/spec/docker/hhvm_spec.rb index a864a9b4a..32b586f20 100644 --- a/tests/serverspec/spec/docker/hhvm_spec.rb +++ b/tests/serverspec/spec/docker/hhvm_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/liquibase_spec.rb b/tests/serverspec/spec/docker/liquibase_spec.rb index 16a456449..ff3605893 100644 --- a/tests/serverspec/spec/docker/liquibase_spec.rb +++ b/tests/serverspec/spec/docker/liquibase_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::liquibase' diff --git a/tests/serverspec/spec/docker/mail-sandbox_spec.rb b/tests/serverspec/spec/docker/mail-sandbox_spec.rb index 9ef495544..a6371519c 100644 --- a/tests/serverspec/spec/docker/mail-sandbox_spec.rb +++ b/tests/serverspec/spec/docker/mail-sandbox_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' @@ -13,6 +12,4 @@ include_examples 'collection::postfix' include_examples 'collection::dovecot' - - end diff --git a/tests/serverspec/spec/docker/nginx-dev_spec.rb b/tests/serverspec/spec/docker/nginx-dev_spec.rb index 59a795608..e9ed14206 100644 --- a/tests/serverspec/spec/docker/nginx-dev_spec.rb +++ b/tests/serverspec/spec/docker/nginx-dev_spec.rb @@ -1,16 +1,14 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' include_examples 'collection::base' include_examples 'collection::nginx' - end diff --git a/tests/serverspec/spec/docker/nginx_spec.rb b/tests/serverspec/spec/docker/nginx_spec.rb index 59a795608..e9ed14206 100644 --- a/tests/serverspec/spec/docker/nginx_spec.rb +++ b/tests/serverspec/spec/docker/nginx_spec.rb @@ -1,16 +1,14 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' include_examples 'collection::base' include_examples 'collection::nginx' - end diff --git a/tests/serverspec/spec/docker/php-apache-dev_spec.rb b/tests/serverspec/spec/docker/php-apache-dev_spec.rb index 79116c148..c0e363246 100644 --- a/tests/serverspec/spec/docker/php-apache-dev_spec.rb +++ b/tests/serverspec/spec/docker/php-apache-dev_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/php-apache_spec.rb b/tests/serverspec/spec/docker/php-apache_spec.rb index fc27e7fff..246a1deec 100644 --- a/tests/serverspec/spec/docker/php-apache_spec.rb +++ b/tests/serverspec/spec/docker/php-apache_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' @@ -29,4 +28,5 @@ else include_examples 'collection::php-fpm7::webserver-test::production' end + end diff --git a/tests/serverspec/spec/docker/php-dev_spec.rb b/tests/serverspec/spec/docker/php-dev_spec.rb index c18f86b5e..70cd1111e 100644 --- a/tests/serverspec/spec/docker/php-dev_spec.rb +++ b/tests/serverspec/spec/docker/php-dev_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/php-nginx-dev_spec.rb b/tests/serverspec/spec/docker/php-nginx-dev_spec.rb index dfb49c29d..22eca235e 100644 --- a/tests/serverspec/spec/docker/php-nginx-dev_spec.rb +++ b/tests/serverspec/spec/docker/php-nginx-dev_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/php-nginx_spec.rb b/tests/serverspec/spec/docker/php-nginx_spec.rb index 294446e39..0e90ebd7c 100644 --- a/tests/serverspec/spec/docker/php-nginx_spec.rb +++ b/tests/serverspec/spec/docker/php-nginx_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/php_spec.rb b/tests/serverspec/spec/docker/php_spec.rb index 098c60867..1cf32ab50 100644 --- a/tests/serverspec/spec/docker/php_spec.rb +++ b/tests/serverspec/spec/docker/php_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/postfix_spec.rb b/tests/serverspec/spec/docker/postfix_spec.rb index 3bdcbd6da..e2cdfd21b 100644 --- a/tests/serverspec/spec/docker/postfix_spec.rb +++ b/tests/serverspec/spec/docker/postfix_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/samson-deployment_spec.rb b/tests/serverspec/spec/docker/samson-deployment_spec.rb index 6d685d622..943ece68d 100644 --- a/tests/serverspec/spec/docker/samson-deployment_spec.rb +++ b/tests/serverspec/spec/docker/samson-deployment_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'bootstrap::layout' diff --git a/tests/serverspec/spec/docker/sphinx_spec.rb b/tests/serverspec/spec/docker/sphinx_spec.rb index 3dad0e053..175762f02 100644 --- a/tests/serverspec/spec/docker/sphinx_spec.rb +++ b/tests/serverspec/spec/docker/sphinx_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/ssh_spec.rb b/tests/serverspec/spec/docker/ssh_spec.rb index cee534c74..aa8277d81 100644 --- a/tests/serverspec/spec/docker/ssh_spec.rb +++ b/tests/serverspec/spec/docker/ssh_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/varnish_spec.rb b/tests/serverspec/spec/docker/varnish_spec.rb index 9e6eeb4d9..a502b279b 100644 --- a/tests/serverspec/spec/docker/varnish_spec.rb +++ b/tests/serverspec/spec/docker/varnish_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/docker/vsftp_spec.rb b/tests/serverspec/spec/docker/vsftp_spec.rb index 49b443ad9..b874d69ef 100644 --- a/tests/serverspec/spec/docker/vsftp_spec.rb +++ b/tests/serverspec/spec/docker/vsftp_spec.rb @@ -1,11 +1,10 @@ require 'serverspec' require 'docker' -require 'spec_helper' +require 'spec_init' describe "Dockerfile" do before(:all) do - @image = Docker::Image.build_from_dir('.', { 'dockerfile' => ENV['DOCKERFILE'] }) - set :docker_image, @image.id + set :docker_image, ENV['DOCKERIMAGE_ID'] end #include_examples 'collection::bootstrap' diff --git a/tests/serverspec/spec/image.rb b/tests/serverspec/spec/image.rb deleted file mode 100644 index 9124841f0..000000000 --- a/tests/serverspec/spec/image.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'serverspec' -require 'docker' - -set :backend, :exec -set :docker_container, ENV['DOCKER_IMAGE'] - -describe docker_image(ENV['DOCKER_IMAGE']) do - its(:inspection) { should_not include 'Architecture' => 'i386' } - its(:inspection) { should include 'Architecture' => 'amd64' } -end diff --git a/tests/serverspec/spec/spec_autoload.rb b/tests/serverspec/spec/spec_autoload.rb new file mode 100644 index 000000000..5f74823bf --- /dev/null +++ b/tests/serverspec/spec/spec_autoload.rb @@ -0,0 +1,4 @@ +base_spec_dir = Pathname.new(File.join(File.dirname(__FILE__))) + +Dir[base_spec_dir.join('shared/**/*.rb')].sort.each{ |f| require f } +Dir[base_spec_dir.join('collection/**.rb')].sort.each{ |f| require f } diff --git a/tests/serverspec/spec/spec_config.rb b/tests/serverspec/spec/spec_config.rb new file mode 100644 index 000000000..fbeec5655 --- /dev/null +++ b/tests/serverspec/spec/spec_config.rb @@ -0,0 +1,81 @@ +# ----------------------------------------------- +# RSpec/Serverspec configuration +# ----------------------------------------------- + +RSpec.configure do |config| + config.fail_fast = 3 + + # show retry status in spec process + config.verbose_retry = true + + # show exception that triggers a retry if verbose_retry is set to true + config.display_try_failure_messages = true +end + +set :backend, :docker +set :docker_container, ENV['DOCKER_IMAGE'] +set :os, :family => ENV['OS_FAMILY'], :version => ENV['OS_VERSION'], :arch => 'x86_64' + +Excon.defaults[:write_timeout] = 1000 +Excon.defaults[:read_timeout] = 1000 + +# ----------------------------------------------- +# General spec configuration +# ----------------------------------------------- + +$packageVersions = {} +$packageVersions[:ansible] = %r!ansible 2.([0-9]\.?)+! +$packageVersions[:ansiblePlaybook] = %r!ansible-playbook 2.([0-9]\.?)+! + +$testConfiguration = {} + +if ['redhat', 'alpine'].include?(os[:family]) + $testConfiguration[:ansiblePath] = "/usr/bin" +else + $testConfiguration[:ansiblePath] = "/usr/local/bin" +end + +$testConfiguration[:php] = 7 +$testConfiguration[:phpXdebug] = true +$testConfiguration[:phpApcu] = true +$testConfiguration[:phpRedis] = true +$testConfiguration[:phpMhash] = true +$testConfiguration[:phpBlackfire] = false + +if ((os[:family] == 'ubuntu' and os[:version] == '12.04') or + (os[:family] == 'ubuntu' and os[:version] == '14.04') or + (os[:family] == 'ubuntu' and os[:version] == '15.04') or + (os[:family] == 'ubuntu' and os[:version] == '15.10') or + (os[:family] == 'redhat' and os[:version] == '7') or + (os[:family] == 'debian' and os[:version] == '7') or + (os[:family] == 'debian' and os[:version] == '8') or + (os[:family] == 'alpine' and os[:version] == '3') or + (ENV['DOCKER_TAG'].match('php5'))) + $testConfiguration[:php] = 5 +end + +if (ENV['DOCKER_TAG'].match('php7')) + $testConfiguration[:php] = 7 +end + + +if ENV['PHP_XDEBUG'] and ENV['PHP_XDEBUG'] == "0" + $testConfiguration[:phpXdebug] = false +end + +if ENV['PHP_APCU'] and ENV['PHP_APCU'] == "0" + $testConfiguration[:phpApcu] = false +end + +if ENV['PHP_REDIS'] and ENV['PHP_REDIS'] == "0" + $testConfiguration[:phpRedis] = false +end + +if ENV['PHP_MHASH'] and ENV['PHP_MHASH'] == "0" + $testConfiguration[:phpMhash] = false +end + +if ENV['PHP_BLACKFIRE'] and ENV['PHP_BLACKFIRE'] == "1" + $testConfiguration[:phpBlackfire] = true + $testConfiguration[:phpXdebug] = false +end diff --git a/tests/serverspec/spec/spec_helper.rb b/tests/serverspec/spec/spec_helper.rb index ffa8fc105..3f6b091d0 100644 --- a/tests/serverspec/spec/spec_helper.rb +++ b/tests/serverspec/spec/spec_helper.rb @@ -1,76 +1,3 @@ -require 'serverspec' -require 'rspec/retry' - -base_spec_dir = Pathname.new(File.join(File.dirname(__FILE__))) - -Dir[base_spec_dir.join('shared/**/*.rb')].sort.each{ |f| require f } -Dir[base_spec_dir.join('collection/**.rb')].sort.each{ |f| require f } - -set :backend, :docker -set :docker_container, ENV['DOCKER_IMAGE'] -set :os, :family => ENV['OS_FAMILY'], :version => ENV['OS_VERSION'], :arch => 'x86_64' - -Excon.defaults[:write_timeout] = 1000 -Excon.defaults[:read_timeout] = 1000 - -$dockerInfo = {} -$dockerInfo[:image] = ENV['DOCKER_IMAGE'] -$dockerInfo[:tag] = ENV['DOCKER_TAG'] -$dockerInfo[:dockerfile] = ENV['DOCKERFILE'] - -$packageVersions = {} -$packageVersions[:ansible] = %r!ansible 2.([0-9]\.?)+! -$packageVersions[:ansiblePlaybook] = %r!ansible-playbook 2.([0-9]\.?)+! - -$testConfiguration = {} - -if ['redhat', 'alpine'].include?(os[:family]) - $testConfiguration[:ansiblePath] = "/usr/bin" -else - $testConfiguration[:ansiblePath] = "/usr/local/bin" -end - -$testConfiguration[:php] = 7 -$testConfiguration[:phpXdebug] = true -$testConfiguration[:phpApcu] = true -$testConfiguration[:phpRedis] = true -$testConfiguration[:phpMhash] = true -$testConfiguration[:phpBlackfire] = false - -if ((os[:family] == 'ubuntu' and os[:version] == '12.04') or - (os[:family] == 'ubuntu' and os[:version] == '14.04') or - (os[:family] == 'ubuntu' and os[:version] == '15.04') or - (os[:family] == 'ubuntu' and os[:version] == '15.10') or - (os[:family] == 'redhat' and os[:version] == '7') or - (os[:family] == 'debian' and os[:version] == '7') or - (os[:family] == 'debian' and os[:version] == '8') or - (os[:family] == 'alpine' and os[:version] == '3') or - ($dockerInfo[:tag].match('php5'))) - $testConfiguration[:php] = 5 -end - -if ($dockerInfo[:tag].match('php7')) - $testConfiguration[:php] = 7 -end - - -if ENV['PHP_XDEBUG'] and ENV['PHP_XDEBUG'] == "0" - $testConfiguration[:phpXdebug] = false -end - -if ENV['PHP_APCU'] and ENV['PHP_APCU'] == "0" - $testConfiguration[:phpApcu] = false -end - -if ENV['PHP_REDIS'] and ENV['PHP_REDIS'] == "0" - $testConfiguration[:phpRedis] = false -end - -if ENV['PHP_MHASH'] and ENV['PHP_MHASH'] == "0" - $testConfiguration[:phpMhash] = false -end - -if ENV['PHP_BLACKFIRE'] and ENV['PHP_BLACKFIRE'] == "1" - $testConfiguration[:phpBlackfire] = true - $testConfiguration[:phpXdebug] = false -end +# +# placeholder for methods and stuff +# diff --git a/tests/serverspec/spec/spec_init.rb b/tests/serverspec/spec/spec_init.rb new file mode 100644 index 000000000..d890915f2 --- /dev/null +++ b/tests/serverspec/spec/spec_init.rb @@ -0,0 +1,14 @@ +require 'serverspec' +require 'rspec/retry' +require 'spec_config' +require 'spec_autoload' +require 'spec_helper' + +print "Serverspec configuration\n" +print "------------------------\n" +print " DOCKERIMAGE_ID: " + ENV['DOCKERIMAGE_ID'] + "\n" +print " DOCKER_IMAGE: " + ENV['DOCKER_IMAGE'] + "\n" +print " OS_FAMILY: " + ENV['OS_FAMILY'] + "\n" +print " OS_VERSION: " + ENV['OS_VERSION'] + "\n" +print " OS_VERSION: " + ENV['OS_VERSION'] + "\n" +print "\n" From c6ec16a76ff3fb6d12aa55ae15790cc923c8be2f Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 12 Feb 2017 01:28:23 +0100 Subject: [PATCH 8/8] Release 1.3.5 --- CHANGELOG.md | 4 ++++ docker/ansible/alpine-3/Dockerfile | 2 +- docker/ansible/centos-7/Dockerfile | 2 +- docker/ansible/debian-7/Dockerfile | 2 +- docker/ansible/debian-8/Dockerfile | 2 +- docker/ansible/debian-9/Dockerfile | 2 +- docker/ansible/ubuntu-12.04/Dockerfile | 2 +- docker/ansible/ubuntu-14.04/Dockerfile | 2 +- docker/ansible/ubuntu-15.04/Dockerfile | 2 +- docker/ansible/ubuntu-15.10/Dockerfile | 2 +- docker/ansible/ubuntu-16.04/Dockerfile | 2 +- docker/apache-dev/alpine-3/Dockerfile | 2 +- docker/apache-dev/centos-7/Dockerfile | 2 +- docker/apache-dev/debian-7/Dockerfile | 2 +- docker/apache-dev/debian-8/Dockerfile | 2 +- docker/apache-dev/debian-9/Dockerfile | 2 +- docker/apache-dev/ubuntu-12.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-14.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-15.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-15.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-16.04/Dockerfile | 2 +- docker/apache/alpine-3/Dockerfile | 2 +- docker/apache/centos-7/Dockerfile | 2 +- docker/apache/debian-7/Dockerfile | 2 +- docker/apache/debian-8/Dockerfile | 2 +- docker/apache/debian-9/Dockerfile | 2 +- docker/apache/ubuntu-12.04/Dockerfile | 2 +- docker/apache/ubuntu-14.04/Dockerfile | 2 +- docker/apache/ubuntu-15.04/Dockerfile | 2 +- docker/apache/ubuntu-15.10/Dockerfile | 2 +- docker/apache/ubuntu-16.04/Dockerfile | 2 +- docker/base-app/alpine-3/Dockerfile | 2 +- docker/base-app/centos-7/Dockerfile | 2 +- docker/base-app/debian-7/Dockerfile | 2 +- docker/base-app/debian-8/Dockerfile | 2 +- docker/base-app/debian-9/Dockerfile | 2 +- docker/base-app/ubuntu-12.04/Dockerfile | 2 +- docker/base-app/ubuntu-14.04/Dockerfile | 2 +- docker/base-app/ubuntu-15.04/Dockerfile | 2 +- docker/base-app/ubuntu-15.10/Dockerfile | 2 +- docker/base-app/ubuntu-16.04/Dockerfile | 2 +- docker/base/alpine-3/Dockerfile | 2 +- docker/base/centos-7/Dockerfile | 2 +- docker/base/debian-7/Dockerfile | 2 +- docker/base/debian-8/Dockerfile | 2 +- docker/base/debian-9/Dockerfile | 2 +- docker/base/ubuntu-12.04/Dockerfile | 2 +- docker/base/ubuntu-14.04/Dockerfile | 2 +- docker/base/ubuntu-15.04/Dockerfile | 2 +- docker/base/ubuntu-15.10/Dockerfile | 2 +- docker/base/ubuntu-16.04/Dockerfile | 2 +- docker/bootstrap/alpine-3/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-7/Dockerfile | 2 +- docker/bootstrap/debian-8/Dockerfile | 2 +- docker/bootstrap/debian-9/Dockerfile | 2 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 2 +- docker/certbot/latest/Dockerfile | 2 +- docker/hhvm-apache/ubuntu-14.04/Dockerfile | 2 +- docker/hhvm-apache/ubuntu-16.04/Dockerfile | 2 +- docker/hhvm-nginx/ubuntu-14.04/Dockerfile | 2 +- docker/hhvm-nginx/ubuntu-16.04/Dockerfile | 2 +- docker/hhvm/ubuntu-14.04/Dockerfile | 2 +- docker/hhvm/ubuntu-16.04/Dockerfile | 2 +- docker/liquibase/latest/Dockerfile | 2 +- docker/liquibase/mysql/Dockerfile | 2 +- docker/liquibase/postgres/Dockerfile | 2 +- docker/mail-sandbox/latest/Dockerfile | 2 +- docker/nginx-dev/alpine-3/Dockerfile | 2 +- docker/nginx-dev/centos-7/Dockerfile | 2 +- docker/nginx-dev/debian-7/Dockerfile | 2 +- docker/nginx-dev/debian-8/Dockerfile | 2 +- docker/nginx-dev/debian-9/Dockerfile | 2 +- docker/nginx-dev/ubuntu-12.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-14.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-15.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-15.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-16.04/Dockerfile | 2 +- docker/nginx/alpine-3/Dockerfile | 2 +- docker/nginx/centos-7/Dockerfile | 2 +- docker/nginx/debian-7/Dockerfile | 2 +- docker/nginx/debian-8/Dockerfile | 2 +- docker/nginx/debian-9/Dockerfile | 2 +- docker/nginx/ubuntu-12.04/Dockerfile | 2 +- docker/nginx/ubuntu-14.04/Dockerfile | 2 +- docker/nginx/ubuntu-15.04/Dockerfile | 2 +- docker/nginx/ubuntu-15.10/Dockerfile | 2 +- docker/nginx/ubuntu-16.04/Dockerfile | 2 +- docker/php-apache-dev/alpine-3-php7/Dockerfile | 2 +- docker/php-apache-dev/alpine-3/Dockerfile | 2 +- docker/php-apache-dev/centos-7-php56/Dockerfile | 2 +- docker/php-apache-dev/centos-7/Dockerfile | 2 +- docker/php-apache-dev/debian-7/Dockerfile | 2 +- docker/php-apache-dev/debian-8-php7/Dockerfile | 2 +- docker/php-apache-dev/debian-8/Dockerfile | 2 +- docker/php-apache-dev/debian-9/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-12.04/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-14.04/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-15.04/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-15.10/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-16.04/Dockerfile | 2 +- docker/php-apache/alpine-3-php7/Dockerfile | 2 +- docker/php-apache/alpine-3/Dockerfile | 2 +- docker/php-apache/centos-7-php56/Dockerfile | 2 +- docker/php-apache/centos-7/Dockerfile | 2 +- docker/php-apache/debian-7/Dockerfile | 2 +- docker/php-apache/debian-8-php7/Dockerfile | 2 +- docker/php-apache/debian-8/Dockerfile | 2 +- docker/php-apache/debian-9/Dockerfile | 2 +- docker/php-apache/ubuntu-12.04/Dockerfile | 2 +- docker/php-apache/ubuntu-14.04/Dockerfile | 2 +- docker/php-apache/ubuntu-15.04/Dockerfile | 2 +- docker/php-apache/ubuntu-15.10/Dockerfile | 2 +- docker/php-apache/ubuntu-16.04/Dockerfile | 2 +- docker/php-dev/alpine-3-php7/Dockerfile | 2 +- docker/php-dev/alpine-3/Dockerfile | 2 +- docker/php-dev/centos-7-php56/Dockerfile | 2 +- docker/php-dev/centos-7/Dockerfile | 2 +- docker/php-dev/debian-7/Dockerfile | 2 +- docker/php-dev/debian-8-php7/Dockerfile | 2 +- docker/php-dev/debian-8/Dockerfile | 2 +- docker/php-dev/debian-9/Dockerfile | 2 +- docker/php-dev/ubuntu-12.04/Dockerfile | 2 +- docker/php-dev/ubuntu-14.04/Dockerfile | 2 +- docker/php-dev/ubuntu-15.04/Dockerfile | 2 +- docker/php-dev/ubuntu-15.10/Dockerfile | 2 +- docker/php-dev/ubuntu-16.04/Dockerfile | 2 +- docker/php-nginx-dev/alpine-3-php7/Dockerfile | 2 +- docker/php-nginx-dev/alpine-3/Dockerfile | 2 +- docker/php-nginx-dev/centos-7-php56/Dockerfile | 2 +- docker/php-nginx-dev/centos-7/Dockerfile | 2 +- docker/php-nginx-dev/debian-7/Dockerfile | 2 +- docker/php-nginx-dev/debian-8-php7/Dockerfile | 2 +- docker/php-nginx-dev/debian-8/Dockerfile | 2 +- docker/php-nginx-dev/debian-9/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 2 +- docker/php-nginx/alpine-3-php7/Dockerfile | 2 +- docker/php-nginx/alpine-3/Dockerfile | 2 +- docker/php-nginx/centos-7-php56/Dockerfile | 2 +- docker/php-nginx/centos-7/Dockerfile | 2 +- docker/php-nginx/debian-7/Dockerfile | 2 +- docker/php-nginx/debian-8-php7/Dockerfile | 2 +- docker/php-nginx/debian-8/Dockerfile | 2 +- docker/php-nginx/debian-9/Dockerfile | 2 +- docker/php-nginx/ubuntu-12.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-14.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-15.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-15.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-16.04/Dockerfile | 2 +- docker/php/alpine-3-php7/Dockerfile | 2 +- docker/php/alpine-3/Dockerfile | 2 +- docker/php/centos-7-php56/Dockerfile | 2 +- docker/php/centos-7/Dockerfile | 2 +- docker/php/debian-7/Dockerfile | 2 +- docker/php/debian-8-php7/Dockerfile | 2 +- docker/php/debian-8/Dockerfile | 2 +- docker/php/debian-9/Dockerfile | 2 +- docker/php/ubuntu-12.04/Dockerfile | 2 +- docker/php/ubuntu-14.04/Dockerfile | 2 +- docker/php/ubuntu-15.04/Dockerfile | 2 +- docker/php/ubuntu-15.10/Dockerfile | 2 +- docker/php/ubuntu-16.04/Dockerfile | 2 +- docker/piwik/ubuntu-14.04/Dockerfile | 2 +- docker/postfix/latest/Dockerfile | 2 +- docker/samson-deployment/latest/Dockerfile | 2 +- docker/sphinx/latest/Dockerfile | 2 +- docker/ssh/latest/Dockerfile | 2 +- docker/storage/latest/Dockerfile | 2 +- docker/typo3/ubuntu-14.04/Dockerfile | 2 +- docker/varnish/latest/Dockerfile | 2 +- docker/vsftp/latest/Dockerfile | 2 +- template/Dockerfile/docker.jinja2 | 2 +- 180 files changed, 183 insertions(+), 179 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca3148893..e14be9568 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile). +## [1.3.5] - 2017-02-12 +- Improve and fix parallel run of serverspec +- Reduced python subprocess wait loop cpu time + ## [1.3.4] - 2017-02-03 - Add serverspec wrapper (do not run tests if Dockerfile isn't set or available) diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index 5a56371f5..07fa151e0 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 83b1e5bc0..03607faa6 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 31cf85052..6decd3098 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 686e9cd10..ab97329cb 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 2dc8312ba..f847c0f35 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index fc20d063a..cb13cfef3 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 28b3eeec5..e0db9efd1 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 6e22e4122..c9defe226 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 19b16f4c7..88650c2d9 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 6a47b9f86..d90ceb6d0 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile index da9c34d21..704aecccd 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 79963343d..170f573fd 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 4701eb292..910f0c5ad 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 0d934e4de..71742aa06 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index be3d71bc3..58c9c879a 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 6bf5a8070..b1cc3f5aa 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 49109b68d..37ca15360 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 651282029..f4f6bc66a 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 1bc7a75cc..d8be829b4 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index bd25ec080..9437203bc 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index 3bdb2ac80..96441ebde 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index cdb472c2a..cbd3d87c8 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 3bb4dd0f9..71e85be51 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 5f666f23c..1757720f0 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 1f803900a..53a010695 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 29d22aa52..a28dee460 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index f33d75524..71e17befd 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 118c1fcf8..2c03a245f 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 147788346..46b0bc4f9 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index e4669f4df..e608ccd10 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 1e31e7bb0..ebe130b23 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 44b588a26..c4f55b851 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 082c12f6e..bdf694d45 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index a9714a66b..80b24b6f8 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 36c814399..a4d8ace5e 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index d2807a92f..6e7380fdc 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index b2066cd69..15c231212 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 4de46950d..8ced5a222 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 106f28079..181382d06 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 7fcc0e51d..58525e310 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV APPLICATION_USER application ENV APPLICATION_GROUP application diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 5bd352c08..c8aa55100 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 1964d8a57..c215639c9 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 40c12ca8d..a119dcca7 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 049fa33e0..9b811b7cf 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index ba020466d..5e400e815 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 90088c245..405a1640b 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 78c80168b..b575565c5 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 86e4dd2de..00c2dfe44 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 80d2090e6..eb38640b7 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index c1257c045..63f1c51de 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index aa7ea4aa6..edffc255a 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.5 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index dfdf35c1c..2d7f20188 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index a13961a55..5bb4e3a3e 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index cf56f1fd7..c77e72f3f 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 76752cc2a..03d954cba 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 711762128..3d64d7ef4 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index e83261458..d966e09c6 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 45d733040..69a5c0f42 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index be2605707..69181d66b 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index c9a5bea1c..d1c0310cd 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 7bd47714d..b0a4d7b05 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 VOLUME /etc/letsencrypt VOLUME /var/www diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index eae76ff13..a36587020 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index 71e075ae0..15f1ed59f 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index c9bcc1248..eb92072d0 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 38b7fbed8..8cc03f06f 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index bef5d44eb..afe78fd16 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index db388e12d..5119e952c 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index 23bacb5df..a4da045cc 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "com.mysql.jdbc.Driver" diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index 7b38dec9c..bd9fdfe74 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "com.mysql.jdbc.Driver" diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index 6f84b0fd9..2a74210d1 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -8,7 +8,7 @@ FROM java:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV LIQUIBASE_VERSION "3.5.3" ENV LIQUIBASE_DRIVER "org.postgresql.Driver" diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index b8e096b6a..c8be56213 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV MAILBOX_USERNAME "dev" ENV MAILBOX_PASSWORD "dev" diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile index f151a2b4e..7f3e3ad1f 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 395b112f3..669ef3dbe 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 3be13d004..5820a7294 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index 20fcfc978..7e2872411 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 0f942d075..0be8eddbe 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index c73a42bb1..ab776052d 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index ee16433cb..de80a8221 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 268764d73..690dafb82 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 194744b6b..d66655bb1 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 5027139c7..2834a3f1d 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index 9c84ed17c..7f1336f77 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 8d3d8e992..db4bbe6f2 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 02b04a8f6..05c52abfc 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 8acfa582d..d298b96fa 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index c813d4594..603b4b024 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 051144189..0e3121073 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 327f0a672..416f74bb8 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 0b5256170..f3ac3894f 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 9e9116ddf..b02a5b49c 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 0195aca0b..20041cdc6 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 43cd2754b..e111f7f2b 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 068b7154f..b059c9fc6 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index bdeecec24..623deae8a 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 5aa2805b7..2b0beb197 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 80882833b..76e2bd0e8 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index ed1558ba3..890a9d0da 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 5e2341618..f39c4c285 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 781f9caf1..cda528fea 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 136323cdf..3b2ab24db 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 259bde6ca..674fde65a 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 2d383a899..715ee8003 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index b6d7aebf5..10e6a6f77 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index bd3160ce6..97e52bd32 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index 4bbc21ba3..439122398 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index f3e3436ab..6379c0ae5 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index a384db4b1..d42aac3ba 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 329862477..6db17235e 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index b89970ca4..40f6bba10 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index ff8e30461..98f7b409f 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 5e606f20e..6722e0273 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index e69c549bb..2778da373 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 4ba873e01..fb994922e 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 751d3544b..5c38e1b77 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index dcfe9b8b3..f86cb3acc 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index a8ac43912..2f959e127 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 6ef7d30a1..4edca22ad 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 41da63d9f..961d50acc 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index cfa0579be..0505f4f96 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 8c01a7769..844c32851 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index ed41af1a3..7ca7eb71a 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 71a23a088..43cdb35e4 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index fa394a400..c3bea3be0 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 0ad58df0e..24ed7e6e0 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index d3a6e0ef2..b14bd73cb 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 2f02b46b2..ad734c5f3 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index afd2229e6..3fe1e03d1 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index fb8ff2fed..f5025d348 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 16851c862..fe61e2d19 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 8d66c9f15..5821e920e 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 7acdb0776..621f32de5 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 3aa370dd4..e76b92e6e 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 5acba6e38..bb2c01ecf 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 929d75b91..8cf2bbf7f 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 2d5c1a01e..5cb0729c0 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 342292721..f354cff91 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 0c614c14c..9ffc2a617 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index 7efd17bd2..1dca4f2f7 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 00ff88e97..5a44b9d6d 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index e649f19b2..d5031eacd 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 910397cf7..10302a1d7 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 3d954d063..0f394d3e4 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 38a2ae12c..76c0832b0 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index 3fdec6d94..8ab341560 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index c3a587df3..c58219f69 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 736f4f1da..021463c6c 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 3c1026f43..21047b731 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 2d6a70621..39f866990 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index e2dd4e15e..9cee668ec 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index f7358b237..8795d5226 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 303cc3a3c..745042967 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 14f3a7064..a053ea2ce 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 265aa82bf..f1364b07e 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index f8b7d48de..bb5fb61c7 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index ed363c609..bf9cd58d3 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 48765bf72..5084651f3 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 24ff8990c..43344a873 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index a3350609f..c404e0b33 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 59dcb3bb2..2c4fc2213 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index 666101114..609127a37 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 57857d4b2..48d89fb7b 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 166183699..c0ac25c8e 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 27f7bb707..bf478e11b 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index e599080fb..1d2bac39f 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 5ae65c263..489168a11 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index e29e1ba5d..9f649b089 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index d49d7a21f..17dc09851 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 9f0794958..132eeb487 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 12a20681c..caba13922 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index af2aa3804..f443c8203 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index ea3fe0bfa..66bd42a13 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 1dd1527da..822d5d6c9 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -8,7 +8,7 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ############################################################################### diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 067fba3b2..35e144b8a 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 374aca9b0..3d1ef77e3 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index fb0233019..34080ee58 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -8,7 +8,7 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index b488e9524..af1ef31f8 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 1e755f126..edf60b531 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index dc4a8a388..da3e6eb40 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 ENV FTP_USER application ENV FTP_PASSWORD application diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index d22832b0d..b544641f8 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -10,7 +10,7 @@ FROM {{ image }}:{{ tag }} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.3.4 +LABEL io.webdevops.version=1.3.5 {%- endmacro %} {%- macro add(source, target) -%}