From 7ef74c5d2cd3a81959791c8ba4778925ce5d3d3e Mon Sep 17 00:00:00 2001 From: Matt Kulka Date: Sun, 5 Jun 2022 22:03:41 +0000 Subject: [PATCH 001/123] python3 migration for build --- Makefile | 16 ++--- bin/command/docker_build_command.py | 2 +- bin/command/docker_exec_command.py | 24 ++++---- bin/command/docker_pull_command.py | 2 +- bin/command/docker_push_command.py | 2 +- bin/command/generate_dockerfile_command.py | 2 +- bin/command/generate_graph_command.py | 18 +++--- bin/command/generate_provision_command.py | 6 +- bin/command/test_serverspec_command.py | 2 +- bin/command/test_testinfra_command.py | 2 +- bin/console | 18 +++--- bin/webdevops/Command.py | 8 +-- bin/webdevops/Configuration.py | 12 ++-- bin/webdevops/Dockerfile.py | 4 +- bin/webdevops/DockerfileUtility.py | 10 ++-- bin/webdevops/Provisioner.py | 8 +-- bin/webdevops/__init__.py | 8 +-- bin/webdevops/command/BaseCommand.py | 32 +++++----- bin/webdevops/command/DoitCommand.py | 2 +- bin/webdevops/command/__init__.py | 6 +- bin/webdevops/docker/DockerBaseClient.py | 8 +-- bin/webdevops/docker/DockerCliClient.py | 13 +++- bin/webdevops/docker/DockerPyClient.py | 9 +-- bin/webdevops/docker/__init__.py | 8 +-- bin/webdevops/doit/DoitReporter.py | 10 ++-- bin/webdevops/doit/__init__.py | 4 +- .../taskloader/BaseDockerTaskLoader.py | 2 +- bin/webdevops/taskloader/BaseTaskLoader.py | 14 ++--- .../taskloader/DockerBuildTaskLoader.py | 23 +++---- .../taskloader/DockerPullTaskLoader.py | 8 +-- .../taskloader/DockerPushTaskLoader.py | 8 +-- .../DockerTestServerspecTaskLoader.py | 48 +++++++-------- .../DockerTestTestinfraTaskLoader.py | 6 +- bin/webdevops/taskloader/__init__.py | 16 ++--- .../testinfra/TestinfraDockerPlugin.py | 2 +- bin/webdevops/testinfra/__init__.py | 4 +- tests/serverspec/.bundle/config | 4 +- tests/serverspec/Gemfile.lock | 60 +++++++++---------- 38 files changed, 216 insertions(+), 215 deletions(-) diff --git a/Makefile b/Makefile index c41feac14..6ab4afd49 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ full: provision build all: build build: - python2 ./bin/console docker:build --threads=auto + bin/console docker:build --threads=auto bootstrap: webdevops/bootstrap webdevops/ansible base: webdevops/base webdevops/base-app webdevops/storage @@ -40,20 +40,20 @@ requirements: cd tests/serverspec && bundle install --path=vendor test: - python2 bin/console test:serverspec --threads=auto -v + bin/console test:serverspec --threads=auto -v provision: - python2 bin/console generate:dockerfile - python2 bin/console generate:provision + bin/console generate:dockerfile + bin/console generate:provision push: - python2 ./bin/console docker:push --threads=auto + bin/console docker:push --threads=auto graph: - python2 ./bin/console generate:graph + bin/console generate:graph graph-full: - python2 ./bin/console generate:graph --all\ + bin/console generate:graph --all\ --filename docker-image-full-layout.gv documentation: @@ -65,4 +65,4 @@ documentation: --poll -H 0.0.0.0 /opt/docs html webdevops/%: - python2 ./bin/console docker:build --threads=auto --whitelist=$@ + bin/console docker:build --threads=auto --whitelist=$@ diff --git a/bin/command/docker_build_command.py b/bin/command/docker_build_command.py index 0a0e08f99..969a516ac 100644 --- a/bin/command/docker_build_command.py +++ b/bin/command/docker_build_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/command/docker_exec_command.py b/bin/command/docker_exec_command.py index 0f84f7627..7ecbd6bb4 100644 --- a/bin/command/docker_exec_command.py +++ b/bin/command/docker_exec_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -51,11 +51,11 @@ def run_task(self, configuration): for dockerfile in dockerfile_list: title = dockerfile['image']['fullname'] - print title - print '~' * len(title) + print(title) + print('~' * len(title)) if configuration['dryRun']: - print ' exec: %s' % (docker_command) + print(' exec: %s' % (docker_command)) else: cmd = [ @@ -71,19 +71,19 @@ def run_task(self, configuration): status = Command.execute(cmd) if status: - print colored(' -> successfull', 'green') + print(colored(' -> successfull', 'green')) else: - print colored(' -> failed', 'red') + print(colored(' -> failed', 'red')) image_fail_list.append(dockerfile['image']['fullname']) - print '' - print '' + print('') + print('') if len(image_fail_list) >= 1: - print '' - print colored(' => failed images (%s):' % (str(len(image_fail_list))), 'red') + print('') + print(colored(' => failed images (%s):' % (str(len(image_fail_list))), 'red')) for image in image_fail_list: - print ' - %s ' % image - print '' + print(' - %s ' % image) + print('') return False else: diff --git a/bin/command/docker_pull_command.py b/bin/command/docker_pull_command.py index e6f960b47..405e7fde0 100644 --- a/bin/command/docker_pull_command.py +++ b/bin/command/docker_pull_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/command/docker_push_command.py b/bin/command/docker_push_command.py index 85912b5b7..074de2488 100644 --- a/bin/command/docker_push_command.py +++ b/bin/command/docker_push_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/command/generate_dockerfile_command.py b/bin/command/generate_dockerfile_command.py index b5a3710d8..d0d8a6723 100644 --- a/bin/command/generate_dockerfile_command.py +++ b/bin/command/generate_dockerfile_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/command/generate_graph_command.py b/bin/command/generate_graph_command.py index 1a82ee378..e46e3ccbb 100644 --- a/bin/command/generate_graph_command.py +++ b/bin/command/generate_graph_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -43,7 +43,7 @@ class GenerateGraphCommand(BaseCommand): '--format': Enum(['png', 'jpg', 'pdf', 'svg']) } - from_regex = re.compile(ur'FROM\s+(?P[^\s:]+)(:(?P.+))?', re.MULTILINE) + from_regex = re.compile(r'FROM\s+(?P[^\s:]+)(:(?P.+))?', re.MULTILINE) containers = {} @@ -116,7 +116,7 @@ def __append_tag(self, docker_image, tag): :return: self """ - if not self.tags.has_key(docker_image): + if docker_image not in self.tags: self.tags[docker_image] = {} self.tags[docker_image][tag] = tag return self @@ -133,7 +133,7 @@ def __get_graph(self, default_graph, name): :return: the selected diagram :rtype: Digraph """ - for group, group_attr in self.conf['diagram']['groups'].items(): + for group, group_attr in list(self.conf['diagram']['groups'].items()): for dockerRegex in group_attr['docker']: if re.match(dockerRegex, name): return group, self.subgraph[group] @@ -190,7 +190,7 @@ def build_graph(self): rank_group_list = {} # Create subgraph - for group, group_attr in self.conf['diagram']['groups'].items(): + for group, group_attr in list(self.conf['diagram']['groups'].items()): self.subgraph[group] = Digraph('cluster_%s' % group) self.subgraph[group].body.append(r'label = "%s"' % group_attr['name']) self.subgraph[group] = self.__apply_styles(self.subgraph[group], group_attr['styles']) @@ -198,7 +198,7 @@ def build_graph(self): if 'rank' in group_attr: rank_group_list[group] = group_attr['rank'] - for image, base in self.containers.items(): + for image, base in list(self.containers.items()): group_image, graph_image = self.__get_graph(dia, image) group_base, graph_base = self.__get_graph(dia, base) if not "scratch" in base: @@ -221,15 +221,15 @@ def build_graph(self): rank_image_list[image_rank].append(image) # add repositories (subgraph/cluster) - for name, subgraph in self.subgraph.items(): + for name, subgraph in list(self.subgraph.items()): dia.subgraph(subgraph) # add images (node) - for image, base in self.edges.items(): + for image, base in list(self.edges.items()): dia.edge(base, image) # add invisible constraints to add ranked groups - for rank, imagelist in rank_image_list.items(): + for rank, imagelist in list(rank_image_list.items()): rank_next = rank + 1 if rank_next in rank_image_list: diff --git a/bin/command/generate_provision_command.py b/bin/command/generate_provision_command.py index cdf3cec44..94c84a036 100644 --- a/bin/command/generate_provision_command.py +++ b/bin/command/generate_provision_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -22,7 +22,7 @@ import yaml import yamlordereddictloader import time -import Queue +import queue import shutil import grp from cleo import Output @@ -46,7 +46,7 @@ class GenerateProvisionCommand(BaseCommand): __queue = '' def run_task(self, configuration): - self.__queue = Queue.Queue() + self.__queue = queue.Queue() if Output.VERBOSITY_VERBOSE <= self.output.get_verbosity(): self.line('provision : %s' % configuration.get('provisionPath')) self.line('dockerfile : %s' % configuration.get('dockerPath')) diff --git a/bin/command/test_serverspec_command.py b/bin/command/test_serverspec_command.py index 69c5ac5ad..5774d9cd2 100644 --- a/bin/command/test_serverspec_command.py +++ b/bin/command/test_serverspec_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/command/test_testinfra_command.py b/bin/command/test_testinfra_command.py index 39508bd45..7204c6542 100644 --- a/bin/command/test_testinfra_command.py +++ b/bin/command/test_testinfra_command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/console b/bin/console index 0ec2645a0..ea4e0358e 100755 --- a/bin/console +++ b/bin/console @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import os, sys @@ -7,8 +7,8 @@ import os, sys sys.dont_write_bytecode = True # unbuffered stdout / stderr -sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0) -sys.stderr = os.fdopen(sys.stderr.fileno(), 'w', 0) +sys.stdout = os.fdopen(sys.stdout.fileno(), 'w') +sys.stderr = os.fdopen(sys.stderr.fileno(), 'w') import re, yaml from cleo import Application @@ -43,19 +43,19 @@ if __name__ == '__main__': # Read console.yml for configuration with open(os.path.join(conf_path, 'console.yml'), 'r') as stream: try: - configuration = yaml.load(stream) + configuration = yaml.load(stream, Loader=yaml.FullLoader) configuration['confPath'] = conf_path except yaml.YAMLError as e: configuration = None - print ' !!! Exception while loading configuration from %s:' % conf_path - print '' - print e - print '' + print(' !!! Exception while loading configuration from %s:' % conf_path) + print('') + print(e) + print('') sys.exit(1) # Check if configuration is valid if configuration is None: - print ' !!! Configuration not found' + print(' !!! Configuration not found') sys.exit(1) # generate full paths diff --git a/bin/webdevops/Command.py b/bin/webdevops/Command.py index c7979e8d3..b190a731f 100644 --- a/bin/webdevops/Command.py +++ b/bin/webdevops/Command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -25,7 +25,7 @@ def execute(cmd, cwd=False, env=None): Execute cmd and output stdout/stderr """ - print 'Execute: %s' % ' '.join(cmd) + print('Execute: %s' % ' '.join(cmd)) if env is not None: env = copy.deepcopy(env) @@ -67,7 +67,7 @@ def execute(cmd, cwd=False, env=None): # output stdout with open(file_stdout.name, 'r') as f: for line in f: - print line.rstrip('\n') + print(line.rstrip('\n')) # restore current work directory os.chdir(path_current) @@ -75,5 +75,5 @@ def execute(cmd, cwd=False, env=None): if proc.returncode == 0: return True else: - print '>> failed command with return code %s' % proc.returncode + print('>> failed command with return code %s' % proc.returncode) return False diff --git a/bin/webdevops/Configuration.py b/bin/webdevops/Configuration.py index 3d6cfad25..ecd8c5290 100644 --- a/bin/webdevops/Configuration.py +++ b/bin/webdevops/Configuration.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -44,7 +44,7 @@ 'docker': { 'imagePrefix': '', 'autoLatestTag': False, - 'fromRegExp': re.compile(ur'FROM\s+(?P[^\s:]+)(:(?P.+))?', re.MULTILINE), + 'fromRegExp': re.compile(r'FROM\s+(?P[^\s:]+)(:(?P.+))?', re.MULTILINE), 'pathRegex': False, 'autoPull': False, 'autoPullWhitelist': False, @@ -83,7 +83,7 @@ def dictmerge(original, update): Recursively update a dict. Subdict's won't be overwritten but also updated. """ - for key, value in original.iteritems(): + for key, value in original.items(): if key not in update: update[key] = value elif isinstance(value, dict): @@ -101,7 +101,7 @@ def __init__(self, value=None): for key in value: self.__setitem_internal__(key, value[key]) else: - raise TypeError, 'expected dict' + raise TypeError('expected dict') def __setitem_internal__(self, key, value): """ @@ -116,7 +116,7 @@ def __setitem__(self, key, value): myKey, restOfKey = key.split('.', 1) target = self.setdefault(myKey, dotdictify()) if not isinstance(target, dotdictify): - raise KeyError, 'cannot set "%s" in "%s" (%s)' % (restOfKey, myKey, repr(target)) + raise KeyError('cannot set "%s" in "%s" (%s)' % (restOfKey, myKey, repr(target))) target[restOfKey] = value else: if isinstance(value, dict) and not isinstance(value, dotdictify): @@ -129,7 +129,7 @@ def __getitem__(self, key, raw=False): myKey, restOfKey = key.split('.', 1) target = dict.get(self, myKey, None) if not isinstance(target, dotdictify): - raise KeyError, 'cannot get "%s" in "%s" (%s)' % (restOfKey, myKey, repr(target)) + raise KeyError('cannot get "%s" in "%s" (%s)' % (restOfKey, myKey, repr(target))) return target[restOfKey] def __contains__(self, key): diff --git a/bin/webdevops/Dockerfile.py b/bin/webdevops/Dockerfile.py index 8955a0597..428ad3655 100644 --- a/bin/webdevops/Dockerfile.py +++ b/bin/webdevops/Dockerfile.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -40,7 +40,7 @@ def finder(dockerfile_path, filename="Dockerfile", filter=[]): :rtype: list """ dockerfile_stack = [] - filter_regex = re.compile(ur'.*(%s).*' % "|".join(filter), re.IGNORECASE) + filter_regex = re.compile(r'.*(%s).*' % "|".join(filter), re.IGNORECASE) # pprint(filter_regex.pattern) for root, dirs, files in os.walk(dockerfile_path): for file in files: diff --git a/bin/webdevops/DockerfileUtility.py b/bin/webdevops/DockerfileUtility.py index 32b32a966..d346be137 100644 --- a/bin/webdevops/DockerfileUtility.py +++ b/bin/webdevops/DockerfileUtility.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -21,8 +21,8 @@ import os import re -DOCKERFILE_STATEMENT_FROM_RE = re.compile(ur'FROM\s+(?P[^\s:]+)(:(?P[^\s:]+))?(?!.*\s+AS)', re.MULTILINE) -DOCKERFILE_STATEMENT_FROM_MULTISTAGE_RE = re.compile(ur'FROM\s+(?P[^\s:]+)(:(?P[^\s:]+))?(\s+AS)', re.MULTILINE) +DOCKERFILE_STATEMENT_FROM_RE = re.compile(r'FROM\s+(?P[^\s:]+)(:(?P[^\s:]+))?(?!.*\s+AS)', re.MULTILINE) +DOCKERFILE_STATEMENT_FROM_MULTISTAGE_RE = re.compile(r'FROM\s+(?P[^\s:]+)(:(?P[^\s:]+))?(\s+AS)', re.MULTILINE) def find_file_in_path(dockerfile_path, filename="Dockerfile", whitelist=False, blacklist=False): """ @@ -64,7 +64,7 @@ def find_file_in_path(dockerfile_path, filename="Dockerfile", whitelist=False, b if blacklist: for term in blacklist: - file_list = filter(lambda x: term not in x, file_list) + file_list = [x for x in file_list if term not in x] return file_list @@ -143,7 +143,7 @@ def filter_dockerfile(dockerfile_list, whitelist=False, blacklist=False): if blacklist: for term in blacklist: - dockerfile_list = filter(lambda x: term not in x['image']['fullname'], dockerfile_list) + dockerfile_list = [x for x in dockerfile_list if term not in x['image']['fullname']] return dockerfile_list diff --git a/bin/webdevops/Provisioner.py b/bin/webdevops/Provisioner.py index 08dc1ad7a..06cb6f11d 100644 --- a/bin/webdevops/Provisioner.py +++ b/bin/webdevops/Provisioner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -24,7 +24,7 @@ import os from distutils.dir_util import copy_tree, remove_tree from threading import Thread -import Queue +import queue import shutil @@ -92,7 +92,7 @@ def run(self): if 'configuration' in self.image_config: self.__deploy_configuration() self.__done_item() - except Queue.Empty: + except queue.Empty: if Output.VERBOSITY_VERBOSE <= self.output.get_verbosity(): self.line("End") break @@ -114,7 +114,7 @@ def __deploy_configuration(self): """ Deploy the configuration to the container """ - for src, tag in self.image_config['configuration'].iteritems(): + for src, tag in self.image_config['configuration'].items(): if Output.VERBOSITY_NORMAL <= self.output.get_verbosity(): self.line("%s => %s:%s" % (src, self.image_name, tag)) if isinstance(tag, list): diff --git a/bin/webdevops/__init__.py b/bin/webdevops/__init__.py index 0688bc71a..1725ac862 100644 --- a/bin/webdevops/__init__.py +++ b/bin/webdevops/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -17,9 +17,3 @@ # THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS # 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. - -from Provisioner import Provisioner - -__all__ = [ - 'Provisioner', -] diff --git a/bin/webdevops/command/BaseCommand.py b/bin/webdevops/command/BaseCommand.py index 6734f5917..6bec6e523 100644 --- a/bin/webdevops/command/BaseCommand.py +++ b/bin/webdevops/command/BaseCommand.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -49,11 +49,11 @@ def handle(self): try: exitcode = self.run_task(configuration=self.configuration) except KeyboardInterrupt as e: - print ' !!! Execution aborted by user' + print(' !!! Execution aborted by user') exitcode = 1 except SystemExit as e: - print ' !!! Execution aborted by SystemExit' - print '' + print(' !!! Execution aborted by SystemExit') + print('') traceback.print_exc(file=sys.stdout) exitcode = 1 @@ -90,26 +90,26 @@ def startup(self): DoitReporter.simulation_mode = True - print 'Executing %s (%s)' % (self.name, ', '.join(options)) - print '' + print('Executing %s (%s)' % (self.name, ', '.join(options))) + print('') try: whitelist = self.get_whitelist() if whitelist: - print 'WHITELIST active:' + print('WHITELIST active:') for item in whitelist: - print ' - %s' % item - print '' + print(' - %s' % item) + print('') except: pass try: blacklist = self.get_blacklist() if blacklist: - print 'BLACKLIST active:' + print('BLACKLIST active:') for item in blacklist: - print ' - %s' % item - print '' + print(' - %s' % item) + print('') except: pass @@ -128,11 +128,11 @@ def shutdown(self, exitcode=0): self.teardown(exitcode) - print '' + print('') if exitcode == 0: - print '> finished execution in %s successfully' % (duration) + print('> finished execution in %s successfully' % (duration)) else: - print '> finished execution in %s with errors (exitcode %s)' % (duration, exitcode) + print('> finished execution in %s with errors (exitcode %s)' % (duration, exitcode)) def build_configuration(self): """ @@ -207,7 +207,7 @@ def get_blacklist(self): # static BLACKLIST file if os.path.isfile(self.configuration.get('blacklistFile')): lines = [line.rstrip('\n').lstrip('\n') for line in open(self.configuration.get('blacklistFile'))] - lines = filter(bool, lines) + lines = list(filter(bool, lines)) if lines: ret.extend(lines) diff --git a/bin/webdevops/command/DoitCommand.py b/bin/webdevops/command/DoitCommand.py index c7d1dc3ed..67940470a 100644 --- a/bin/webdevops/command/DoitCommand.py +++ b/bin/webdevops/command/DoitCommand.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/webdevops/command/__init__.py b/bin/webdevops/command/__init__.py index 9be4e15cb..4959875f5 100644 --- a/bin/webdevops/command/__init__.py +++ b/bin/webdevops/command/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -18,8 +18,8 @@ # 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. -from BaseCommand import BaseCommand -from DoitCommand import DoitCommand +from .BaseCommand import BaseCommand +from .DoitCommand import DoitCommand __all__ = [ 'BaseCommand', diff --git a/bin/webdevops/docker/DockerBaseClient.py b/bin/webdevops/docker/DockerBaseClient.py index b8b22cd9c..c19d821bc 100644 --- a/bin/webdevops/docker/DockerBaseClient.py +++ b/bin/webdevops/docker/DockerBaseClient.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -29,19 +29,19 @@ def pull_image(self, name, tag): """ Build dockerfile """ - print 'Pull image %s:%s' % (name, tag) + print('Pull image %s:%s' % (name, tag)) return True def build_dockerfile(self, path, name, nocache=False): """ Build dockerfile """ - print 'Build Dockerfile %s with name %s' % (path, name) + print('Build Dockerfile %s with name %s' % (path, name)) return True def push_image(self, name): """ Push one Docker image to registry """ - print 'Build image %s' % (name) + print('Build image %s' % (name)) return True diff --git a/bin/webdevops/docker/DockerCliClient.py b/bin/webdevops/docker/DockerCliClient.py index 2f59b5171..87415d587 100644 --- a/bin/webdevops/docker/DockerCliClient.py +++ b/bin/webdevops/docker/DockerCliClient.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -31,11 +31,18 @@ def pull_image(self, name, tag): cmd = ['docker', 'pull', '%s:%s' % (name, tag)] return Command.execute(cmd) - def build_dockerfile(self, path, name, nocache=False): + def build_dockerfile(self, path, name, nocache=False, **kwargs): """ Build dockerfile """ - cmd = ['docker', 'build', '--tag', name, os.path.dirname(path)] + cmd = ['docker', 'build', '--tag', name] + if 'buildargs' in kwargs: + cmd.append('--build-arg') + args = [] + for k, v in list(kwargs['buildargs'].items()): + args.append("%s=%s" % (k, v)) + cmd.append(','.join(args)) + cmd.append(os.path.dirname(path)) if nocache: cmd.append('--no-cache') diff --git a/bin/webdevops/docker/DockerPyClient.py b/bin/webdevops/docker/DockerPyClient.py index 507a190f0..75fb5b831 100644 --- a/bin/webdevops/docker/DockerPyClient.py +++ b/bin/webdevops/docker/DockerPyClient.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -50,7 +50,7 @@ def pull_image(self, name, tag): return self.process_client_response(response) - def build_dockerfile(self, path, name, nocache=False): + def build_dockerfile(self, path, name, nocache=False, **kwargs): """ Build dockerfile """ @@ -60,7 +60,8 @@ def build_dockerfile(self, path, name, nocache=False): pull=False, nocache=nocache, quiet=False, - decode=True + decode=True, + **kwargs ) return self.process_client_response(response) @@ -110,5 +111,5 @@ def output_message(message, prevent_repeat=False): if 'id' in line: message += ' ' + line['id'] output_message(message) - print '' + print('') return ret diff --git a/bin/webdevops/docker/__init__.py b/bin/webdevops/docker/__init__.py index 9124d6a99..d4632a7fc 100644 --- a/bin/webdevops/docker/__init__.py +++ b/bin/webdevops/docker/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -18,9 +18,9 @@ # 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. -from DockerBaseClient import DockerBaseClient -from DockerPyClient import DockerPyClient -from DockerCliClient import DockerCliClient +from .DockerBaseClient import DockerBaseClient +from .DockerPyClient import DockerPyClient +from .DockerCliClient import DockerCliClient __all__ = [ 'DockerBaseClient', diff --git a/bin/webdevops/doit/DoitReporter.py b/bin/webdevops/doit/DoitReporter.py index 84c85ee53..341361017 100644 --- a/bin/webdevops/doit/DoitReporter.py +++ b/bin/webdevops/doit/DoitReporter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -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, sys, time, datetime, StringIO +import os, sys, time, datetime, io import termcolor from termcolor import colored from ..taskloader.BaseTaskLoader import BaseTaskLoader @@ -121,9 +121,9 @@ def __init__(self, outstream, options=None): #pylint: disable=W0613 # than the data. so anything that is sent to stdout/err needs to # be captured. self._old_out = sys.stdout - sys.stdout = StringIO.StringIO() + sys.stdout = io.StringIO() self._old_err = sys.stderr - sys.stderr = StringIO.StringIO() + sys.stderr = io.StringIO() self.outstream = outstream # runtime and cleanup errors self.errors = [] @@ -246,7 +246,7 @@ def complete_run(self): if self.errors: log_err += "\n".join(self.errors) - task_result_list = [tr.to_dict() for tr in self.t_results.values()] + task_result_list = [tr.to_dict() for tr in list(self.t_results.values())] self.writeln('') self.writeln('-> finished %s tasks' % (len(task_result_list))) diff --git a/bin/webdevops/doit/__init__.py b/bin/webdevops/doit/__init__.py index 29fb79a7c..9de16656d 100644 --- a/bin/webdevops/doit/__init__.py +++ b/bin/webdevops/doit/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -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. -from DoitReporter import DoitReporter +from .DoitReporter import DoitReporter __all__ = [ 'DoitReporter', diff --git a/bin/webdevops/taskloader/BaseDockerTaskLoader.py b/bin/webdevops/taskloader/BaseDockerTaskLoader.py index 42404c5a6..6ff7901c0 100644 --- a/bin/webdevops/taskloader/BaseDockerTaskLoader.py +++ b/bin/webdevops/taskloader/BaseDockerTaskLoader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/webdevops/taskloader/BaseTaskLoader.py b/bin/webdevops/taskloader/BaseTaskLoader.py index a919fb934..ee2166e92 100644 --- a/bin/webdevops/taskloader/BaseTaskLoader.py +++ b/bin/webdevops/taskloader/BaseTaskLoader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -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 sys, re, time, StringIO, tempfile, json, base64, os +import sys, re, time, io, tempfile, json, base64, os from webdevops import DockerfileUtility from doit.cmd_base import TaskLoader from doit.task import dict_to_task @@ -45,7 +45,7 @@ def process_tasklist(self, tasklist): for task in tasklist: ret.append(dict_to_task(task)) - print 'Starting execution of %s tasks...' % (len(ret)) + print('Starting execution of %s tasks...' % (len(ret))) BaseTaskLoader.TASK_COUNT = len(ret) @@ -117,7 +117,7 @@ def task_runner(func, args, task): Will return the stdout if task fails as exception """ backup = sys.stdout - sys.stdout = StringIO.StringIO() + sys.stdout = io.StringIO() status = func(task=task, *args) output = sys.stdout.getvalue().strip() sys.stdout.close() @@ -126,7 +126,7 @@ def task_runner(func, args, task): if not status: raise Exception(output) else: - print output + print(output) return status @@ -134,7 +134,7 @@ def task_runner(func, args, task): @staticmethod def task_statusfile(task): - return '%s/%s' % (tempfile.gettempdir(), base64.b64encode(task.name)) + return '%s/%s' % (tempfile.gettempdir(), base64.b64encode(task.name.encode('utf-8'))) @staticmethod def task_write_statusfile(task, data): @@ -164,5 +164,5 @@ def task_get_statusfile(task, remove=True): @staticmethod def task_remove_statusfile(task): - filename = '%s/%s' % (tempfile.gettempdir(), base64.b64encode(task.name)) + filename = '%s/%s' % (tempfile.gettempdir(), base64.b64encode(task.name.encode('utf-8'))) os.remove(filename) diff --git a/bin/webdevops/taskloader/DockerBuildTaskLoader.py b/bin/webdevops/taskloader/DockerBuildTaskLoader.py index 761e7cbe3..93e8e2a49 100644 --- a/bin/webdevops/taskloader/DockerBuildTaskLoader.py +++ b/bin/webdevops/taskloader/DockerBuildTaskLoader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -73,7 +73,7 @@ def task_dependency_puller(docker_client, dockerfileList, configuration, task): Pulls dependency images before building """ def pull_image(image): - print ' -> Pull base image %s ' % image + print(' -> Pull base image %s ' % image) if configuration.get('dryRun'): return True @@ -91,9 +91,9 @@ def pull_image(image): if pull_status: break elif retry_count < (configuration.get('retry') - 1): - print ' failed, retrying... (try %s)' % (retry_count + 1) + print(' failed, retrying... (try %s)' % (retry_count + 1)) else: - print ' failed, giving up' + print(' failed, giving up') if not pull_status: return False @@ -130,31 +130,32 @@ def task_run(docker_client, dockerfile, configuration, task): # check if dockerfile is symlink, skipping tests if just a duplicate image # image is using the same hashes if dockerfile['image']['duplicate'] and not task.task_dep: - print ' Docker image %s is build from symlink but not included in build chain, please include %s' % (dockerfile['image']['fullname'], dockerfile['image']['from']) - print ' -> failing build' + print(' Docker image %s is build from symlink but not included in build chain, please include %s' % (dockerfile['image']['fullname'], dockerfile['image']['from'])) + print(' -> failing build') return False if configuration.get('dryRun'): - print ' path: %s' % dockerfile['path'] - print ' dep: %s' % (DockerBuildTaskLoader.human_task_name_list(task.task_dep) if task.task_dep else 'none') + print(' path: %s' % dockerfile['path']) + print(' dep: %s' % (DockerBuildTaskLoader.human_task_name_list(task.task_dep) if task.task_dep else 'none')) return True ## Build image - print ' -> Building image %s ' % dockerfile['image']['fullname'] + print(' -> Building image %s ' % dockerfile['image']['fullname']) build_status = False for retry_count in range(0, configuration.get('retry')): build_status = docker_client.build_dockerfile( path=dockerfile['path'], name=dockerfile['image']['fullname'], nocache=configuration.get('dockerBuild.noCache'), + buildargs={'TARGETPLATFORM': 'linux/arm64'}, ) if build_status: break elif retry_count < (configuration.get('retry')-1): - print ' failed, retrying... (try %s)' % (retry_count+1) + print(' failed, retrying... (try %s)' % (retry_count+1)) else: - print ' failed, giving up' + print(' failed, giving up') if build_status and dockerfile['image']['duplicate']: BaseTaskLoader.set_task_status(task, 'finished (duplicate)', 'success2') diff --git a/bin/webdevops/taskloader/DockerPullTaskLoader.py b/bin/webdevops/taskloader/DockerPullTaskLoader.py index 4bed18a51..a8036c0d9 100644 --- a/bin/webdevops/taskloader/DockerPullTaskLoader.py +++ b/bin/webdevops/taskloader/DockerPullTaskLoader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -56,7 +56,7 @@ def task_run(docker_client, dockerfile, configuration, task): Pull one Docker image from registry """ if configuration.get('dryRun'): - print ' pull: %s' % (dockerfile['image']['fullname']) + print(' pull: %s' % (dockerfile['image']['fullname'])) return True pull_status = False @@ -69,9 +69,9 @@ def task_run(docker_client, dockerfile, configuration, task): if pull_status: break elif retry_count < (configuration.get('retry') - 1): - print ' failed, retrying... (try %s)' % (retry_count+1) + print(' failed, retrying... (try %s)' % (retry_count+1)) else: - print ' failed, giving up' + print(' failed, giving up') return pull_status diff --git a/bin/webdevops/taskloader/DockerPushTaskLoader.py b/bin/webdevops/taskloader/DockerPushTaskLoader.py index 974bdea7f..1d38dfcf9 100644 --- a/bin/webdevops/taskloader/DockerPushTaskLoader.py +++ b/bin/webdevops/taskloader/DockerPushTaskLoader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -61,7 +61,7 @@ def task_run(docker_client, dockerfile, configuration, task): Push one Docker image to registry """ if configuration.get('dryRun'): - print ' push: %s' % (dockerfile['image']['fullname']) + print(' push: %s' % (dockerfile['image']['fullname'])) return True push_status = False @@ -73,10 +73,10 @@ def task_run(docker_client, dockerfile, configuration, task): if push_status: break elif retry_count < (configuration.get('retry') - 1): - print ' failed, retrying... (try %s)' % (retry_count+1) + print(' failed, retrying... (try %s)' % (retry_count+1)) time.sleep(randint(10, 30)) else: - print ' failed, giving up' + print(' failed, giving up') return push_status diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index 4457d62f5..478ee56b5 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -61,15 +61,13 @@ def task_run(dockerfile, configuration, task): """ Run test """ - # check if dockerfile is symlink, skipping tests if just a duplicate image # image is using the same hashes if dockerfile['image']['duplicate']: - print ' Docker image %s is build from symlink and duplicate of %s' % (dockerfile['image']['fullname'], dockerfile['image']['from']) - print ' -> skipping tests' + print(' Docker image %s is build from symlink and duplicate of %s' % (dockerfile['image']['fullname'], dockerfile['image']['from'])) + print(' -> skipping tests') BaseTaskLoader.set_task_status(task, 'skipped (symlink)', 'skipped') return True - # Check if current image is a toolimage (no daemon) is_toolimage = False for term in configuration.get('dockerTest.toolImages', {}): @@ -83,7 +81,7 @@ def task_run(dockerfile, configuration, task): # create dockerfile tmp_suffix = '.%s_%s_%s.tmp' % (dockerfile['image']['repository'], dockerfile['image']['imageName'], dockerfile['image']['tag']) tmp_suffix = tmp_suffix.replace('/', '_') - test_dockerfile = tempfile.NamedTemporaryFile(prefix='Dockerfile.', suffix=tmp_suffix, dir=configuration.get('serverspecPath'), bufsize=0, delete=False) + test_dockerfile = tempfile.NamedTemporaryFile(prefix='Dockerfile.', suffix=tmp_suffix, dir=configuration.get('serverspecPath'), delete=False) # serverspec conf serverspec_conf = DockerTestServerspecTaskLoader.generate_serverspec_configuration( @@ -95,7 +93,7 @@ def task_run(dockerfile, configuration, task): # serverspec options serverspec_opts = [] - serverspec_opts.extend([spec_path, dockerfile['image']['fullname'], base64.b64encode(json.dumps(serverspec_conf)), os.path.basename(test_dockerfile.name)]) + serverspec_opts.extend([spec_path, dockerfile['image']['fullname'], base64.b64encode(json.dumps(serverspec_conf).encode('utf-8')).decode('utf-8'), os.path.basename(test_dockerfile.name)]) # dockerfile content dockerfile_content = DockerTestServerspecTaskLoader.generate_dockerfile( @@ -107,24 +105,24 @@ def task_run(dockerfile, configuration, task): # DryRun if configuration.get('dryRun'): if not os.path.isfile(spec_abs_path): - print ' no tests found' - - print ' image: %s' % (dockerfile['image']['fullname']) - print ' path: %s' % (spec_path) - print ' args: %s' % (' '.join(serverspec_opts)) - print '' - print 'spec configuration:' - print '-------------------' - print json.dumps(serverspec_conf, indent=4, sort_keys=True) - print '' - print 'Dockerfile:' - print '-----------' - print dockerfile_content + print(' no tests found') + + print(' image: %s' % (dockerfile['image']['fullname'])) + print(' path: %s' % (spec_path)) + print(' args: %s' % (' '.join(serverspec_opts))) + print('') + print('spec configuration:') + print('-------------------') + print(json.dumps(serverspec_conf, indent=4, sort_keys=True)) + print('') + print('Dockerfile:') + print('-----------') + print(dockerfile_content) return True # check if we have any tests if not os.path.isfile(spec_abs_path): - print ' no tests defined (%s)' % (spec_path) + print(' no tests defined (%s)' % (spec_path)) BaseTaskLoader.set_task_status(task, 'skipped (no test)', 'skipped') return True @@ -133,7 +131,7 @@ def task_run(dockerfile, configuration, task): cmd.extend(serverspec_opts) # create Dockerfile - with open(test_dockerfile.name, mode='w', buffering=0) as f: + with open(test_dockerfile.name, mode='w') as f: f.write(dockerfile_content) f.flush() os.fsync(f.fileno()) @@ -144,15 +142,15 @@ def task_run(dockerfile, configuration, task): try: test_status = Command.execute(cmd, cwd=configuration.get('serverspecPath')) except Exception as e: - print e + print(e) pass if test_status: break elif retry_count < (configuration.get('retry') - 1): - print ' failed, retrying... (try %s)' % (retry_count + 1) + print(' failed, retrying... (try %s)' % (retry_count + 1)) else: - print ' failed, giving up' + print(' failed, giving up') return test_status diff --git a/bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py b/bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py index a9bfe37db..a9f4ab9a2 100644 --- a/bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestTestinfraTaskLoader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -70,8 +70,8 @@ def task_run(dockerfile, configuration, task): test_opts.extend(['-v']) if configuration.get('dryRun'): - print ' image: %s' % (dockerfile['image']['fullname']) - print ' args: %s' % (' '.join(test_opts)) + print(' image: %s' % (dockerfile['image']['fullname'])) + print(' args: %s' % (' '.join(test_opts))) return True exitcode = pytest.main(test_opts, plugins=[TestinfraDockerPlugin(configuration=configuration, docker_image=dockerfile['image']['fullname'])]) diff --git a/bin/webdevops/taskloader/__init__.py b/bin/webdevops/taskloader/__init__.py index e333eaa0a..5d7d66a40 100644 --- a/bin/webdevops/taskloader/__init__.py +++ b/bin/webdevops/taskloader/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -18,13 +18,13 @@ # 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. -from BaseTaskLoader import BaseTaskLoader -from BaseDockerTaskLoader import BaseDockerTaskLoader -from DockerBuildTaskLoader import DockerBuildTaskLoader -from DockerPushTaskLoader import DockerPushTaskLoader -from DockerPullTaskLoader import DockerPullTaskLoader -from DockerTestTestinfraTaskLoader import DockerTestTestinfraTaskLoader -from DockerTestServerspecTaskLoader import DockerTestServerspecTaskLoader +from .BaseTaskLoader import BaseTaskLoader +from .BaseDockerTaskLoader import BaseDockerTaskLoader +from .DockerBuildTaskLoader import DockerBuildTaskLoader +from .DockerPushTaskLoader import DockerPushTaskLoader +from .DockerPullTaskLoader import DockerPullTaskLoader +from .DockerTestTestinfraTaskLoader import DockerTestTestinfraTaskLoader +from .DockerTestServerspecTaskLoader import DockerTestServerspecTaskLoader __all__ = [ 'BaseTaskLoader', diff --git a/bin/webdevops/testinfra/TestinfraDockerPlugin.py b/bin/webdevops/testinfra/TestinfraDockerPlugin.py index ffe9ed322..7af0d1f45 100644 --- a/bin/webdevops/testinfra/TestinfraDockerPlugin.py +++ b/bin/webdevops/testinfra/TestinfraDockerPlugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io diff --git a/bin/webdevops/testinfra/__init__.py b/bin/webdevops/testinfra/__init__.py index 7a919e2a8..8f1d0f510 100644 --- a/bin/webdevops/testinfra/__init__.py +++ b/bin/webdevops/testinfra/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env/python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # (c) 2016 WebDevOps.io @@ -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. -from TestinfraDockerPlugin import TestinfraDockerPlugin +from .TestinfraDockerPlugin import TestinfraDockerPlugin __all__ = [ 'TestinfraDockerPlugin', diff --git a/tests/serverspec/.bundle/config b/tests/serverspec/.bundle/config index b81abe028..344f8c03b 100644 --- a/tests/serverspec/.bundle/config +++ b/tests/serverspec/.bundle/config @@ -1,3 +1,3 @@ --- -BUNDLE_PATH: vendor -BUNDLE_DISABLE_SHARED_GEMS: '1' +BUNDLE_PATH: "vendor" +BUNDLE_DISABLE_SHARED_GEMS: "true" diff --git a/tests/serverspec/Gemfile.lock b/tests/serverspec/Gemfile.lock index af146756f..9bb185668 100644 --- a/tests/serverspec/Gemfile.lock +++ b/tests/serverspec/Gemfile.lock @@ -1,46 +1,46 @@ GEM remote: https://rubygems.org/ specs: - diff-lcs (1.3) - docker-api (1.33.4) - excon (>= 0.38.0) - json - excon (0.71.0) - json (2.1.0) - multi_json (1.12.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.1.0) + diff-lcs (1.5.0) + docker-api (2.2.0) + excon (>= 0.47.0) + multi_json + excon (0.92.3) + json (2.6.2) + multi_json (1.15.0) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) + net-ssh (6.1.0) net-telnet (0.1.1) - rake (12.3.3) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rake (13.0.6) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-its (1.2.0) + rspec-support (~> 3.11.0) + rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.6.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-retry (0.5.4) - rspec-core (> 3.3, < 3.7) - rspec-support (3.6.0) - serverspec (2.38.0) + rspec-support (~> 3.11.0) + rspec-retry (0.6.2) + rspec-core (> 3.3) + rspec-support (3.11.0) + serverspec (2.42.0) multi_json rspec (~> 3.0) rspec-its - specinfra (~> 2.53) + specinfra (~> 2.72) sfl (2.3) - specinfra (2.67.9) + specinfra (2.83.2) net-scp - net-ssh (>= 2.7, < 5.0) - net-telnet + net-ssh (>= 2.7) + net-telnet (= 0.1.1) sfl PLATFORMS From d8b97e140bafcf6f9c2dfdfeea3b5cc9984ce2dd Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 21 Jul 2022 15:19:16 -0700 Subject: [PATCH 002/123] use dpkg to grab gosu and go-replace based on arch --- template/Dockerfile/images/baseapp.jinja2 | 8 +++++++- template/Dockerfile/tools.jinja2 | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/template/Dockerfile/images/baseapp.jinja2 b/template/Dockerfile/images/baseapp.jinja2 index 3c64466a8..c31b8da62 100644 --- a/template/Dockerfile/images/baseapp.jinja2 +++ b/template/Dockerfile/images/baseapp.jinja2 @@ -2,7 +2,9 @@ {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} - && apk-install shadow \ + && apk-install \ + dpkg \ + shadow \ && apk-install \ # Install common tools zip \ @@ -20,6 +22,7 @@ {% macro centos(role='') -%} # Install services && yum-install \ + dpkg \ # Install tools zip \ unzip \ @@ -65,6 +68,8 @@ patch \ && /usr/local/bin/generate-locales {%- endmacro %} + + {% macro debian10(role='') -%} # Install services && apt-install \ @@ -81,6 +86,7 @@ && /usr/local/bin/generate-locales {%- endmacro %} + {% macro ubuntu(role='') -%} # Install services && apt-install \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index dd4227588..50b0842ca 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,18 +1,20 @@ {% macro goreplace(path="/usr/local/bin", version="1.1.2") -%} ## Install go-replace - && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-64-linux" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ + && grArch="echo $dpkgArch | sed s/amd64/64/g" + && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-$grArch-linux" \ && chmod +x "{{ path }}/go-replace" \ && "{{ path }}/go-replace" --version {%- endmacro %} -{% macro gosu(path="/sbin", arch="amd64", version="1.10") -%} +{% macro gosu(path="/sbin", version="1.10") -%} # Install gosu - && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}.asc" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ + && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch" \ + && wget -O "{{ path }}/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "{{ path }}/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "{{ path }}/gosu" \ - && "{{ path }}/gosu" nobody true + && gpg --batch --verify {{ path }}/gosu.asc "{{ path }}/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "{{ path }}/gosu" {%- endmacro %} From 68a529df5810be15f660efad77e53b4dbdde3b4e Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 21 Jul 2022 16:03:25 -0700 Subject: [PATCH 003/123] update dependencies --- bin/requirements.txt | 50 ++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/bin/requirements.txt b/bin/requirements.txt index 0a1be6eca..39c5c27c0 100644 --- a/bin/requirements.txt +++ b/bin/requirements.txt @@ -1,27 +1,23 @@ -Jinja2>=2.8 -graphviz>=0.4.10 -cleo<0.7.0 -yamlordereddictloader>=0.1.0 -testinfra>=1.4.2 -doit==0.29.0 -termcolor>=1.1.0 -pytest-timeout>=1.0.0 -pytest-rerunfailures>=1.0.0 -MarkupSafe -funcsigs -pbr -six -mock -psutil -pylev -py -appdirs -pyparsing -packaging -pytest -simplejson -backpack -PyYAML -cloudpickle -pyinotify -configparser +attrs==21.4.0 +cleo==0.6.8 +clikit==0.6.2 +cloudpickle==2.1.0 +crashtest==0.3.1 +doit==0.36.0 +graphviz==0.20 +importlib-metadata==4.12.0 +iniconfig==1.1.1 +Jinja2==3.1.2 +MarkupSafe==2.1.1 +packaging==21.3 +pastel==0.2.1 +pluggy==1.0.0 +py==1.11.0 +pylev==1.4.0 +pyparsing==3.0.9 +pytest==7.1.2 +PyYAML==6.0 +termcolor==1.1.0 +tomli==2.0.1 +yamlordereddictloader==0.4.0 +zipp==3.8.1 From d4ee875fe70b22cefa52352254c68bb068263f6f Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 22 Jul 2022 17:22:58 -0700 Subject: [PATCH 004/123] add pyproject.toml --- pyproject.toml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..c5d285362 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,15 @@ +[tool.pyright] +include = ["bin"] +exclude = ["**/__pycache__"] +defineConstant = { DEBUG = true } +venv = "venv" + +reportMissingImports = true +reportMissingTypeStubs = false + +pythonVersion = "3.9" +pythonPlatform = "Linux" + +executionEnvironments = [ + { root = "bin" } +] From 7ad4c32d7cc0c37a68bae3e59c2f23ec81e85fb4 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 22 Jul 2022 17:23:37 -0700 Subject: [PATCH 005/123] ignore .DS_Store files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d64af3b3b..40223a849 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ /BLACKLIST *.log *.pyc +*.DS_Store .doit.db From d3f702e44bd15cc50ba34ce2a0f6ff6208829c0a Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 22 Jul 2022 17:24:16 -0700 Subject: [PATCH 006/123] ignore venv --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 40223a849..11acfa541 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /tests/serverspec/.bundle/ /tests/serverspec/Dockerfile* /BLACKLIST +/venv *.log *.pyc *.DS_Store From 65278d812fae10c3bf5174b3862f4c07bf278173 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 13:06:48 -0700 Subject: [PATCH 007/123] downgrading to cleo v0.6.2, remove conflicting clikit, force pastel to v0.1.1 --- bin/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/requirements.txt b/bin/requirements.txt index 39c5c27c0..148b26b43 100644 --- a/bin/requirements.txt +++ b/bin/requirements.txt @@ -1,6 +1,5 @@ attrs==21.4.0 cleo==0.6.8 -clikit==0.6.2 cloudpickle==2.1.0 crashtest==0.3.1 doit==0.36.0 @@ -10,7 +9,7 @@ iniconfig==1.1.1 Jinja2==3.1.2 MarkupSafe==2.1.1 packaging==21.3 -pastel==0.2.1 +pastel==0.1.1 pluggy==1.0.0 py==1.11.0 pylev==1.4.0 From c51a9abfd79976098891b63a5e751680c725b0b0 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 13:11:00 -0700 Subject: [PATCH 008/123] properly import Provisioner class from module webdevops.Provisioner --- bin/command/generate_provision_command.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/command/generate_provision_command.py b/bin/command/generate_provision_command.py index 94c84a036..00efba6a3 100644 --- a/bin/command/generate_provision_command.py +++ b/bin/command/generate_provision_command.py @@ -26,7 +26,7 @@ import shutil import grp from cleo import Output -from webdevops import Provisioner +from webdevops.Provisioner import Provisioner from webdevops.command import BaseCommand class GenerateProvisionCommand(BaseCommand): From b02547d0f0ca5421428313b9eeb4e2f7ee3606ef Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 13:12:04 -0700 Subject: [PATCH 009/123] add dpkg pkg to toolbox Dockerfile --- docker/toolbox/latest/Dockerfile.jinja2 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/toolbox/latest/Dockerfile.jinja2 b/docker/toolbox/latest/Dockerfile.jinja2 index bdb3a7ec6..8b81a1fdf 100644 --- a/docker/toolbox/latest/Dockerfile.jinja2 +++ b/docker/toolbox/latest/Dockerfile.jinja2 @@ -2,6 +2,7 @@ RUN apk add --no-cache \ ca-certificates \ + dpkg \ openssl \ curl \ bash \ From a047724902a62677928af8f9cd44ac7f9ab24827 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 13:12:27 -0700 Subject: [PATCH 010/123] export dpkgArch and other relevant arch env vars --- template/Dockerfile/tools.jinja2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 50b0842ca..b75f7ed14 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,7 +1,7 @@ {% macro goreplace(path="/usr/local/bin", version="1.1.2") -%} ## Install go-replace - && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ - && grArch="echo $dpkgArch | sed s/amd64/64/g" + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-$grArch-linux" \ && chmod +x "{{ path }}/go-replace" \ && "{{ path }}/go-replace" --version @@ -9,7 +9,7 @@ {% macro gosu(path="/sbin", version="1.10") -%} # Install gosu - && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch" \ && wget -O "{{ path }}/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ From 6f645280c0e303daa3610f6dff85d617a4ca44fb Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 13:39:16 -0700 Subject: [PATCH 011/123] fix nginx soft link, as newer nginx installs may switch to http.d instead of conf.d directory names --- .../nginx/general/provision/bootstrap.d/10-nginx.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/provisioning/nginx/general/provision/bootstrap.d/10-nginx.sh b/provisioning/nginx/general/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/provisioning/nginx/general/provision/bootstrap.d/10-nginx.sh +++ b/provisioning/nginx/general/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf From b5a0450ad2600912c8e736f342b46d5f1fbcc580 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 13:42:33 -0700 Subject: [PATCH 012/123] temporary bash build script --- build.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 build.sh diff --git a/build.sh b/build.sh new file mode 100644 index 000000000..3e841c21c --- /dev/null +++ b/build.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +set -e + +echo 'building webdevops/toolbox' +docker build -t webdevops/toolbox:latest -f ./docker/toolbox/latest/Dockerfile . + +echo 'building webdevops/php:8.0-alpine' +docker build -t webdevops/php:8.0-alpine -f ./docker/php/8.0-alpine/Dockerfile ./docker/php/8.0-alpine +docker tag webdevops/php:8.0-alpine ghcr.io/cocoastorm/webdevops/php:8.0-alpine + +echo 'building webdevops/php-nginx:8.0-alpine' +docker build -t webdevops/php-nginx:8.0-alpine -f ./docker/php-nginx/8.0-alpine/Dockerfile ./docker/php-nginx/8.0-alpine +docker tag webdevops/php-nginx:8.0-alpine ghcr.io/cocoastorm/webdevops/php-nginx:8.0-alpine + +echo 'building webdevops/php-nginx-dev:8.0-alpine' +docker build -t webdevops/php-nginx-dev:8.0-alpine -f ./docker/php-nginx-dev/8.0-alpine/Dockerfile ./docker/php-nginx-dev/8.0-alpine +docker tag webdevops/php-nginx-dev:8.0-alpine ghcr.io/cocoastorm/webdevops/php-nginx-dev:8.0-alpine From 4899f110a011690f97c3022de7bfb1d56e4280de Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 13:42:55 -0700 Subject: [PATCH 013/123] use dpkg to detect arch beforer installing tools such as gosu, goreplace, and etc. --- docker/base-app/alpine/Dockerfile | 4 +++- docker/base-app/centos-7/Dockerfile | 1 + docker/bootstrap/alpine/Dockerfile | 16 ++++++++------- docker/bootstrap/centos-7/Dockerfile | 16 ++++++++------- docker/bootstrap/debian-10/Dockerfile | 16 ++++++++------- docker/bootstrap/debian-7/Dockerfile | 16 ++++++++------- docker/bootstrap/debian-8/Dockerfile | 16 ++++++++------- docker/bootstrap/debian-9/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-12.04/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-14.04/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-15.04/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-15.10/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-16.04/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-16.10/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-17.04/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-17.10/Dockerfile | 16 ++++++++------- docker/bootstrap/ubuntu-18.04/Dockerfile | 16 ++++++++------- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- docker/php-official/5.6/Dockerfile | 16 ++++++++------- docker/php-official/7.0/Dockerfile | 16 ++++++++------- docker/php-official/7.1-alpine/Dockerfile | 20 +++++++++++-------- docker/php-official/7.1/Dockerfile | 16 ++++++++------- docker/php-official/7.2-alpine/Dockerfile | 20 +++++++++++-------- docker/php-official/7.2/Dockerfile | 16 ++++++++------- docker/php-official/7.3-alpine/Dockerfile | 20 +++++++++++-------- docker/php-official/7.3/Dockerfile | 16 ++++++++------- docker/php-official/7.4-alpine/Dockerfile | 20 +++++++++++-------- docker/php-official/7.4/Dockerfile | 16 ++++++++------- docker/php-official/8.0-alpine/Dockerfile | 20 +++++++++++-------- docker/php-official/8.0/Dockerfile | 16 ++++++++------- docker/samson-deployment/latest/Dockerfile | 16 ++++++++------- docker/toolbox/latest/Dockerfile | 5 ++++- docker/typo3-solr/3.1/Dockerfile | 16 ++++++++------- docker/typo3-solr/5.0/Dockerfile | 16 ++++++++------- docker/typo3-solr/6.0/Dockerfile | 16 ++++++++------- docker/typo3-solr/6.1/Dockerfile | 16 ++++++++------- docker/typo3-solr/6.5/Dockerfile | 16 ++++++++------- docker/typo3-solr/7.0/Dockerfile | 16 ++++++++------- docker/typo3-solr/7.5/Dockerfile | 16 ++++++++------- docker/typo3-solr/8.0/Dockerfile | 16 ++++++++------- docker/typo3-solr/8.1/Dockerfile | 16 ++++++++------- 84 files changed, 664 insertions(+), 310 deletions(-) diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index bb16314bc..955cb83aa 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -14,7 +14,9 @@ ENV APPLICATION_USER=application \ COPY conf/ /opt/docker/ RUN set -x \ - && apk-install shadow \ + && apk-install \ + dpkg \ + shadow \ && apk-install \ # Install common tools zip \ diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 87904ce56..8af3e30bc 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -16,6 +16,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install services && yum-install \ + dpkg \ # Install tools zip \ unzip \ diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index c27400c69..b2c59f80c 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM alpine:3.11 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index a59732bda..add2d488c 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM centos:7 diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 9f8df8cea..7893d624b 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM debian:buster diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index a9e969c85..45227754f 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM debian:7 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 7356a575a..0f74d202d 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM debian:8 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 77b44f386..47d5cb80b 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM debian:stretch diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 7a8f6cdc4..9fc31c9a0 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:12.04 diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 40d675e1d..c0dec05b5 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:14.04 diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index c6054a10e..5196e2d2e 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:15.04 diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 731bac982..0a5a18f66 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:15.10 diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 43230f1ca..202438acd 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:16.04 diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index f1e6701f5..0d608ceca 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:16.10 diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index f84b85739..5f6c7c306 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:17.04 diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index a12e552ea..2246055f0 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:17.10 diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index bbd169460..a828d1a47 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM ubuntu:18.04 diff --git a/docker/nginx/alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/alpine/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh index 8909da4d5..115e2ca91 100644 --- a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh @@ -12,12 +12,18 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index e42c1db64..11d9fe43d 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:5.6-fpm-stretch diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index aebf42258..a4faa1118 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.0-fpm-stretch diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 8068cf487..d4783945f 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.1-fpm-alpine @@ -89,7 +91,9 @@ RUN set -x \ && docker-image-cleanup RUN set -x \ - && apk-install shadow \ + && apk-install \ + dpkg \ + shadow \ && apk-install \ # Install common tools zip \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index e11081dec..0e063e226 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.1-fpm-buster diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 423fdbd3b..dafe46533 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.2-fpm-alpine @@ -89,7 +91,9 @@ RUN set -x \ && docker-image-cleanup RUN set -x \ - && apk-install shadow \ + && apk-install \ + dpkg \ + shadow \ && apk-install \ # Install common tools zip \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 464e3b767..03896e9d2 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.2-fpm-buster diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index f00371c06..0a4d87947 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.3-fpm-alpine @@ -89,7 +91,9 @@ RUN set -x \ && docker-image-cleanup RUN set -x \ - && apk-install shadow \ + && apk-install \ + dpkg \ + shadow \ && apk-install \ # Install common tools zip \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index edb9ae907..b59a459d3 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.3-fpm-buster diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index a22b135d9..e0d35fac8 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.4-fpm-alpine @@ -89,7 +91,9 @@ RUN set -x \ && docker-image-cleanup RUN set -x \ - && apk-install shadow \ + && apk-install \ + dpkg \ + shadow \ && apk-install \ # Install common tools zip \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 123ade91e..ef768ab61 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:7.4-fpm-buster diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index d6cd0bb76..f3248eea0 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:8.0-fpm-alpine @@ -89,7 +91,9 @@ RUN set -x \ && docker-image-cleanup RUN set -x \ - && apk-install shadow \ + && apk-install \ + dpkg \ + shadow \ && apk-install \ # Install common tools zip \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index f1c47634d..ccf9ab95b 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM php:8.0-fpm-buster diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 65b6db55d..297f84924 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM zendesk/samson:latest diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index 15a286083..498eddb41 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -7,6 +7,7 @@ FROM alpine:latest RUN apk add --no-cache \ ca-certificates \ + dpkg \ openssl \ curl \ bash \ @@ -23,6 +24,8 @@ RUN apk add --no-cache \ git \ gnupg \ ## Install go-replace - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/usr/local/bin/go-replace" \ && "/usr/local/bin/go-replace" --version diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 868d3cb6c..539401a08 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM guywithnose/solr:4.10.4 diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index ac1ab2028..652196ee5 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM guywithnose/solr:4.10.4 diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 573f78461..d5f9ffcd2 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM solr:6.3.0 diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index bdad7deba..2b48956dd 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM solr:6.3.0 diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 6935f1917..49aefb269 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM solr:6.6.2 diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 623abd6b5..305b438d3 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM solr:6.3.0 diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index bf2b7e847..a11be2ba1 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM solr:6.6.2 diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 607d2b1a2..fe2486844 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM solr:6.6.2 diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 401d31413..706765c7c 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -13,18 +13,20 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \ - && wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \ + && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" /tmp/gosu.asc \ - && chmod +x "/baselayout/sbin/gosu" \ - && "/baselayout/sbin/gosu" nobody true + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && rm -rf "$GNUPGHOME" \ + && chmod +x "/baselayout/sbin/gosu" FROM solr:6.6.3 From 606f030284c38b9689d841966f56329e917a2cfe Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 16:32:11 -0700 Subject: [PATCH 014/123] allow whitelist to match via globlike patterns using Path.match --- bin/webdevops/DockerfileUtility.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bin/webdevops/DockerfileUtility.py b/bin/webdevops/DockerfileUtility.py index d346be137..4902e352e 100644 --- a/bin/webdevops/DockerfileUtility.py +++ b/bin/webdevops/DockerfileUtility.py @@ -20,6 +20,7 @@ import os import re +from pathlib import Path DOCKERFILE_STATEMENT_FROM_RE = re.compile(r'FROM\s+(?P[^\s:]+)(:(?P[^\s:]+))?(?!.*\s+AS)', re.MULTILINE) DOCKERFILE_STATEMENT_FROM_MULTISTAGE_RE = re.compile(r'FROM\s+(?P[^\s:]+)(:(?P[^\s:]+))?(\s+AS)', re.MULTILINE) @@ -60,6 +61,12 @@ def find_file_in_path(dockerfile_path, filename="Dockerfile", whitelist=False, b if term in file: tmp.append(file) break + + # somewhat support glob style matching + local_filepath = Path(os.path.relpath(file, dockerfile_path)) + if local_filepath.match(term): + tmp.append(file) + file_list = tmp if blacklist: From ae2f8d8809263a6c7ae8ec84ba89e2ab158a09a1 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 16:33:03 -0700 Subject: [PATCH 015/123] add generate:ghactions cmd --- Makefile | 5 +- bin/command/generate_ghactions_command.py | 96 +++++++++++++++++++++++ bin/console | 2 + conf/console.yml | 3 +- template/Github/docker_action.jinja2 | 37 +++++++++ template/Github/docker_img.jinja2 | 1 + 6 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 bin/command/generate_ghactions_command.py create mode 100644 template/Github/docker_action.jinja2 create mode 100644 template/Github/docker_img.jinja2 diff --git a/Makefile b/Makefile index 6ab4afd49..ed5411bcc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ARGS = $(filter-out $@,$(MAKECMDGOALS)) MAKEFLAGS += --silent -.PHONY: test documentation provision +.PHONY: test documentation provision github DOCKER_REPOSITORY=`cat DOCKER_REPOSITORY` DOCKER_TAG_LATEST=`cat DOCKER_TAG_LATEST` @@ -46,6 +46,9 @@ provision: bin/console generate:dockerfile bin/console generate:provision +github: + bin/console generate:ghactions --whitelist=php-*/**/* + push: bin/console docker:push --threads=auto diff --git a/bin/command/generate_ghactions_command.py b/bin/command/generate_ghactions_command.py new file mode 100644 index 000000000..b18e19459 --- /dev/null +++ b/bin/command/generate_ghactions_command.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import os +import pprint +from pathlib import Path +from cleo import Output +from jinja2 import Environment, FileSystemLoader +from webdevops import DockerfileUtility +from webdevops.command import BaseCommand + +class GenerateGHActionsCommand(BaseCommand): + """ + Generate Github Actions template + + generate:ghactions + {docker images?* : Docker images (whitelist)} + {--whitelist=?* : image/tag whitelist } + {--blacklist=?* : image/tag blacklist } + """ + + image_prefix = '' + + def run_task(self, configuration): + self.image_prefix = configuration.get('docker.imagePrefix') + template_path = os.path.join(configuration.get('templatePath'), 'Github') + dockerfile_path = configuration.get('dockerPath') + github_actions_path = configuration.get('githubActionsPath') + github_action_file = os.path.join(github_actions_path, 'docker.yml') + + whitelist = self.get_whitelist() + blacklist = self.get_blacklist() + + if Output.VERBOSITY_VERBOSE <= self.output.get_verbosity(): + self.line('-> image prefix : %s' % self.image_prefix) + self.line('-> docker path : %s' % dockerfile_path) + self.line('-> template path : %s' % template_path) + + if whitelist: + self.line('-> whitelist :') + for crit in whitelist: + self.line("\t * %s" % crit) + + if blacklist: + self.line('-> blacklist :') + for crit in blacklist: + self.line("\t * %s" % crit) + + env = Environment( + autoescape=False, + loader=FileSystemLoader([template_path]), + trim_blocks=False + ) + + dockerfiles = DockerfileUtility.find_file_in_path( + dockerfile_path=dockerfile_path, + filename="Dockerfile.jinja2", + whitelist=whitelist, blacklist=blacklist, + ) + + dockerfile_blocks = [self.process_dockerfile(file) for file in dockerfiles] + + template = env.get_template('docker_action.jinja2') + rendered_content = template.render(dockerfiles=dockerfile_blocks) + + Path(github_actions_path).mkdir(parents=True, exist_ok=True) + + with open(github_action_file, 'w') as file_output: + file_output.write(rendered_content) + + self.line('written to %s' % github_action_file) + + def process_dockerfile(self, input_file): + """ + :param input_file: Input File + :type input_file: str + """ + + output_file = os.path.splitext(input_file) + output_file = os.path.join(os.path.dirname(output_file[0]), os.path.basename(output_file[0])) + + docker_image = os.path.basename(os.path.dirname(os.path.dirname(output_file))) + docker_tag = os.path.basename(os.path.dirname(output_file)) + + context_dir = os.path.split(output_file)[0] + + img = { + 'name': f"{docker_image}:{docker_tag}", + 'context': context_dir, + 'tags': f"{self.image_prefix}/{docker_image}:{docker_tag}" + } + + if Output.VERBOSITY_NORMAL <= self.output.get_verbosity(): + self.line("* Build block for %s" % img["name"]) + + return img diff --git a/bin/console b/bin/console index ea4e0358e..c1e0ebe50 100755 --- a/bin/console +++ b/bin/console @@ -26,6 +26,7 @@ from command.test_serverspec_command import TestServerspecCommand from command.generate_dockerfile_command import GenerateDockerfileCommand from command.generate_graph_command import GenerateGraphCommand from command.generate_provision_command import GenerateProvisionCommand +from command.generate_ghactions_command import GenerateGHActionsCommand if __name__ == '__main__': # Generate common paths @@ -100,5 +101,6 @@ if __name__ == '__main__': application.add(GenerateDockerfileCommand(configuration=configuration)) application.add(GenerateGraphCommand(configuration=configuration)) application.add(GenerateProvisionCommand(configuration=configuration)) + application.add(GenerateGHActionsCommand(configuration=configuration)) application.run() diff --git a/conf/console.yml b/conf/console.yml index 3ce9cdad4..c97a9d1f7 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -5,13 +5,14 @@ templatePath: 'template' provisionPath: 'provisioning' imagePath: 'documentation/docs/resources/images/' baselayoutPath: 'baselayout' +githubActionsPath: '.github/workflows' testinfraPath: 'tests/testinfra' serverspecPath: 'tests/serverspec' testDockerfilePath: 'tests/dockerfile' blacklistFile: 'BLACKLIST' docker: - imagePrefix: 'webdevops' + imagePrefix: 'ghcr.io/cocoastorm/webdevops' autoLatestTag: 'ubuntu-18.04' pathRegex: '/(?P[^/]+)/(?P[^/]+)/Dockerfile$' autoPull: True diff --git a/template/Github/docker_action.jinja2 b/template/Github/docker_action.jinja2 new file mode 100644 index 000000000..ae0b13998 --- /dev/null +++ b/template/Github/docker_action.jinja2 @@ -0,0 +1,37 @@ +{% import 'docker_img.jinja2' as docker -%} + +name: docker images + +on: + push: + branches: + - 'main' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + {% raw -%} + - name: Login to ghcr.io + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + {% endraw -%} + + {% for img in dockerfiles %} + - name: build and push "{{ img.name }}" + uses: docker/build-push-action@v3 + with: + context: {{ img.context }} + {{ docker.platforms() }} + push: true + tags: "{{ img.tags }}" + {% endfor %} diff --git a/template/Github/docker_img.jinja2 b/template/Github/docker_img.jinja2 new file mode 100644 index 000000000..e555a05ea --- /dev/null +++ b/template/Github/docker_img.jinja2 @@ -0,0 +1 @@ +{% macro platforms() %}platforms: linux/amd64,linux/arm64{% endmacro %} From 6fa7adc7e47c3a1fc09c18f8c7068d96b64d6efa Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 25 Jul 2022 16:42:03 -0700 Subject: [PATCH 016/123] restrict to php:8.* for gh-actions --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ed5411bcc..99291ae71 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ provision: bin/console generate:provision github: - bin/console generate:ghactions --whitelist=php-*/**/* + bin/console generate:ghactions --whitelist=php-*/8.*/* push: bin/console docker:push --threads=auto From 4ed1db043973ebfe38e2b38512f5c6f2d7f5852c Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 27 Jul 2022 10:25:52 -0700 Subject: [PATCH 017/123] use relative path to Dockerfile(s) for context --- bin/command/generate_ghactions_command.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/command/generate_ghactions_command.py b/bin/command/generate_ghactions_command.py index b18e19459..1605d6186 100644 --- a/bin/command/generate_ghactions_command.py +++ b/bin/command/generate_ghactions_command.py @@ -20,9 +20,10 @@ class GenerateGHActionsCommand(BaseCommand): """ image_prefix = '' + dockerfile_path = '' def run_task(self, configuration): - self.image_prefix = configuration.get('docker.imagePrefix') + image_prefix = configuration.get('docker.imagePrefix') template_path = os.path.join(configuration.get('templatePath'), 'Github') dockerfile_path = configuration.get('dockerPath') github_actions_path = configuration.get('githubActionsPath') @@ -31,8 +32,11 @@ def run_task(self, configuration): whitelist = self.get_whitelist() blacklist = self.get_blacklist() + self.image_prefix = image_prefix + self.dockerfile_path = dockerfile_path + if Output.VERBOSITY_VERBOSE <= self.output.get_verbosity(): - self.line('-> image prefix : %s' % self.image_prefix) + self.line('-> image prefix : %s' % image_prefix) self.line('-> docker path : %s' % dockerfile_path) self.line('-> template path : %s' % template_path) @@ -76,13 +80,12 @@ def process_dockerfile(self, input_file): :type input_file: str """ - output_file = os.path.splitext(input_file) - output_file = os.path.join(os.path.dirname(output_file[0]), os.path.basename(output_file[0])) + output_file = os.path.split(input_file)[0] - docker_image = os.path.basename(os.path.dirname(os.path.dirname(output_file))) - docker_tag = os.path.basename(os.path.dirname(output_file)) + docker_image = os.path.basename(os.path.dirname(output_file)) + docker_tag = os.path.basename(output_file) - context_dir = os.path.split(output_file)[0] + context_dir = os.path.relpath(output_file, os.path.dirname(self.dockerfile_path)) img = { 'name': f"{docker_image}:{docker_tag}", @@ -92,5 +95,6 @@ def process_dockerfile(self, input_file): if Output.VERBOSITY_NORMAL <= self.output.get_verbosity(): self.line("* Build block for %s" % img["name"]) + self.line(" context_path: %s" % context_dir) return img From ceabdffc519642373e0526956ece543fab51b1c7 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 27 Jul 2022 10:33:30 -0700 Subject: [PATCH 018/123] github actions: checkout repository before anything else --- .github/workflows/docker.yml | 124 +++++++++++++++++++++++++++ template/Github/docker_action.jinja2 | 3 + 2 files changed, 127 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 000000000..556bfdfee --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,124 @@ +name: docker images + +on: + push: + branches: + - 'main' + - 'experimental/gh-actions' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login to ghcr.io + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: build and push "php-apache:8.0-alpine" + uses: docker/build-push-action@v3 + with: + context: docker/php-apache/8.0-alpine + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-apache:8.0-alpine" + + - name: build and push "php-apache:8.0" + uses: docker/build-push-action@v3 + with: + context: docker/php-apache/8.0 + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-apache:8.0" + + - name: build and push "php-apache-dev:8.0-alpine" + uses: docker/build-push-action@v3 + with: + context: docker/php-apache-dev/8.0-alpine + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-apache-dev:8.0-alpine" + + - name: build and push "php-apache-dev:8.0" + uses: docker/build-push-action@v3 + with: + context: docker/php-apache-dev/8.0 + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-apache-dev:8.0" + + - name: build and push "php-official:8.0-alpine" + uses: docker/build-push-action@v3 + with: + context: docker/php-official/8.0-alpine + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-official:8.0-alpine" + + - name: build and push "php-official:8.0" + uses: docker/build-push-action@v3 + with: + context: docker/php-official/8.0 + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-official:8.0" + + - name: build and push "php-nginx-dev:8.0-alpine" + uses: docker/build-push-action@v3 + with: + context: docker/php-nginx-dev/8.0-alpine + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-nginx-dev:8.0-alpine" + + - name: build and push "php-nginx-dev:8.0" + uses: docker/build-push-action@v3 + with: + context: docker/php-nginx-dev/8.0 + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-nginx-dev:8.0" + + - name: build and push "php-nginx:8.0-alpine" + uses: docker/build-push-action@v3 + with: + context: docker/php-nginx/8.0-alpine + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-nginx:8.0-alpine" + + - name: build and push "php-nginx:8.0" + uses: docker/build-push-action@v3 + with: + context: docker/php-nginx/8.0 + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-nginx:8.0" + + - name: build and push "php-dev:8.0-alpine" + uses: docker/build-push-action@v3 + with: + context: docker/php-dev/8.0-alpine + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-dev:8.0-alpine" + + - name: build and push "php-dev:8.0" + uses: docker/build-push-action@v3 + with: + context: docker/php-dev/8.0 + platforms: linux/amd64,linux/arm64 + push: true + tags: "ghcr.io/cocoastorm/webdevops/php-dev:8.0" + diff --git a/template/Github/docker_action.jinja2 b/template/Github/docker_action.jinja2 index ae0b13998..098b9681f 100644 --- a/template/Github/docker_action.jinja2 +++ b/template/Github/docker_action.jinja2 @@ -11,6 +11,9 @@ jobs: docker: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 From 683ce0fedceafc5f1491a5f9cf4d04ca714a5afe Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 27 Jul 2022 14:09:16 -0700 Subject: [PATCH 019/123] add imageUser configuration value --- bin/webdevops/Configuration.py | 1 + conf/console.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/webdevops/Configuration.py b/bin/webdevops/Configuration.py index ecd8c5290..19021c950 100644 --- a/bin/webdevops/Configuration.py +++ b/bin/webdevops/Configuration.py @@ -43,6 +43,7 @@ 'docker': { 'imagePrefix': '', + 'imageUser': '', 'autoLatestTag': False, 'fromRegExp': re.compile(r'FROM\s+(?P[^\s:]+)(:(?P.+))?', re.MULTILINE), 'pathRegex': False, diff --git a/conf/console.yml b/conf/console.yml index c97a9d1f7..e7f4558a1 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -12,7 +12,8 @@ testDockerfilePath: 'tests/dockerfile' blacklistFile: 'BLACKLIST' docker: - imagePrefix: 'ghcr.io/cocoastorm/webdevops' + imagePrefix: 'webdevops' + imageUser: 'ghcr.io/cocoastorm/webdevops' autoLatestTag: 'ubuntu-18.04' pathRegex: '/(?P[^/]+)/(?P[^/]+)/Dockerfile$' autoPull: True From bdebc9e248d601f39dc6ae012433e345c848836b Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 27 Jul 2022 14:09:45 -0700 Subject: [PATCH 020/123] expose "imageUser" to templates --- bin/command/generate_dockerfile_command.py | 2 ++ template/Dockerfile/layout.jinja2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/command/generate_dockerfile_command.py b/bin/command/generate_dockerfile_command.py index d0d8a6723..584c5c052 100644 --- a/bin/command/generate_dockerfile_command.py +++ b/bin/command/generate_dockerfile_command.py @@ -65,6 +65,8 @@ def run_task(self, configuration): trim_blocks=False ) + self.template.globals = {"user": self.configuration.get('docker.imageUser') or 'webdevops'} + for file in DockerfileUtility.find_file_in_path(dockerfile_path=dockerfile_path, filename="Dockerfile.jinja2", whitelist=whitelist, blacklist=blacklist): self.process_dockerfile(file) diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 8ec507050..ad34f9dd2 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -1,4 +1,4 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/docker.jinja2' as docker with context %} {% import 'Dockerfile/provision.jinja2' as provision %} {% import 'Dockerfile/environment.jinja2' as environment %} {% import 'Dockerfile/services.jinja2' as services %} From f312f9ef97ebd791ef7cd6faf27fcce123921fe9 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 27 Jul 2022 14:15:02 -0700 Subject: [PATCH 021/123] pass "user" to from macro --- docker/ansible/alpine/Dockerfile.jinja2 | 2 +- docker/ansible/centos-7/Dockerfile.jinja2 | 2 +- docker/ansible/debian-7/Dockerfile.jinja2 | 2 +- docker/ansible/debian-8/Dockerfile.jinja2 | 2 +- docker/ansible/debian-9/Dockerfile.jinja2 | 2 +- docker/ansible/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/ansible/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/ansible/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/ansible/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/ansible/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/ansible/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/apache-dev/alpine/Dockerfile.jinja2 | 2 +- docker/apache-dev/centos-7/Dockerfile.jinja2 | 2 +- docker/apache-dev/debian-10/Dockerfile.jinja2 | 2 +- docker/apache-dev/debian-7/Dockerfile.jinja2 | 2 +- docker/apache-dev/debian-8/Dockerfile.jinja2 | 2 +- docker/apache-dev/debian-9/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/apache/alpine/Dockerfile.jinja2 | 2 +- docker/apache/centos-7/Dockerfile.jinja2 | 2 +- docker/apache/debian-10/Dockerfile.jinja2 | 2 +- docker/apache/debian-7/Dockerfile.jinja2 | 2 +- docker/apache/debian-8/Dockerfile.jinja2 | 2 +- docker/apache/debian-9/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/apache/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/base-app/alpine/Dockerfile.jinja2 | 2 +- docker/base-app/centos-7/Dockerfile.jinja2 | 2 +- docker/base-app/debian-10/Dockerfile.jinja2 | 2 +- docker/base-app/debian-7/Dockerfile.jinja2 | 2 +- docker/base-app/debian-8/Dockerfile.jinja2 | 2 +- docker/base-app/debian-9/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/base/alpine/Dockerfile.jinja2 | 2 +- docker/base/centos-7/Dockerfile.jinja2 | 2 +- docker/base/debian-10/Dockerfile.jinja2 | 2 +- docker/base/debian-7/Dockerfile.jinja2 | 2 +- docker/base/debian-8/Dockerfile.jinja2 | 2 +- docker/base/debian-9/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/certbot/latest/Dockerfile.jinja2 | 2 +- docker/liquidsoap/latest/Dockerfile.jinja2 | 2 +- docker/nginx-dev/alpine/Dockerfile.jinja2 | 2 +- docker/nginx-dev/centos-7/Dockerfile.jinja2 | 2 +- docker/nginx-dev/debian-10/Dockerfile.jinja2 | 2 +- docker/nginx-dev/debian-7/Dockerfile.jinja2 | 2 +- docker/nginx-dev/debian-8/Dockerfile.jinja2 | 2 +- docker/nginx-dev/debian-9/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/nginx/alpine/Dockerfile.jinja2 | 2 +- docker/nginx/centos-7/Dockerfile.jinja2 | 2 +- docker/nginx/debian-10/Dockerfile.jinja2 | 2 +- docker/nginx/debian-7/Dockerfile.jinja2 | 2 +- docker/nginx/debian-8/Dockerfile.jinja2 | 2 +- docker/nginx/debian-9/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/nginx/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/php-apache/5.6/Dockerfile.jinja2 | 2 +- docker/php-apache/7.0/Dockerfile.jinja2 | 2 +- docker/php-apache/7.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache/7.1/Dockerfile.jinja2 | 2 +- docker/php-apache/7.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache/7.2/Dockerfile.jinja2 | 2 +- docker/php-apache/7.3-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache/7.3/Dockerfile.jinja2 | 2 +- docker/php-apache/7.4-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache/7.4/Dockerfile.jinja2 | 2 +- docker/php-apache/8.0-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache/8.0/Dockerfile.jinja2 | 2 +- docker/php-apache/centos-7-php56/Dockerfile.jinja2 | 2 +- docker/php-apache/centos-7-php7/Dockerfile.jinja2 | 2 +- docker/php-apache/centos-7/Dockerfile.jinja2 | 2 +- docker/php-apache/debian-10/Dockerfile.jinja2 | 2 +- docker/php-apache/debian-7/Dockerfile.jinja2 | 2 +- docker/php-apache/debian-8-php7/Dockerfile.jinja2 | 2 +- docker/php-apache/debian-8/Dockerfile.jinja2 | 2 +- docker/php-apache/debian-9/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/php-dev/5.6/Dockerfile.jinja2 | 2 +- docker/php-dev/7.0/Dockerfile.jinja2 | 2 +- docker/php-dev/7.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-dev/7.1/Dockerfile.jinja2 | 2 +- docker/php-dev/7.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-dev/7.2/Dockerfile.jinja2 | 2 +- docker/php-dev/7.3-alpine/Dockerfile.jinja2 | 2 +- docker/php-dev/7.3/Dockerfile.jinja2 | 2 +- docker/php-dev/7.4-alpine/Dockerfile.jinja2 | 2 +- docker/php-dev/7.4/Dockerfile.jinja2 | 2 +- docker/php-dev/8.0-alpine/Dockerfile.jinja2 | 2 +- docker/php-dev/8.0/Dockerfile.jinja2 | 2 +- docker/php-dev/centos-7-php56/Dockerfile.jinja2 | 2 +- docker/php-dev/centos-7-php7/Dockerfile.jinja2 | 2 +- docker/php-dev/centos-7/Dockerfile.jinja2 | 2 +- docker/php-dev/debian-10/Dockerfile.jinja2 | 2 +- docker/php-dev/debian-7/Dockerfile.jinja2 | 2 +- docker/php-dev/debian-8-php7/Dockerfile.jinja2 | 2 +- docker/php-dev/debian-8/Dockerfile.jinja2 | 2 +- docker/php-dev/debian-9/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/php-nginx/5.6/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.0/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.1/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.2/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.3-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.3/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.4-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.4/Dockerfile.jinja2 | 2 +- docker/php-nginx/8.0-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx/8.0/Dockerfile.jinja2 | 2 +- docker/php-nginx/centos-7-php56/Dockerfile.jinja2 | 2 +- docker/php-nginx/centos-7-php7/Dockerfile.jinja2 | 2 +- docker/php-nginx/centos-7/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-10/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-7/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-8-php7/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-8/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-9/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 | 2 +- docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 | 2 +- docker/sphinx/latest/Dockerfile.jinja2 | 2 +- docker/varnish/latest/Dockerfile.jinja2 | 2 +- docker/vsftp/latest/Dockerfile.jinja2 | 2 +- 193 files changed, 193 insertions(+), 193 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile.jinja2 b/docker/ansible/alpine/Dockerfile.jinja2 index d11f9c10e..bfd6f7da9 100644 --- a/docker/ansible/alpine/Dockerfile.jinja2 +++ b/docker/ansible/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "alpine") }} +{{ docker.from("bootstrap", "alpine", user) }} RUN set -x \ {{ ansible.alpine() }} \ diff --git a/docker/ansible/centos-7/Dockerfile.jinja2 b/docker/ansible/centos-7/Dockerfile.jinja2 index 5703e349c..e206f91d1 100644 --- a/docker/ansible/centos-7/Dockerfile.jinja2 +++ b/docker/ansible/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "centos-7") }} +{{ docker.from("bootstrap", "centos-7", user) }} RUN set -x \ {{ ansible.centos() }} \ diff --git a/docker/ansible/debian-7/Dockerfile.jinja2 b/docker/ansible/debian-7/Dockerfile.jinja2 index 7ef6b31ce..77c307ff6 100644 --- a/docker/ansible/debian-7/Dockerfile.jinja2 +++ b/docker/ansible/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "debian-7") }} +{{ docker.from("bootstrap", "debian-7", user) }} RUN set -x \ {{ ansible.debian() }} \ diff --git a/docker/ansible/debian-8/Dockerfile.jinja2 b/docker/ansible/debian-8/Dockerfile.jinja2 index d12c259a4..8fe2772f4 100644 --- a/docker/ansible/debian-8/Dockerfile.jinja2 +++ b/docker/ansible/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "debian-8") }} +{{ docker.from("bootstrap", "debian-8", user) }} RUN set -x \ {{ ansible.debian() }} \ diff --git a/docker/ansible/debian-9/Dockerfile.jinja2 b/docker/ansible/debian-9/Dockerfile.jinja2 index 89164b59a..4158595ee 100644 --- a/docker/ansible/debian-9/Dockerfile.jinja2 +++ b/docker/ansible/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "debian-9") }} +{{ docker.from("bootstrap", "debian-9", user) }} RUN set -x \ {{ ansible.debian() }} \ diff --git a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 index d5be32a63..ec179eac4 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-12.04") }} +{{ docker.from("bootstrap", "ubuntu-12.04", user) }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 index e5c6701e8..c88966a69 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-14.04") }} +{{ docker.from("bootstrap", "ubuntu-14.04", user) }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 index 0558e6f27..aeddf178b 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-15.04") }} +{{ docker.from("bootstrap", "ubuntu-15.04", user) }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 index 652d0057b..08bae0f25 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-15.10") }} +{{ docker.from("bootstrap", "ubuntu-15.10", user) }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 index 6ecc0c715..d223a5b98 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-16.04") }} +{{ docker.from("bootstrap", "ubuntu-16.04", user) }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 index 4a6bcf6e1..562aff95c 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-17.04") }} +{{ docker.from("bootstrap", "ubuntu-17.04", user) }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/apache-dev/alpine/Dockerfile.jinja2 b/docker/apache-dev/alpine/Dockerfile.jinja2 index 57d43de6d..fb13290d6 100644 --- a/docker/apache-dev/alpine/Dockerfile.jinja2 +++ b/docker/apache-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "alpine") }} +{{ docker.from("apache", "alpine", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/centos-7/Dockerfile.jinja2 b/docker/apache-dev/centos-7/Dockerfile.jinja2 index 3f5cf95c0..29b416c38 100644 --- a/docker/apache-dev/centos-7/Dockerfile.jinja2 +++ b/docker/apache-dev/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "centos-7") }} +{{ docker.from("apache", "centos-7", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/debian-10/Dockerfile.jinja2 b/docker/apache-dev/debian-10/Dockerfile.jinja2 index 2fc8fb790..88839c406 100644 --- a/docker/apache-dev/debian-10/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "debian-10") }} +{{ docker.from("apache", "debian-10", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/debian-7/Dockerfile.jinja2 b/docker/apache-dev/debian-7/Dockerfile.jinja2 index da7813eb4..af718294c 100644 --- a/docker/apache-dev/debian-7/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "debian-7") }} +{{ docker.from("apache", "debian-7", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/debian-8/Dockerfile.jinja2 b/docker/apache-dev/debian-8/Dockerfile.jinja2 index d0d1bf868..23670bf0e 100644 --- a/docker/apache-dev/debian-8/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "debian-8") }} +{{ docker.from("apache", "debian-8", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/debian-9/Dockerfile.jinja2 b/docker/apache-dev/debian-9/Dockerfile.jinja2 index a8413123e..efc0ad866 100644 --- a/docker/apache-dev/debian-9/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "debian-9") }} +{{ docker.from("apache", "debian-9", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 index b5f87c92e..559267c0b 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-12.04") }} +{{ docker.from("apache", "ubuntu-12.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 index 6c2a9fd10..340d42f8b 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-14.04") }} +{{ docker.from("apache", "ubuntu-14.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 index 42ccf09c2..5d7266890 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-15.04") }} +{{ docker.from("apache", "ubuntu-15.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 index dc283b259..38aa3dda2 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-15.10") }} +{{ docker.from("apache", "ubuntu-15.10", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 index 53c1d465e..524618c29 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-16.04") }} +{{ docker.from("apache", "ubuntu-16.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 index 85982e937..fd6476d8c 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-16.10") }} +{{ docker.from("apache", "ubuntu-16.10", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 index d325af421..b8c4ff28a 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-17.04") }} +{{ docker.from("apache", "ubuntu-17.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 index e59968e19..806ffa9c6 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-17.10") }} +{{ docker.from("apache", "ubuntu-17.10", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 index ca767b906..6a5a4e92b 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "ubuntu-18.04") }} +{{ docker.from("apache", "ubuntu-18.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/apache/alpine/Dockerfile.jinja2 b/docker/apache/alpine/Dockerfile.jinja2 index 51384b363..8595255b5 100644 --- a/docker/apache/alpine/Dockerfile.jinja2 +++ b/docker/apache/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "alpine") }} +{{ docker.from("base", "alpine", user) }} {{ environment.web() }} diff --git a/docker/apache/centos-7/Dockerfile.jinja2 b/docker/apache/centos-7/Dockerfile.jinja2 index cba7ef987..470c03e35 100644 --- a/docker/apache/centos-7/Dockerfile.jinja2 +++ b/docker/apache/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "centos-7") }} +{{ docker.from("base", "centos-7", user) }} {{ environment.web() }} diff --git a/docker/apache/debian-10/Dockerfile.jinja2 b/docker/apache/debian-10/Dockerfile.jinja2 index 84d038765..fbc1559c4 100644 --- a/docker/apache/debian-10/Dockerfile.jinja2 +++ b/docker/apache/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-10") }} +{{ docker.from("base", "debian-10", user) }} {{ environment.web() }} diff --git a/docker/apache/debian-7/Dockerfile.jinja2 b/docker/apache/debian-7/Dockerfile.jinja2 index 563c057f0..4c97fde66 100644 --- a/docker/apache/debian-7/Dockerfile.jinja2 +++ b/docker/apache/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-7") }} +{{ docker.from("base", "debian-7", user) }} {{ environment.web() }} diff --git a/docker/apache/debian-8/Dockerfile.jinja2 b/docker/apache/debian-8/Dockerfile.jinja2 index 05c23a9a5..5409b70e2 100644 --- a/docker/apache/debian-8/Dockerfile.jinja2 +++ b/docker/apache/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-8") }} +{{ docker.from("base", "debian-8", user) }} {{ environment.web() }} diff --git a/docker/apache/debian-9/Dockerfile.jinja2 b/docker/apache/debian-9/Dockerfile.jinja2 index e66ee9f3c..f1151e1a3 100644 --- a/docker/apache/debian-9/Dockerfile.jinja2 +++ b/docker/apache/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-9") }} +{{ docker.from("base", "debian-9", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 index f0ff6eb5b..f00752109 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-12.04") }} +{{ docker.from("base", "ubuntu-12.04", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 index 5f69ea7ac..7aa283465 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-14.04") }} +{{ docker.from("base", "ubuntu-14.04", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 index 53ae8079c..5d116f629 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-15.04") }} +{{ docker.from("base", "ubuntu-15.04", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 index dd2bf51ba..5a73a2377 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-15.10") }} +{{ docker.from("base", "ubuntu-15.10", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 index 25481003b..b8344fc2f 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-16.04") }} +{{ docker.from("base", "ubuntu-16.04", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 index e0665f542..4ddbbbe90 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-16.10") }} +{{ docker.from("base", "ubuntu-16.10", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-17.04/Dockerfile.jinja2 b/docker/apache/ubuntu-17.04/Dockerfile.jinja2 index 7a0ff4c89..b1fc8ff69 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-17.04") }} +{{ docker.from("base", "ubuntu-17.04", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-17.10/Dockerfile.jinja2 b/docker/apache/ubuntu-17.10/Dockerfile.jinja2 index 53a22a864..dd165d292 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-17.10") }} +{{ docker.from("base", "ubuntu-17.10", user) }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-18.04/Dockerfile.jinja2 b/docker/apache/ubuntu-18.04/Dockerfile.jinja2 index d3bfc2bdc..d1a1aacb2 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-18.04") }} +{{ docker.from("base", "ubuntu-18.04", user) }} {{ environment.web() }} diff --git a/docker/base-app/alpine/Dockerfile.jinja2 b/docker/base-app/alpine/Dockerfile.jinja2 index e0bac3426..b83d4aea6 100644 --- a/docker/base-app/alpine/Dockerfile.jinja2 +++ b/docker/base-app/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "alpine") }} +{{ docker.from("base", "alpine", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/centos-7/Dockerfile.jinja2 b/docker/base-app/centos-7/Dockerfile.jinja2 index 09229c21b..ae34ae96f 100644 --- a/docker/base-app/centos-7/Dockerfile.jinja2 +++ b/docker/base-app/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "centos-7") }} +{{ docker.from("base", "centos-7", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/debian-10/Dockerfile.jinja2 b/docker/base-app/debian-10/Dockerfile.jinja2 index adfaae607..b5be7a229 100644 --- a/docker/base-app/debian-10/Dockerfile.jinja2 +++ b/docker/base-app/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-10") }} +{{ docker.from("base", "debian-10", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/debian-7/Dockerfile.jinja2 b/docker/base-app/debian-7/Dockerfile.jinja2 index 452e0dabf..d93b3d17f 100644 --- a/docker/base-app/debian-7/Dockerfile.jinja2 +++ b/docker/base-app/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-7") }} +{{ docker.from("base", "debian-7", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/debian-8/Dockerfile.jinja2 b/docker/base-app/debian-8/Dockerfile.jinja2 index 82d2a7cf3..07982484b 100644 --- a/docker/base-app/debian-8/Dockerfile.jinja2 +++ b/docker/base-app/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-8") }} +{{ docker.from("base", "debian-8", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/debian-9/Dockerfile.jinja2 b/docker/base-app/debian-9/Dockerfile.jinja2 index e5818a7f6..67471e263 100644 --- a/docker/base-app/debian-9/Dockerfile.jinja2 +++ b/docker/base-app/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-9") }} +{{ docker.from("base", "debian-9", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 index a9a9ba06d..f8f8f1213 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-12.04") }} +{{ docker.from("base", "ubuntu-12.04", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 index 2e162697b..731863a1c 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-14.04") }} +{{ docker.from("base", "ubuntu-14.04", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 index 407f9cb81..f44afa045 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-15.04") }} +{{ docker.from("base", "ubuntu-15.04", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 index 868be405e..d6108ace8 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-15.10") }} +{{ docker.from("base", "ubuntu-15.10", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 index 96916b799..acac2fb2d 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-16.04") }} +{{ docker.from("base", "ubuntu-16.04", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 index 1d5ae6a85..072de87f8 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-16.10") }} +{{ docker.from("base", "ubuntu-16.10", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 index 1bfafccfb..bbb281a41 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-17.04") }} +{{ docker.from("base", "ubuntu-17.04", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 index cf23e552a..2708ab759 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-17.10") }} +{{ docker.from("base", "ubuntu-17.10", user) }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 index d1495dd24..fea79f442 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-18.04") }} +{{ docker.from("base", "ubuntu-18.04", user) }} {{ environment.baseApp() }} diff --git a/docker/base/alpine/Dockerfile.jinja2 b/docker/base/alpine/Dockerfile.jinja2 index 84af4cc8d..268003546 100644 --- a/docker/base/alpine/Dockerfile.jinja2 +++ b/docker/base/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "alpine") }} +{{ docker.from("bootstrap", "alpine", user) }} {{ environment.base() }} diff --git a/docker/base/centos-7/Dockerfile.jinja2 b/docker/base/centos-7/Dockerfile.jinja2 index fb5fe0aeb..a6d3d6e6d 100644 --- a/docker/base/centos-7/Dockerfile.jinja2 +++ b/docker/base/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "centos-7") }} +{{ docker.from("bootstrap", "centos-7", user) }} {{ environment.base() }} diff --git a/docker/base/debian-10/Dockerfile.jinja2 b/docker/base/debian-10/Dockerfile.jinja2 index 92ef7fdf9..81a240177 100644 --- a/docker/base/debian-10/Dockerfile.jinja2 +++ b/docker/base/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "debian-10") }} +{{ docker.from("bootstrap", "debian-10", user) }} {{ environment.base() }} diff --git a/docker/base/debian-7/Dockerfile.jinja2 b/docker/base/debian-7/Dockerfile.jinja2 index c004fb6bf..bde3f57ca 100644 --- a/docker/base/debian-7/Dockerfile.jinja2 +++ b/docker/base/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "debian-7") }} +{{ docker.from("bootstrap", "debian-7", user) }} {{ environment.base() }} diff --git a/docker/base/debian-8/Dockerfile.jinja2 b/docker/base/debian-8/Dockerfile.jinja2 index 37487ef88..992ce22f8 100644 --- a/docker/base/debian-8/Dockerfile.jinja2 +++ b/docker/base/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "debian-8") }} +{{ docker.from("bootstrap", "debian-8", user) }} {{ environment.base() }} diff --git a/docker/base/debian-9/Dockerfile.jinja2 b/docker/base/debian-9/Dockerfile.jinja2 index e24cf1bba..b451f2f1a 100644 --- a/docker/base/debian-9/Dockerfile.jinja2 +++ b/docker/base/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "debian-9") }} +{{ docker.from("bootstrap", "debian-9", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-12.04/Dockerfile.jinja2 index a38bce572..147151f1a 100644 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-12.04") }} +{{ docker.from("bootstrap", "ubuntu-12.04", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-14.04/Dockerfile.jinja2 b/docker/base/ubuntu-14.04/Dockerfile.jinja2 index a56ac9a0e..8561f5de9 100644 --- a/docker/base/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-14.04") }} +{{ docker.from("bootstrap", "ubuntu-14.04", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-15.04/Dockerfile.jinja2 b/docker/base/ubuntu-15.04/Dockerfile.jinja2 index 7716af57d..bf27cbdaf 100644 --- a/docker/base/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-15.04") }} +{{ docker.from("bootstrap", "ubuntu-15.04", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-15.10/Dockerfile.jinja2 b/docker/base/ubuntu-15.10/Dockerfile.jinja2 index e7fe320db..6c034549f 100644 --- a/docker/base/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-15.10") }} +{{ docker.from("bootstrap", "ubuntu-15.10", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-16.04/Dockerfile.jinja2 b/docker/base/ubuntu-16.04/Dockerfile.jinja2 index 16d8d5012..794fdb286 100644 --- a/docker/base/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-16.04") }} +{{ docker.from("bootstrap", "ubuntu-16.04", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-16.10/Dockerfile.jinja2 b/docker/base/ubuntu-16.10/Dockerfile.jinja2 index 95bc15c40..f0dcce3f0 100644 --- a/docker/base/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-16.10") }} +{{ docker.from("bootstrap", "ubuntu-16.10", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-17.04/Dockerfile.jinja2 b/docker/base/ubuntu-17.04/Dockerfile.jinja2 index 61666f0d0..659743315 100644 --- a/docker/base/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-17.04") }} +{{ docker.from("bootstrap", "ubuntu-17.04", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-17.10/Dockerfile.jinja2 b/docker/base/ubuntu-17.10/Dockerfile.jinja2 index 4e4650dac..8de3d7ccc 100644 --- a/docker/base/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-17.10") }} +{{ docker.from("bootstrap", "ubuntu-17.10", user) }} {{ environment.base() }} diff --git a/docker/base/ubuntu-18.04/Dockerfile.jinja2 b/docker/base/ubuntu-18.04/Dockerfile.jinja2 index 8e38dfca8..f6df7f273 100644 --- a/docker/base/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "ubuntu-18.04") }} +{{ docker.from("bootstrap", "ubuntu-18.04", user) }} {{ environment.base() }} diff --git a/docker/certbot/latest/Dockerfile.jinja2 b/docker/certbot/latest/Dockerfile.jinja2 index 7096f60cd..da0785b79 100644 --- a/docker/certbot/latest/Dockerfile.jinja2 +++ b/docker/certbot/latest/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap","alpine") }} +{{ docker.from("bootstrap", "alpine", user) }} {{ docker.volume('/etc/letsencrypt') }} {{ docker.volume('/var/www') }} diff --git a/docker/liquidsoap/latest/Dockerfile.jinja2 b/docker/liquidsoap/latest/Dockerfile.jinja2 index 897b4433c..df69f0822 100644 --- a/docker/liquidsoap/latest/Dockerfile.jinja2 +++ b/docker/liquidsoap/latest/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base","latest") }} +{{ docker.from("base", "latest", user) }} # Install services RUN /usr/local/bin/apt-install \ diff --git a/docker/nginx-dev/alpine/Dockerfile.jinja2 b/docker/nginx-dev/alpine/Dockerfile.jinja2 index 8f52c5b94..51af24079 100644 --- a/docker/nginx-dev/alpine/Dockerfile.jinja2 +++ b/docker/nginx-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "alpine") }} +{{ docker.from("nginx", "alpine", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/centos-7/Dockerfile.jinja2 b/docker/nginx-dev/centos-7/Dockerfile.jinja2 index 2d8e5c132..8020c115b 100644 --- a/docker/nginx-dev/centos-7/Dockerfile.jinja2 +++ b/docker/nginx-dev/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "centos-7") }} +{{ docker.from("nginx", "centos-7", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/debian-10/Dockerfile.jinja2 b/docker/nginx-dev/debian-10/Dockerfile.jinja2 index f37f1ea7d..6421f1037 100644 --- a/docker/nginx-dev/debian-10/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "debian-10") }} +{{ docker.from("nginx", "debian-10", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/debian-7/Dockerfile.jinja2 b/docker/nginx-dev/debian-7/Dockerfile.jinja2 index 93312e20a..4bd97088d 100644 --- a/docker/nginx-dev/debian-7/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "debian-7") }} +{{ docker.from("nginx", "debian-7", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/debian-8/Dockerfile.jinja2 b/docker/nginx-dev/debian-8/Dockerfile.jinja2 index 49ce203dc..85cbf99c6 100644 --- a/docker/nginx-dev/debian-8/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "debian-8") }} +{{ docker.from("nginx", "debian-8", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/debian-9/Dockerfile.jinja2 b/docker/nginx-dev/debian-9/Dockerfile.jinja2 index 51d446f92..523b7dacf 100644 --- a/docker/nginx-dev/debian-9/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "debian-9") }} +{{ docker.from("nginx", "debian-9", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 index 971727ada..decaa1f1b 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-12.04") }} +{{ docker.from("nginx", "ubuntu-12.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 index da04d9517..01b39b8f3 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-14.04") }} +{{ docker.from("nginx", "ubuntu-14.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 index 7a21ddd99..3c45e2d23 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-15.04") }} +{{ docker.from("nginx", "ubuntu-15.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 index 73633cffd..760020ca6 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-15.10") }} +{{ docker.from("nginx", "ubuntu-15.10", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 index 2d43c04b1..395189328 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-16.04") }} +{{ docker.from("nginx", "ubuntu-16.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 index cfb579db6..9c98e046f 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-16.10") }} +{{ docker.from("nginx", "ubuntu-16.10", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 index 91c5cb8d0..a2bb47814 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-17.04") }} +{{ docker.from("nginx", "ubuntu-17.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 index d4ac06702..a4233e384 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-17.10") }} +{{ docker.from("nginx", "ubuntu-17.10", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 index 366236b5e..f6d3a3ed2 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "ubuntu-18.04") }} +{{ docker.from("nginx", "ubuntu-18.04", user) }} {{ environment.webDevelopment() }} diff --git a/docker/nginx/alpine/Dockerfile.jinja2 b/docker/nginx/alpine/Dockerfile.jinja2 index c7033f9b9..392ec0679 100644 --- a/docker/nginx/alpine/Dockerfile.jinja2 +++ b/docker/nginx/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "alpine") }} +{{ docker.from("base", "alpine", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/centos-7/Dockerfile.jinja2 b/docker/nginx/centos-7/Dockerfile.jinja2 index 961199bb4..7414e6197 100644 --- a/docker/nginx/centos-7/Dockerfile.jinja2 +++ b/docker/nginx/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "centos-7") }} +{{ docker.from("base", "centos-7", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-10/Dockerfile.jinja2 b/docker/nginx/debian-10/Dockerfile.jinja2 index 76014601d..8eda6965e 100644 --- a/docker/nginx/debian-10/Dockerfile.jinja2 +++ b/docker/nginx/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-10") }} +{{ docker.from("base", "debian-10", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-7/Dockerfile.jinja2 b/docker/nginx/debian-7/Dockerfile.jinja2 index abb19cad8..e37e786eb 100644 --- a/docker/nginx/debian-7/Dockerfile.jinja2 +++ b/docker/nginx/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-7") }} +{{ docker.from("base", "debian-7", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-8/Dockerfile.jinja2 b/docker/nginx/debian-8/Dockerfile.jinja2 index 546cadc59..b0710b65c 100644 --- a/docker/nginx/debian-8/Dockerfile.jinja2 +++ b/docker/nginx/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-8") }} +{{ docker.from("base", "debian-8", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-9/Dockerfile.jinja2 b/docker/nginx/debian-9/Dockerfile.jinja2 index 57ddf2971..b2adb6cea 100644 --- a/docker/nginx/debian-9/Dockerfile.jinja2 +++ b/docker/nginx/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "debian-9") }} +{{ docker.from("base", "debian-9", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 index 58d8dc0ba..e5eff0f23 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-12.04") }} +{{ docker.from("base", "ubuntu-12.04", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 index df578015a..67c0cc6e1 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-14.04") }} +{{ docker.from("base", "ubuntu-14.04", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 index 7e7341d27..b73735f6c 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-15.04") }} +{{ docker.from("base", "ubuntu-15.04", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 index 26a4d4448..21d458888 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-15.10") }} +{{ docker.from("base", "ubuntu-15.10", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 index 867a3badb..64784b235 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-16.04") }} +{{ docker.from("base", "ubuntu-16.04", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 index 4b0dfd55a..39705e3fd 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-16.10") }} +{{ docker.from("base", "ubuntu-16.10", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 index 4ef4cc124..38517d575 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-17.04") }} +{{ docker.from("base", "ubuntu-17.04", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 index bfaa2244c..1badc316d 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-17.10") }} +{{ docker.from("base", "ubuntu-17.10", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 index 0dba66880..1c5ac20d8 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "ubuntu-18.04") }} +{{ docker.from("base", "ubuntu-18.04", user) }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/php-apache/5.6/Dockerfile.jinja2 b/docker/php-apache/5.6/Dockerfile.jinja2 index c5a340291..2db736604 100644 --- a/docker/php-apache/5.6/Dockerfile.jinja2 +++ b/docker/php-apache/5.6/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "5.6") }} +{{ docker.from("php", "5.6", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.0/Dockerfile.jinja2 b/docker/php-apache/7.0/Dockerfile.jinja2 index 4e656bcc4..251bb160b 100644 --- a/docker/php-apache/7.0/Dockerfile.jinja2 +++ b/docker/php-apache/7.0/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.0") }} +{{ docker.from("php", "7.0", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 b/docker/php-apache/7.1-alpine/Dockerfile.jinja2 index b4b06a628..922932d4d 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.1-alpine") }} +{{ docker.from("php", "7.1-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.1/Dockerfile.jinja2 b/docker/php-apache/7.1/Dockerfile.jinja2 index fdec6e0a6..0af2dfc41 100644 --- a/docker/php-apache/7.1/Dockerfile.jinja2 +++ b/docker/php-apache/7.1/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.1") }} +{{ docker.from("php", "7.1", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 b/docker/php-apache/7.2-alpine/Dockerfile.jinja2 index 9088053de..dae387eba 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.2-alpine") }} +{{ docker.from("php", "7.2-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.2/Dockerfile.jinja2 b/docker/php-apache/7.2/Dockerfile.jinja2 index acc3b1cb5..7f684dd0d 100644 --- a/docker/php-apache/7.2/Dockerfile.jinja2 +++ b/docker/php-apache/7.2/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.2") }} +{{ docker.from("php", "7.2", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 b/docker/php-apache/7.3-alpine/Dockerfile.jinja2 index 0a5d39962..7a87624b6 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.3-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.3-alpine") }} +{{ docker.from("php", "7.3-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.3/Dockerfile.jinja2 b/docker/php-apache/7.3/Dockerfile.jinja2 index d9056be53..4b3f817df 100644 --- a/docker/php-apache/7.3/Dockerfile.jinja2 +++ b/docker/php-apache/7.3/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.3") }} +{{ docker.from("php", "7.3", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 b/docker/php-apache/7.4-alpine/Dockerfile.jinja2 index aec341e3e..26ec932bb 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.4-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.4-alpine") }} +{{ docker.from("php", "7.4-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.4/Dockerfile.jinja2 b/docker/php-apache/7.4/Dockerfile.jinja2 index c909b094e..ff29df1f4 100644 --- a/docker/php-apache/7.4/Dockerfile.jinja2 +++ b/docker/php-apache/7.4/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.4") }} +{{ docker.from("php", "7.4", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 index 9c90154e7..cf372a237 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.0-alpine") }} +{{ docker.from("php", "8.0-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.0/Dockerfile.jinja2 b/docker/php-apache/8.0/Dockerfile.jinja2 index 8b5669e52..1c9443613 100644 --- a/docker/php-apache/8.0/Dockerfile.jinja2 +++ b/docker/php-apache/8.0/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.0") }} +{{ docker.from("php", "8.0", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 index 0fee44954..10d72d9bb 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7-php56") }} +{{ docker.from("php", "centos-7-php56", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 index 662be2fcf..b2207b9db 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7-php7") }} +{{ docker.from("php", "centos-7-php7", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7/Dockerfile.jinja2 b/docker/php-apache/centos-7/Dockerfile.jinja2 index 1d0c9c421..23044aca4 100644 --- a/docker/php-apache/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7") }} +{{ docker.from("php", "centos-7", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-10/Dockerfile.jinja2 b/docker/php-apache/debian-10/Dockerfile.jinja2 index ed56ca48a..428b45078 100644 --- a/docker/php-apache/debian-10/Dockerfile.jinja2 +++ b/docker/php-apache/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-10") }} +{{ docker.from("php", "debian-10", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-7/Dockerfile.jinja2 b/docker/php-apache/debian-7/Dockerfile.jinja2 index 34c188bdf..ec969a984 100644 --- a/docker/php-apache/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-7") }} +{{ docker.from("php", "debian-7", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 index dd4392727..9441817d8 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-8-php7") }} +{{ docker.from("php", "debian-8-php7", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-8/Dockerfile.jinja2 b/docker/php-apache/debian-8/Dockerfile.jinja2 index 86ddfa3b7..4940762c5 100644 --- a/docker/php-apache/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-8") }} +{{ docker.from("php", "debian-8", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-9/Dockerfile.jinja2 b/docker/php-apache/debian-9/Dockerfile.jinja2 index ea8031e86..a102f2896 100644 --- a/docker/php-apache/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-9") }} +{{ docker.from("php", "debian-9", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 index c14199870..78029221c 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-12.04") }} +{{ docker.from("php", "ubuntu-12.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 index 36fba97b0..2735b8b5b 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-14.04") }} +{{ docker.from("php", "ubuntu-14.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 index e90c50e36..7212adf3e 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-15.04") }} +{{ docker.from("php", "ubuntu-15.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 index 72f309781..3e8bbd6e9 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-15.10") }} +{{ docker.from("php", "ubuntu-15.10", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 index 7439946f1..b6c81a6bb 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-16.04") }} +{{ docker.from("php", "ubuntu-16.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 index 294b0e545..4601a7911 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-16.10") }} +{{ docker.from("php", "ubuntu-16.10", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 index 819accab9..10b5cb5aa 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-17.04") }} +{{ docker.from("php", "ubuntu-17.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 index be9266856..c519cc97b 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-17.10") }} +{{ docker.from("php", "ubuntu-17.10", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 index 42a00a2d1..64bfc423a 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-18.04") }} +{{ docker.from("php", "ubuntu-18.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-dev/5.6/Dockerfile.jinja2 b/docker/php-dev/5.6/Dockerfile.jinja2 index 2784a4e3c..699d7bbf3 100644 --- a/docker/php-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-dev/5.6/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "5.6") }} +{{ docker.from("php", "5.6", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.0/Dockerfile.jinja2 b/docker/php-dev/7.0/Dockerfile.jinja2 index d7a9901b7..acb44b14b 100644 --- a/docker/php-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-dev/7.0/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.0") }} +{{ docker.from("php", "7.0", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-dev/7.1-alpine/Dockerfile.jinja2 index 2e48ff0f9..32e57f325 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.1-alpine") }} +{{ docker.from("php", "7.1-alpine", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.1/Dockerfile.jinja2 b/docker/php-dev/7.1/Dockerfile.jinja2 index 86f846804..0beb01540 100644 --- a/docker/php-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-dev/7.1/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.1") }} +{{ docker.from("php", "7.1", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-dev/7.2-alpine/Dockerfile.jinja2 index 7fd85c2c1..bff14d2f5 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.2-alpine") }} +{{ docker.from("php", "7.2-alpine", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.2/Dockerfile.jinja2 b/docker/php-dev/7.2/Dockerfile.jinja2 index 7a89a2e2a..88a209e72 100644 --- a/docker/php-dev/7.2/Dockerfile.jinja2 +++ b/docker/php-dev/7.2/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.2") }} +{{ docker.from("php", "7.2", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-dev/7.3-alpine/Dockerfile.jinja2 index c67e711c0..e0e099c17 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.3-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.3-alpine") }} +{{ docker.from("php", "7.3-alpine", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.3/Dockerfile.jinja2 b/docker/php-dev/7.3/Dockerfile.jinja2 index 54a1dcc8c..c2b8c2f21 100644 --- a/docker/php-dev/7.3/Dockerfile.jinja2 +++ b/docker/php-dev/7.3/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.3") }} +{{ docker.from("php", "7.3", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-dev/7.4-alpine/Dockerfile.jinja2 index 9724ff1e6..c9062e252 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.4-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.4-alpine") }} +{{ docker.from("php", "7.4-alpine", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.4/Dockerfile.jinja2 b/docker/php-dev/7.4/Dockerfile.jinja2 index c7a70850b..c7a235cc5 100644 --- a/docker/php-dev/7.4/Dockerfile.jinja2 +++ b/docker/php-dev/7.4/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.4") }} +{{ docker.from("php", "7.4", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 index 99986a428..bb991a931 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.0-alpine") }} +{{ docker.from("php", "8.0-alpine", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.0/Dockerfile.jinja2 b/docker/php-dev/8.0/Dockerfile.jinja2 index f4c82a53c..53f206137 100644 --- a/docker/php-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-dev/8.0/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.0") }} +{{ docker.from("php", "8.0", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 index e039c4ec6..13fd69b16 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7-php56") }} +{{ docker.from("php", "centos-7-php56", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 index ce1e84eff..d978bc56f 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7-php7") }} +{{ docker.from("php", "centos-7-php7", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/centos-7/Dockerfile.jinja2 b/docker/php-dev/centos-7/Dockerfile.jinja2 index bf30efd47..be1d708fd 100644 --- a/docker/php-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7") }} +{{ docker.from("php", "centos-7", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-10/Dockerfile.jinja2 b/docker/php-dev/debian-10/Dockerfile.jinja2 index 68c8e7f6c..4daaa2ea4 100644 --- a/docker/php-dev/debian-10/Dockerfile.jinja2 +++ b/docker/php-dev/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-10") }} +{{ docker.from("php", "debian-10", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-7/Dockerfile.jinja2 b/docker/php-dev/debian-7/Dockerfile.jinja2 index 08ddcc85a..a773a5e94 100644 --- a/docker/php-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-dev/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-7") }} +{{ docker.from("php", "debian-7", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 index 05ef2ed1f..0e29a9919 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-8-php7") }} +{{ docker.from("php", "debian-8-php7", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-8/Dockerfile.jinja2 b/docker/php-dev/debian-8/Dockerfile.jinja2 index b668f7401..15c617407 100644 --- a/docker/php-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-dev/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-8") }} +{{ docker.from("php", "debian-8", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-9/Dockerfile.jinja2 b/docker/php-dev/debian-9/Dockerfile.jinja2 index b1f16cece..8c9b2df24 100644 --- a/docker/php-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-dev/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-9") }} +{{ docker.from("php", "debian-9", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 index 119ce01e3..4a6929256 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-12.04") }} +{{ docker.from("php", "ubuntu-12.04", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 index 78bea4553..9f3ca5b84 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-14.04") }} +{{ docker.from("php", "ubuntu-14.04", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 index 43f9b2d82..c372defcf 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-15.04") }} +{{ docker.from("php", "ubuntu-15.04", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 index f0f76b8dc..1daddfcb3 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-15.10") }} +{{ docker.from("php", "ubuntu-15.10", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 index 31260dbf8..c179ffe3e 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-16.04") }} +{{ docker.from("php", "ubuntu-16.04", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 index 23bb414f5..6b249e2e7 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-16.10") }} +{{ docker.from("php", "ubuntu-16.10", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 index 68e0f22b1..8b117eda6 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-17.04") }} +{{ docker.from("php", "ubuntu-17.04", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 index 0c0bd6853..0f9577bbe 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-17.10") }} +{{ docker.from("php", "ubuntu-17.10", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 index f868ff2ff..a4087d33b 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-18.04") }} +{{ docker.from("php", "ubuntu-18.04", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx/5.6/Dockerfile.jinja2 b/docker/php-nginx/5.6/Dockerfile.jinja2 index 0093f5432..cf21d8e8d 100644 --- a/docker/php-nginx/5.6/Dockerfile.jinja2 +++ b/docker/php-nginx/5.6/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "5.6") }} +{{ docker.from("php", "5.6", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.0/Dockerfile.jinja2 b/docker/php-nginx/7.0/Dockerfile.jinja2 index 39af76493..a8d49a92b 100644 --- a/docker/php-nginx/7.0/Dockerfile.jinja2 +++ b/docker/php-nginx/7.0/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.0") }} +{{ docker.from("php", "7.0", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 index fd23f8f8a..f4677e831 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.1-alpine") }} +{{ docker.from("php", "7.1-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.1/Dockerfile.jinja2 b/docker/php-nginx/7.1/Dockerfile.jinja2 index 0d89f2e50..b6f3d0f5d 100644 --- a/docker/php-nginx/7.1/Dockerfile.jinja2 +++ b/docker/php-nginx/7.1/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.1") }} +{{ docker.from("php", "7.1", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 index 6801b1d54..bb8b44e0d 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.2-alpine") }} +{{ docker.from("php", "7.2-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.2/Dockerfile.jinja2 b/docker/php-nginx/7.2/Dockerfile.jinja2 index d977be809..a1baf12c9 100644 --- a/docker/php-nginx/7.2/Dockerfile.jinja2 +++ b/docker/php-nginx/7.2/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.2") }} +{{ docker.from("php", "7.2", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 index f15b17152..d8226754c 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.3-alpine") }} +{{ docker.from("php", "7.3-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.3/Dockerfile.jinja2 b/docker/php-nginx/7.3/Dockerfile.jinja2 index e92b76797..9061af9a3 100644 --- a/docker/php-nginx/7.3/Dockerfile.jinja2 +++ b/docker/php-nginx/7.3/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.3") }} +{{ docker.from("php", "7.3", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 index b698bdf63..fea8c4f08 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.4-alpine") }} +{{ docker.from("php", "7.4-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.4/Dockerfile.jinja2 b/docker/php-nginx/7.4/Dockerfile.jinja2 index 27fee4a33..5974c69a5 100644 --- a/docker/php-nginx/7.4/Dockerfile.jinja2 +++ b/docker/php-nginx/7.4/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "7.4") }} +{{ docker.from("php", "7.4", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 index 6d867c42b..4ed9fce77 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.0-alpine") }} +{{ docker.from("php", "8.0-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.0/Dockerfile.jinja2 b/docker/php-nginx/8.0/Dockerfile.jinja2 index 53801851b..850395936 100644 --- a/docker/php-nginx/8.0/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.0") }} +{{ docker.from("php", "8.0", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 index a478b9c38..c302494ac 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7-php56") }} +{{ docker.from("php", "centos-7-php56", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 index 36931d172..af4f75726 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7-php7") }} +{{ docker.from("php", "centos-7-php7", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7/Dockerfile.jinja2 b/docker/php-nginx/centos-7/Dockerfile.jinja2 index cf6399370..5e0ba6c52 100644 --- a/docker/php-nginx/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "centos-7") }} +{{ docker.from("php", "centos-7", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-10/Dockerfile.jinja2 b/docker/php-nginx/debian-10/Dockerfile.jinja2 index 117abb6c7..6125a5a58 100644 --- a/docker/php-nginx/debian-10/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-10") }} +{{ docker.from("php", "debian-10", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-7/Dockerfile.jinja2 b/docker/php-nginx/debian-7/Dockerfile.jinja2 index 6d1327571..bd2f0bb82 100644 --- a/docker/php-nginx/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-7") }} +{{ docker.from("php", "debian-7", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 index 2cd5d9326..ec1cc03df 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-8-php7") }} +{{ docker.from("php", "debian-8-php7", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-8/Dockerfile.jinja2 b/docker/php-nginx/debian-8/Dockerfile.jinja2 index bc075df69..bee91c379 100644 --- a/docker/php-nginx/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-8") }} +{{ docker.from("php", "debian-8", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-9/Dockerfile.jinja2 b/docker/php-nginx/debian-9/Dockerfile.jinja2 index cbcddf811..ee60111a3 100644 --- a/docker/php-nginx/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-9/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "debian-9") }} +{{ docker.from("php", "debian-9", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 index 893418fa5..14edac582 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-12.04") }} +{{ docker.from("php", "ubuntu-12.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 index a55c4827d..77c413c39 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-14.04") }} +{{ docker.from("php", "ubuntu-14.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 index 2a6a21cc7..e7699b996 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-15.04") }} +{{ docker.from("php", "ubuntu-15.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 index fb951871c..5a39c3065 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-15.10") }} +{{ docker.from("php", "ubuntu-15.10", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 index 22b062520..3a9d4a770 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-16.04") }} +{{ docker.from("php", "ubuntu-16.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 index 5d3edb8f0..f9aad1413 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-16.10") }} +{{ docker.from("php", "ubuntu-16.10", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 index 032a9934b..9b2bab5ce 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-17.04") }} +{{ docker.from("php", "ubuntu-17.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 index 6d11cd573..9f0784149 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-17.10") }} +{{ docker.from("php", "ubuntu-17.10", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 index 5a32a47aa..cd39201b6 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "ubuntu-18.04") }} +{{ docker.from("php", "ubuntu-18.04", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/sphinx/latest/Dockerfile.jinja2 b/docker/sphinx/latest/Dockerfile.jinja2 index 6e2ad14bd..8a5ef97ff 100644 --- a/docker/sphinx/latest/Dockerfile.jinja2 +++ b/docker/sphinx/latest/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap","alpine") }} +{{ docker.from("bootstrap", "alpine", user) }} RUN set -x \ {{ sphinx.alpine() }} \ diff --git a/docker/varnish/latest/Dockerfile.jinja2 b/docker/varnish/latest/Dockerfile.jinja2 index 23dd98c0f..c047f7eea 100644 --- a/docker/varnish/latest/Dockerfile.jinja2 +++ b/docker/varnish/latest/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base","alpine") }} +{{ docker.from("base", "alpine", user) }} {{ varnish.env() }} diff --git a/docker/vsftp/latest/Dockerfile.jinja2 b/docker/vsftp/latest/Dockerfile.jinja2 index f0ae87634..1023521aa 100644 --- a/docker/vsftp/latest/Dockerfile.jinja2 +++ b/docker/vsftp/latest/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "latest") }} +{{ docker.from("base", "latest", user) }} {{ environment.ftp() }} From 24d835cc2ae607bf015ddecd4177994adf9fdedc Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 27 Jul 2022 14:20:59 -0700 Subject: [PATCH 022/123] baselayout uses "from" macro --- template/Dockerfile/baselayout.jinja2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index 883d79450..6f180d3fc 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -1,8 +1,9 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/tools.jinja2' as tools %} {% macro dockerStage() %} # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +{{ docker.from("toolbox", "latest", user) }} AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ From 24f651310df72cfed18241cba34c0160f2ffc950 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 27 Jul 2022 14:31:19 -0700 Subject: [PATCH 023/123] add "user" to "from" macro --- docker/ansible/alpine/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/ansible/ubuntu-17.04/Dockerfile | 2 +- docker/apache-dev/alpine/Dockerfile | 2 +- docker/apache-dev/centos-7/Dockerfile | 2 +- docker/apache-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-17.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-17.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-18.04/Dockerfile | 2 +- docker/apache/alpine/Dockerfile | 2 +- docker/apache/centos-7/Dockerfile | 2 +- docker/apache/debian-10/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/apache/ubuntu-16.10/Dockerfile | 2 +- docker/apache/ubuntu-17.04/Dockerfile | 2 +- docker/apache/ubuntu-17.10/Dockerfile | 2 +- docker/apache/ubuntu-18.04/Dockerfile | 2 +- docker/base-app/alpine/Dockerfile | 2 +- docker/base-app/centos-7/Dockerfile | 2 +- docker/base-app/debian-10/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-app/ubuntu-16.10/Dockerfile | 2 +- docker/base-app/ubuntu-17.04/Dockerfile | 2 +- docker/base-app/ubuntu-17.10/Dockerfile | 2 +- docker/base-app/ubuntu-18.04/Dockerfile | 2 +- docker/base/alpine/Dockerfile | 2 +- docker/base/centos-7/Dockerfile | 2 +- docker/base/debian-10/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/base/ubuntu-16.10/Dockerfile | 2 +- docker/base/ubuntu-17.04/Dockerfile | 2 +- docker/base/ubuntu-17.10/Dockerfile | 2 +- docker/base/ubuntu-18.04/Dockerfile | 2 +- docker/bootstrap/alpine/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-10/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/bootstrap/ubuntu-16.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-17.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-17.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-18.04/Dockerfile | 2 +- docker/certbot/latest/Dockerfile | 2 +- docker/liquidsoap/latest/Dockerfile | 2 +- docker/nginx-dev/alpine/Dockerfile | 2 +- docker/nginx-dev/centos-7/Dockerfile | 2 +- docker/nginx-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-17.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-17.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-18.04/Dockerfile | 2 +- docker/nginx/alpine/Dockerfile | 2 +- docker/nginx/centos-7/Dockerfile | 2 +- docker/nginx/debian-10/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/nginx/ubuntu-16.10/Dockerfile | 2 +- docker/nginx/ubuntu-17.04/Dockerfile | 2 +- docker/nginx/ubuntu-17.10/Dockerfile | 2 +- docker/nginx/ubuntu-18.04/Dockerfile | 2 +- docker/php-apache/5.6/Dockerfile | 2 +- docker/php-apache/7.0/Dockerfile | 2 +- docker/php-apache/7.1-alpine/Dockerfile | 2 +- docker/php-apache/7.1/Dockerfile | 2 +- docker/php-apache/7.2-alpine/Dockerfile | 2 +- docker/php-apache/7.2/Dockerfile | 2 +- docker/php-apache/7.3-alpine/Dockerfile | 2 +- docker/php-apache/7.3/Dockerfile | 2 +- docker/php-apache/7.4-alpine/Dockerfile | 2 +- docker/php-apache/7.4/Dockerfile | 2 +- docker/php-apache/8.0-alpine/Dockerfile | 2 +- docker/php-apache/8.0/Dockerfile | 2 +- docker/php-apache/centos-7-php56/Dockerfile | 2 +- docker/php-apache/centos-7-php7/Dockerfile | 2 +- docker/php-apache/centos-7/Dockerfile | 2 +- docker/php-apache/debian-10/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-apache/ubuntu-16.10/Dockerfile | 2 +- docker/php-apache/ubuntu-17.04/Dockerfile | 2 +- docker/php-apache/ubuntu-17.10/Dockerfile | 2 +- docker/php-apache/ubuntu-18.04/Dockerfile | 2 +- docker/php-dev/5.6/Dockerfile | 2 +- docker/php-dev/7.0/Dockerfile | 2 +- docker/php-dev/7.1-alpine/Dockerfile | 2 +- docker/php-dev/7.1/Dockerfile | 2 +- docker/php-dev/7.2-alpine/Dockerfile | 2 +- docker/php-dev/7.2/Dockerfile | 2 +- docker/php-dev/7.3-alpine/Dockerfile | 2 +- docker/php-dev/7.3/Dockerfile | 2 +- docker/php-dev/7.4-alpine/Dockerfile | 2 +- docker/php-dev/7.4/Dockerfile | 2 +- docker/php-dev/8.0-alpine/Dockerfile | 2 +- docker/php-dev/8.0/Dockerfile | 2 +- docker/php-dev/centos-7-php56/Dockerfile | 2 +- docker/php-dev/centos-7-php7/Dockerfile | 2 +- docker/php-dev/centos-7/Dockerfile | 2 +- docker/php-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/php-dev/ubuntu-17.04/Dockerfile | 2 +- docker/php-dev/ubuntu-17.10/Dockerfile | 2 +- docker/php-dev/ubuntu-18.04/Dockerfile | 2 +- docker/php-nginx/5.6/Dockerfile | 2 +- docker/php-nginx/7.0/Dockerfile | 2 +- docker/php-nginx/7.1-alpine/Dockerfile | 2 +- docker/php-nginx/7.1/Dockerfile | 2 +- docker/php-nginx/7.2-alpine/Dockerfile | 2 +- docker/php-nginx/7.2/Dockerfile | 2 +- docker/php-nginx/7.3-alpine/Dockerfile | 2 +- docker/php-nginx/7.3/Dockerfile | 2 +- docker/php-nginx/7.4-alpine/Dockerfile | 2 +- docker/php-nginx/7.4/Dockerfile | 2 +- docker/php-nginx/8.0-alpine/Dockerfile | 2 +- docker/php-nginx/8.0/Dockerfile | 2 +- docker/php-nginx/centos-7-php56/Dockerfile | 2 +- docker/php-nginx/centos-7-php7/Dockerfile | 2 +- docker/php-nginx/centos-7/Dockerfile | 2 +- docker/php-nginx/debian-10/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-nginx/ubuntu-16.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-17.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-17.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-18.04/Dockerfile | 2 +- docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1-alpine/Dockerfile | 2 +- docker/php-official/7.1/Dockerfile | 2 +- docker/php-official/7.2-alpine/Dockerfile | 2 +- docker/php-official/7.2/Dockerfile | 2 +- docker/php-official/7.3-alpine/Dockerfile | 2 +- docker/php-official/7.3/Dockerfile | 2 +- docker/php-official/7.4-alpine/Dockerfile | 2 +- docker/php-official/7.4/Dockerfile | 2 +- docker/php-official/8.0-alpine/Dockerfile | 2 +- docker/php-official/8.0/Dockerfile | 2 +- docker/samson-deployment/latest/Dockerfile | 2 +- docker/sphinx/latest/Dockerfile | 2 +- docker/typo3-solr/3.1/Dockerfile | 2 +- docker/typo3-solr/5.0/Dockerfile | 2 +- docker/typo3-solr/6.0/Dockerfile | 2 +- docker/typo3-solr/6.1/Dockerfile | 2 +- docker/typo3-solr/6.5/Dockerfile | 2 +- docker/typo3-solr/7.0/Dockerfile | 2 +- docker/typo3-solr/7.5/Dockerfile | 2 +- docker/typo3-solr/8.0/Dockerfile | 2 +- docker/typo3-solr/8.1/Dockerfile | 2 +- docker/varnish/latest/Dockerfile | 2 +- docker/vsftp/latest/Dockerfile | 2 +- 230 files changed, 230 insertions(+), 230 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index 601786552..ba2c87605 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine RUN set -x \ # Install ansible diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 62cba7cd4..87ea57281 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:centos-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 RUN set -x \ # Install ansible diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index a2be6ee10..bed9b04c4 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 RUN set -x \ # Install ansible diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index c9d29c961..9914c5b10 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-8 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 RUN set -x \ # Install ansible diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 7a594f906..74c5c965e 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-9 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index c4e5b9d59..279dc25ec 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index bbb77a70d..ae87b4ff7 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 691901e86..902c77c67 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index dd2aa7d5b..70b7e05a9 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index f1930aa51..1edb5ef9e 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index ba70d8506..30e8915c5 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 RUN set -x \ # Install ansible diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index a707b5c5e..23ec18044 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:alpine +FROM ghcr.io/cocoastorm/webdevops/apache:alpine ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 78dc860d1..e0b199ef3 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:centos-7 +FROM ghcr.io/cocoastorm/webdevops/apache:centos-7 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index 8bbf1842b..7fceeaafc 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:debian-10 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 417169433..e23743989 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:debian-7 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-7 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 0cbc1c89a..58b393ec0 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:debian-8 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-8 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index eb55712d2..27e582295 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:debian-9 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-9 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index a89b36687..48d22c682 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-12.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 69978adbd..4e0b8f8d6 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-14.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 9b6f4095c..7308c21ab 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index df4f2e029..51d44ae07 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 87b4a71d0..e921b69e1 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 8e0a34bcd..6eda084b5 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index 33b1d2e0b..218149235 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index d48b11685..4dbbb49f6 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index 941e3dfb6..80285015f 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-18.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index 42bed117c..4d99a98a0 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 6978d398c..b45910e78 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index b9fd0a273..e1a72eccf 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 2d6e23599..b72586b56 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 22ffd0720..db64598e2 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 0808f4895..94195aea6 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 7658551ea..17d2b2215 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index cc8b83257..3c5ecb8f6 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 6355df749..90f611b57 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 0d3c5d063..72cfa92b4 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 809104fc7..46371ec28 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index a1b6dab7f..9b7b92e89 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index 7a51b4a60..f598a89bc 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index ee1de7a75..f6e142c1d 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index da52ab023..dce6ea344 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index 955cb83aa..e16dbb650 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 8af3e30bc..7f63f616d 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index 56fa490e2..5afb814eb 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 00031457f..b960492d9 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 116ee2a35..17eda5442 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index a030db831..87e677fac 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 557714ef5..9789bfae8 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index e5a33056c..9629f2dfb 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 83600e93a..70259fa4a 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 5a9292671..e1f7a438a 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index a7256d29d..dceba56f5 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index ec821353e..65b49e524 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index 255558f0e..a3b845835 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index 1adf325f9..f50e9ac99 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index 88915ce6c..f814bd97b 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 06ff90d5e..3fc786eb0 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 28f068c2b..96bd53975 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:centos-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index dff6726d9..27eb40ae4 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-10 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 1a48cd5b0..d5bc0c5ef 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 2ff6a4938..c6efeb3de 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-8 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 7caa6d5ca..76b682bc3 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-9 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index f0a9d9ecf..c5194ea13 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 74ab7c1e9..8fb118560 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index d71eaa6d0..d2e501813 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 8739fe634..953cc0ee0 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 0780227b0..b9bb96cdd 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 9fab1b45e..7f7be0fbd 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.10 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index 9245a8d45..01e9c446b 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index a0c768394..41c43284a 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.10 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index 410d00291..888eaaec9 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-18.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index b2c59f80c..71c1b1995 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index add2d488c..2f03b8865 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 7893d624b..b09fda648 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 45227754f..eb1c0196f 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 0f74d202d..e68f84c3f 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 47d5cb80b..06be28535 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 9fc31c9a0..872ff47ba 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index c0dec05b5..e6b88c95b 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 5196e2d2e..9988fd0c0 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 0a5a18f66..fe304f0ae 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 202438acd..8946c66ef 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 0d608ceca..c28178250 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 5f6c7c306..322338186 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 2246055f0..965f7b2c1 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index a828d1a47..6d8c5cefc 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index acee06a0b..20a9a2587 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine VOLUME /etc/letsencrypt VOLUME /var/www diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index 237cc8067..cd0abe08b 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:latest +FROM ghcr.io/cocoastorm/webdevops/base:latest # Install services RUN /usr/local/bin/apt-install \ diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile index 566b4d7c7..0eb522c79 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:alpine +FROM ghcr.io/cocoastorm/webdevops/nginx:alpine ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index a673b3511..e4e10833c 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:centos-7 +FROM ghcr.io/cocoastorm/webdevops/nginx:centos-7 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-10/Dockerfile b/docker/nginx-dev/debian-10/Dockerfile index 2d25a5abc..fbe941588 100644 --- a/docker/nginx-dev/debian-10/Dockerfile +++ b/docker/nginx-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:debian-10 +FROM ghcr.io/cocoastorm/webdevops/nginx:debian-10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 1428b820d..218f8c5e8 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:debian-7 +FROM ghcr.io/cocoastorm/webdevops/nginx:debian-7 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index b246149e8..e1f88bc8c 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:debian-8 +FROM ghcr.io/cocoastorm/webdevops/nginx:debian-8 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index ae8d42a78..56aeba486 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:debian-9 +FROM ghcr.io/cocoastorm/webdevops/nginx:debian-9 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 1a243c9fc..acd7dc889 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-12.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index 9065f3404..c0b6fc6c4 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-14.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index afbe221a8..d3430bf8a 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 7be31c871..cc2c46fcc 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 14318b16c..d8c0ed8a1 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 82ea50f4e..8e0eaed03 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile b/docker/nginx-dev/ubuntu-17.04/Dockerfile index be1263480..a6fedfccb 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile b/docker/nginx-dev/ubuntu-17.10/Dockerfile index 386e2f7ae..ce6893611 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile b/docker/nginx-dev/ubuntu-18.04/Dockerfile index c6bb51b8e..1165bdbf4 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-18.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index 78e95b4a9..b39c1a8b6 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index e212ff808..ce55fba2e 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index 61bbdf3bb..9fcdb9059 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 8662e4532..93a39a138 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index ac11cbda8..d9c4774c7 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 3a1e9be84..3de217257 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 891e6e55f..36f780f26 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 6971cbe75..765e5e614 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 6b7050f59..535a4a1c7 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 82068fc9e..270028bed 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index a0da6bc41..a7e9785ff 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 4fe5e074c..9184cdf16 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index 72490a06f..d53a9cc32 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index c7519ce21..f495fc4e4 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index d3ffb08f0..fcd0fed85 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index 814756aaf..fc7177c41 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index b64dd568a..7bdb936c6 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index 75b10d69a..b31c722eb 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index edf258c27..1a80e95a1 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index 331543c16..83bf46343 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index 97007693d..1e8fc3fcf 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 91f909b3a..04240517b 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index fd714a495..4ff156a1c 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index 8f408c631..bb66897df 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index 68581a393..1266a376d 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 66ac95743..7ec21afe2 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index 490718e17..cfa10673a 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 9b8c54aa4..ed1a6b785 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 00ccd90bc..4f4040468 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 2b9a4dc7c..062d338b5 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index de913be0f..31b4a231d 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 9c1c8b31a..1f1753972 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 09ab61bf5..9afb7eb36 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index b52a2175a..4ded5291f 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 734d0d02e..d5571b720 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index c7a6721a5..6daaa02ae 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 84fccd722..cd4cf7c78 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 138411e39..85a330b0e 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index e06e72579..69384a1fd 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 651e01312..e0f993315 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index d925aa216..50761d917 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index f1e61b697..9f2bdd016 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index 3bf5c65b6..09ff6e6c5 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index 592c8f887..059937833 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index f2e8ce62b..256ac11f9 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 7121c1c6d..f8cecf27d 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index cdafc1c9d..7a71a0158 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index eb8241751..0ccc1c231 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index 11bb1b602..d868442a4 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index 720a66aa7..cc2e6dea0 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index 8f76d9191..4e0b6a249 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index b10588734..4a5a4386e 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index da0eefb12..c9d8d5450 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 07f3e294a..0cb7c07b4 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 3820b39b5..fae379511 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 08c5faaf6..6e8b01842 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 688e2cee3..2c58ae8e9 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index 70a319bbf..a8eeaf8f3 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 3332c014c..5c8ed9a42 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index 229a4ad67..ea5bc9551 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index c18141949..d1b942cb3 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index d3c526994..259d6a410 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 28279c0ac..b09874704 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index bd9842099..8956b3707 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index d121f5c46..f46dfee7b 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 2cbd914d9..3fc40da65 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 2bc17f4ea..2924394c4 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 1071eb532..cba611482 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 5397df672..07e489fc6 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index c839b5005..9aa713c09 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index a8eedfc41..8c8e5f22e 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index f9ffc2105..d6f4fe0fe 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index 92308e997..fec35ecd1 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index ef79e5347..2443a7017 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index f75346d8e..cece8f00e 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index 541e7747a..e9de69772 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index eb2376a9f..e1561e15f 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index 56cb3cf59..11389ad63 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index 2e77b6cfb..3a00de5c2 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index 34093bb49..fe69f013c 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index 959f94d73..762bc3397 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index e796d76ad..eef2affd2 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index f30b9c00c..d513e99e2 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index ea2937ac3..4ca06aa5e 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index d9a1e55b8..a6ecb1355 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 826f5fd51..9bb33fcad 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 036e4e150..7ac8c3f97 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 0be8bf753..ddea17ee9 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index fe02deade..38a9b980c 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 6a36e4414..d5f2cfe55 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 8d67a4595..b49f7faf6 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 33767d6bf..6da164647 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index e2b0311cc..6a9ebc26e 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 60fee0b4d..c51cfbb0e 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 648f6baa1..1c0b76b64 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 5342b4d7d..2b3881422 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index ec8108e43..956fb2a7a 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 6dd1e9c7b..dee9a0301 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 41f28c3df..16f6d06ac 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index 435561ec6..0b8e3ea50 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index 612b33846..535fb9060 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index 8a583738b..88ac8c6f0 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 11d9fe43d..a7bb419de 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index a4faa1118..a14d6aa4c 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index d4783945f..f6055c4fc 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 0e063e226..885fba017 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index dafe46533..949e1a81d 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 03896e9d2..fc76c498f 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 0a4d87947..61675bc8a 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index b59a459d3..fbdc5e075 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index e0d35fac8..7db7e9fc1 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index ef768ab61..d9d7d08d3 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index f3248eea0..432fac418 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index ccf9ab95b..1da7a083b 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 297f84924..b5b881983 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index c0d0cbe1c..710b4d73a 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine RUN set -x \ && apk-install \ diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 539401a08..034f37153 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 652196ee5..c10458072 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index d5f9ffcd2..6d8df467f 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 2b48956dd..0c890fe98 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 49aefb269..c8dcff9b6 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 305b438d3..005bafc33 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index a11be2ba1..d05824e3a 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index fe2486844..954a07a04 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 706765c7c..8b8cec7f9 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM webdevops/toolbox AS baselayout +FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index fb1d975b4..89e41dd9b 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index ff673ddd2..e72ec3492 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:latest +FROM ghcr.io/cocoastorm/webdevops/base:latest ENV FTP_USER=application \ FTP_PASSWORD=application \ From af52a48d90188019a2d4c8d5dcf7a7a6670f14d5 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 27 Jul 2022 17:01:29 -0700 Subject: [PATCH 024/123] wip matrix cmd --- .github/workflows/docker.yml | 153 ++++++++---------- .../generate_gh_action_matrix_command.py | 128 +++++++++++++++ bin/command/generate_ghactions_command.py | 21 +++ bin/console | 2 + bin/webdevops/command/BaseCommand.py | 9 +- 5 files changed, 220 insertions(+), 93 deletions(-) create mode 100644 bin/command/generate_gh_action_matrix_command.py diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 556bfdfee..b52972603 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,11 +4,40 @@ on: push: branches: - 'main' - - 'experimental/gh-actions' + +concurrency: + group: "${{ github.ref }}" + +permissions: + contents: read jobs: - docker: + generate-matrix: + runs-on: ubuntu-latest + outputs: + matrix-base: ${{ steps.generate-matrix.outputs.matrix-base }} + matrix-multi: ${{ steps.generate-matrix.outputs.matrix-multi }} + steps: + - name: Checkout + uses: actions/checkout@v3 + + - uses: actions/setup-python@v4 + with: + python-version: '3.9' + cache: 'pip' + + - run: pip install -r bin/requirements.txt + + - name: Generate Matrix + id: generate-matrix + run: python bin/console generate:gh-action-matrix --whitelist='toolbox' --whitelist='php-*/8.*/*' + + build-base-images: + name: ${{ matrix.name }} runs-on: ubuntu-latest + strategy: + matrix: + include: ${{ fromJson(needs.generate-matrix.outputs.matrix-base) }} steps: - name: Checkout uses: actions/checkout@v3 @@ -25,100 +54,46 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - - name: build and push "php-apache:8.0-alpine" - uses: docker/build-push-action@v3 - with: - context: docker/php-apache/8.0-alpine - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-apache:8.0-alpine" - - - name: build and push "php-apache:8.0" - uses: docker/build-push-action@v3 - with: - context: docker/php-apache/8.0 - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-apache:8.0" - - - name: build and push "php-apache-dev:8.0-alpine" - uses: docker/build-push-action@v3 - with: - context: docker/php-apache-dev/8.0-alpine - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-apache-dev:8.0-alpine" - - - name: build and push "php-apache-dev:8.0" - uses: docker/build-push-action@v3 - with: - context: docker/php-apache-dev/8.0 - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-apache-dev:8.0" - - - name: build and push "php-official:8.0-alpine" - uses: docker/build-push-action@v3 - with: - context: docker/php-official/8.0-alpine - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-official:8.0-alpine" - - - name: build and push "php-official:8.0" - uses: docker/build-push-action@v3 - with: - context: docker/php-official/8.0 - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-official:8.0" - - - name: build and push "php-nginx-dev:8.0-alpine" - uses: docker/build-push-action@v3 - with: - context: docker/php-nginx-dev/8.0-alpine - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-nginx-dev:8.0-alpine" - - - name: build and push "php-nginx-dev:8.0" - uses: docker/build-push-action@v3 - with: - context: docker/php-nginx-dev/8.0 - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-nginx-dev:8.0" - - - name: build and push "php-nginx:8.0-alpine" - uses: docker/build-push-action@v3 - with: - context: docker/php-nginx/8.0-alpine - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-nginx:8.0-alpine" - - - name: build and push "php-nginx:8.0" + + - name: Pull "toolbox" + run: docker pull ghcr.io/cocoastorm/webdevops/toolbox:latest + continue-on-error: true + + - name: Build "${{ matrix.name }}" uses: docker/build-push-action@v3 with: - context: docker/php-nginx/8.0 + context: ${{ matrix.context }} platforms: linux/amd64,linux/arm64 push: true - tags: "ghcr.io/cocoastorm/webdevops/php-nginx:8.0" + tags: ${{ matrix.tags }} + + build-multi-images: + name: ${{ matrix.name }} + runs-on: ubuntu-latest + strategy: + matrix: + include: ${{ fromJson(needs.generate-matrix.outputs.matrix-multi) }} + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 - - name: build and push "php-dev:8.0-alpine" - uses: docker/build-push-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login to ghcr.io + uses: docker/login-action@v2 with: - context: docker/php-dev/8.0-alpine - platforms: linux/amd64,linux/arm64 - push: true - tags: "ghcr.io/cocoastorm/webdevops/php-dev:8.0-alpine" - - - name: build and push "php-dev:8.0" + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build "${{ matrix.name }}" uses: docker/build-push-action@v3 with: - context: docker/php-dev/8.0 + context: ${{ matrix.context }} platforms: linux/amd64,linux/arm64 push: true - tags: "ghcr.io/cocoastorm/webdevops/php-dev:8.0" - + tags: ${{ matrix.tags }} diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py new file mode 100644 index 000000000..c64ff7bb1 --- /dev/null +++ b/bin/command/generate_gh_action_matrix_command.py @@ -0,0 +1,128 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import json +import os +import sys +from cleo import Output +from webdevops import DockerfileUtility +from webdevops.command import BaseCommand + +class GenerateGHActionMatrixCommand(BaseCommand): + """ + Generate Github Actions template + + generate:gh-action-matrix + {docker images?* : Docker images (whitelist)} + {--whitelist=?* : image/tag whitelist } + {--blacklist=?* : image/tag blacklist } + """ + + image_prefix = '' + dockerfile_path = '' + + def run_task(self, configuration): + image_prefix = configuration.get('docker.imageUser') or configuration.get('docker.imagePrefix') + template_path = os.path.join(configuration.get('templatePath'), 'Github') + dockerfile_path = configuration.get('dockerPath') + github_actions_path = configuration.get('githubActionsPath') + github_action_file = os.path.join(github_actions_path, 'docker.yml') + + whitelist = self.get_whitelist() + blacklist = self.get_blacklist() + + self.image_prefix = image_prefix + self.dockerfile_path = dockerfile_path + + if Output.VERBOSITY_VERBOSE <= self.output.get_verbosity(): + self.line('-> image prefix : %s' % image_prefix) + self.line('-> docker path : %s' % dockerfile_path) + self.line('-> template path : %s' % template_path) + + if whitelist: + self.line('-> whitelist :') + for crit in whitelist: + self.line("\t * %s" % crit) + + if blacklist: + self.line('-> blacklist :') + for crit in blacklist: + self.line("\t * %s" % crit) + + dockerfiles = DockerfileUtility.find_file_in_path( + dockerfile_path=dockerfile_path, + filename="Dockerfile.jinja2", + whitelist=whitelist, blacklist=blacklist, + ) + + dockerfile_blocks = [self.process_dockerfile(file) for file in dockerfiles] + + base_img_blocks = [] + needs_dep_img_blocks = [] + + for block in dockerfile_blocks: + block_input = block['input'] + dockerfile_input = os.path.splitext(block_input)[0] + + from_img = DockerfileUtility.parse_dockerfile_from_statement(dockerfile_input) + + if image_prefix in from_img: + block['needs_parent'] = True + needs_dep_img_blocks.append(block) + else: + base_img_blocks.append(block) + + # base images + base_images = [] + for base_img in base_img_blocks: + base_img['needs_parent'] = False + + base_images.append(base_img) + + # toolbox should be first :tm: + if "toolbox" in base_img["name"]: + base_images.insert(0, base_images.pop(base_images.index(base_img))) + + # images with parent image from "webdevops" + # /shrug + + output_path = os.path.split(dockerfile_path)[0] + output_base_file = os.path.join(output_path, 'gh_matrix-base-images.json') + output_multi_file = os.path.join(output_path, 'gh_matrix-multi-images.json') + + self.line("\n\n") + print("::set-output name=matrix-base::%s" % json.dumps(base_images, indent=2)) + self.line("\n\n") + print("::set-output name=matrix-multi::%s" % json.dumps(needs_dep_img_blocks, indent=2)) + + with open(output_base_file, 'w') as f: + json.dump(base_images, f, indent=2) + + with open(output_multi_file, 'w') as fm: + json.dump(needs_dep_img_blocks, fm, indent=2) + + def process_dockerfile(self, input_file): + """ + :param input_file: Input File + :type input_file: str + """ + + output_file = os.path.split(input_file)[0] + + docker_image = os.path.basename(os.path.dirname(output_file)) + docker_tag = os.path.basename(output_file) + + context_dir = os.path.relpath(output_file, os.path.dirname(self.dockerfile_path)) + + img = { + 'input': input_file, + 'name': f"{docker_image}:{docker_tag}", + 'context': context_dir, + 'tags': f"{self.image_prefix}/{docker_image}:{docker_tag}" + } + + if Output.VERBOSITY_NORMAL <= self.output.get_verbosity(): + self.line("* Build block for %s" % img["name"]) + self.line(" context_path: %s" % context_dir) + + return img diff --git a/bin/command/generate_ghactions_command.py b/bin/command/generate_ghactions_command.py index 1605d6186..1f60064fe 100644 --- a/bin/command/generate_ghactions_command.py +++ b/bin/command/generate_ghactions_command.py @@ -64,6 +64,26 @@ def run_task(self, configuration): dockerfile_blocks = [self.process_dockerfile(file) for file in dockerfiles] + base_img_blocks = [] + multistage_img_blocks = [] + + for block in dockerfile_blocks: + block_input = block['input'] + dockerfile_input = os.path.splitext(block_input)[0] + + multistage_imgs = DockerfileUtility.parse_dockerfile_multistage_images(dockerfile_input) + + if len(multistage_imgs) > 0: + multistage_img_blocks.append(block) + else: + base_img_blocks.append(block) + + print("base images:") + print(base_img_blocks) + + print("multistage images:") + print(multistage_img_blocks) + template = env.get_template('docker_action.jinja2') rendered_content = template.render(dockerfiles=dockerfile_blocks) @@ -88,6 +108,7 @@ def process_dockerfile(self, input_file): context_dir = os.path.relpath(output_file, os.path.dirname(self.dockerfile_path)) img = { + 'input': input_file, 'name': f"{docker_image}:{docker_tag}", 'context': context_dir, 'tags': f"{self.image_prefix}/{docker_image}:{docker_tag}" diff --git a/bin/console b/bin/console index c1e0ebe50..a725e77b4 100755 --- a/bin/console +++ b/bin/console @@ -27,6 +27,7 @@ from command.generate_dockerfile_command import GenerateDockerfileCommand from command.generate_graph_command import GenerateGraphCommand from command.generate_provision_command import GenerateProvisionCommand from command.generate_ghactions_command import GenerateGHActionsCommand +from command.generate_gh_action_matrix_command import GenerateGHActionMatrixCommand if __name__ == '__main__': # Generate common paths @@ -102,5 +103,6 @@ if __name__ == '__main__': application.add(GenerateGraphCommand(configuration=configuration)) application.add(GenerateProvisionCommand(configuration=configuration)) application.add(GenerateGHActionsCommand(configuration=configuration)) + application.add(GenerateGHActionMatrixCommand(configuration=configuration)) application.run() diff --git a/bin/webdevops/command/BaseCommand.py b/bin/webdevops/command/BaseCommand.py index 6bec6e523..a4a1a8ea7 100644 --- a/bin/webdevops/command/BaseCommand.py +++ b/bin/webdevops/command/BaseCommand.py @@ -129,10 +129,11 @@ def shutdown(self, exitcode=0): self.teardown(exitcode) print('') - if exitcode == 0: - print('> finished execution in %s successfully' % (duration)) - else: - print('> finished execution in %s with errors (exitcode %s)' % (duration, exitcode)) + if self.output.is_verbose(): + if exitcode == 0: + print('> finished execution in %s successfully' % (duration)) + else: + print('> finished execution in %s with errors (exitcode %s)' % (duration, exitcode)) def build_configuration(self): """ From ec8bf086681d105eec2469bee9410c3a256bb6fe Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 28 Jul 2022 15:57:56 -0700 Subject: [PATCH 025/123] only show execution time if output is verbose --- bin/webdevops/command/BaseCommand.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/webdevops/command/BaseCommand.py b/bin/webdevops/command/BaseCommand.py index a4a1a8ea7..916f3cf64 100644 --- a/bin/webdevops/command/BaseCommand.py +++ b/bin/webdevops/command/BaseCommand.py @@ -128,12 +128,12 @@ def shutdown(self, exitcode=0): self.teardown(exitcode) - print('') + self.line('') if self.output.is_verbose(): if exitcode == 0: - print('> finished execution in %s successfully' % (duration)) + self.line("> finished execution in %s successfully" % duration) else: - print('> finished execution in %s with errors (exitcode %s)' % (duration, exitcode)) + self.line("> finished execution in %s with errors (exitcode %s)" % (duration, exitcode)) def build_configuration(self): """ From a68c33bc232ae2280cdfb0a62e986962d753efd6 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 28 Jul 2022 16:04:45 -0700 Subject: [PATCH 026/123] use a matrix with github actions docker workflow --- .github/workflows/docker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b52972603..7fccd957b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,6 +4,7 @@ on: push: branches: - 'main' + - 'experimental/gh-actions' concurrency: group: "${{ github.ref }}" @@ -34,6 +35,7 @@ jobs: build-base-images: name: ${{ matrix.name }} + needs: generate-matrix runs-on: ubuntu-latest strategy: matrix: @@ -69,6 +71,9 @@ jobs: build-multi-images: name: ${{ matrix.name }} + needs: + - generate-matrix + - build-base-images runs-on: ubuntu-latest strategy: matrix: From 919d33b566257229ffb6bdfa70bb5c21e8c37957 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 29 Jul 2022 10:48:29 -0700 Subject: [PATCH 027/123] gh-action: add docker build composite action --- .github/actions/composite-docker/action.yml | 49 +++++++++++++ .github/workflows/docker.yml | 76 ++++++++------------- 2 files changed, 76 insertions(+), 49 deletions(-) create mode 100644 .github/actions/composite-docker/action.yml diff --git a/.github/actions/composite-docker/action.yml b/.github/actions/composite-docker/action.yml new file mode 100644 index 000000000..6b8896497 --- /dev/null +++ b/.github/actions/composite-docker/action.yml @@ -0,0 +1,49 @@ +name: 'Docker Composite Build' +description: 'qemu + buildx + ghcr.io login + docker-build-push' +inputs: + image-name: + description: 'docker image name' + required: true + + image-context: + description: 'docker image context path' + required: true + + image-platforms: + description: 'docker image platforms' + required: false + default: 'linux/amd64,linux/arm64' + + image-tags: + description: 'docker image tags' + required: true +runs: + using: "composite" + steps: + - name: "Checkout" + uses: actions/checkout@v3 + + - name: "Set up QEMU" + uses: docker/setup-qemu-action@v2 + + - name: "Set up Docker Buildx" + uses: docker/setup-buildx-action@v2 + + - name: "Login to ghcr.io" + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Pull "toolbox" + run: docker pull ghcr.io/cocoastorm/webdevops/toolbox:latest + continue-on-error: true + + - name: Build {{ $inputs.image-name }} + uses: docker/build-push-action@v3 + with: + context: {{ $inputs.image-context }} + platforms: {{ $inputs.image-platforms }} + push: true + tags: ${{ inputs.image-tags }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7fccd957b..600b1c4d4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,8 +16,8 @@ jobs: generate-matrix: runs-on: ubuntu-latest outputs: - matrix-base: ${{ steps.generate-matrix.outputs.matrix-base }} - matrix-multi: ${{ steps.generate-matrix.outputs.matrix-multi }} + base: ${{ steps.output-base-matrix.outputs.base }} + multi: ${{ steps.output-multi-matrix.outputs.multi }} steps: - name: Checkout uses: actions/checkout@v3 @@ -30,75 +30,53 @@ jobs: - run: pip install -r bin/requirements.txt - name: Generate Matrix - id: generate-matrix run: python bin/console generate:gh-action-matrix --whitelist='toolbox' --whitelist='php-*/8.*/*' + - name: Output Base Matrix + id: output-base-matrix + run: | + JSON=$(cat ./gh_matrix-base-images.json) + echo "::set-output name=base::$JSON" + + - name: Output Multi Matrix + id: output-multi-matrix + run: | + JSON=$(cat ./gh_matrix-multi-images.json) + echo "::set-output name=multi::$JSON" + build-base-images: - name: ${{ matrix.name }} needs: generate-matrix runs-on: ubuntu-latest strategy: matrix: - include: ${{ fromJson(needs.generate-matrix.outputs.matrix-base) }} + include: ${{ fromJson(needs.generate-matrix.outputs.base) }} steps: - - name: Checkout + - name: Check out repository uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Pull "toolbox" - run: docker pull ghcr.io/cocoastorm/webdevops/toolbox:latest - continue-on-error: true - - - name: Build "${{ matrix.name }}" - uses: docker/build-push-action@v3 + - name: Docker Build Composite + uses: ./.github/actions/composite-docker with: - context: ${{ matrix.context }} - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ matrix.tags }} + image-name: ${{ matrix.name }} + image-context: ${{ matrix.context }} + image-tags: ${{ matrix.tags }} build-multi-images: - name: ${{ matrix.name }} needs: - generate-matrix - build-base-images runs-on: ubuntu-latest strategy: matrix: - include: ${{ fromJson(needs.generate-matrix.outputs.matrix-multi) }} + include: ${{ fromJson(needs.generate-matrix.outputs.multi) }} steps: - name: Checkout uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to ghcr.io - uses: docker/login-action@v2 + - name: Docker Build Composite + uses: ./.github/actions/composite-docker with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + image-name: ${{ matrix.name }} + image-context: ${{ matrix.content }} + image-tags: ${{ matrix.tags }} - - name: Build "${{ matrix.name }}" - uses: docker/build-push-action@v3 - with: - context: ${{ matrix.context }} - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ matrix.tags }} From 7418750fe9da87cefb6adc7751667321e4494426 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 29 Jul 2022 11:30:43 -0700 Subject: [PATCH 028/123] gh-action: add code to replace multi-lines for github action outputs --- .github/workflows/docker.yml | 17 +++-------------- .../generate_gh_action_matrix_command.py | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 600b1c4d4..2842defa4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,8 +16,8 @@ jobs: generate-matrix: runs-on: ubuntu-latest outputs: - base: ${{ steps.output-base-matrix.outputs.base }} - multi: ${{ steps.output-multi-matrix.outputs.multi }} + base: ${{ steps.generate-matrix.outputs.matrix-base }} + multi: ${{ steps.generate-matrix.outputs.matrix-multi }} steps: - name: Checkout uses: actions/checkout@v3 @@ -30,19 +30,8 @@ jobs: - run: pip install -r bin/requirements.txt - name: Generate Matrix + id: generate-matrix run: python bin/console generate:gh-action-matrix --whitelist='toolbox' --whitelist='php-*/8.*/*' - - - name: Output Base Matrix - id: output-base-matrix - run: | - JSON=$(cat ./gh_matrix-base-images.json) - echo "::set-output name=base::$JSON" - - - name: Output Multi Matrix - id: output-multi-matrix - run: | - JSON=$(cat ./gh_matrix-multi-images.json) - echo "::set-output name=multi::$JSON" build-base-images: needs: generate-matrix diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index c64ff7bb1..e1a9b40ee 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -90,10 +90,14 @@ def run_task(self, configuration): output_base_file = os.path.join(output_path, 'gh_matrix-base-images.json') output_multi_file = os.path.join(output_path, 'gh_matrix-multi-images.json') + # matrix: base images self.line("\n\n") - print("::set-output name=matrix-base::%s" % json.dumps(base_images, indent=2)) + base_matrix = self.fmt_github_output("matrix-base", json.dumps(base_images)) + print(base_matrix) + self.line("\n\n") - print("::set-output name=matrix-multi::%s" % json.dumps(needs_dep_img_blocks, indent=2)) + multi_matrix = self.fmt_github_output("matrix-multi", json.dumps(needs_dep_img_blocks)) + print(multi_matrix) with open(output_base_file, 'w') as f: json.dump(base_images, f, indent=2) @@ -101,6 +105,15 @@ def run_task(self, configuration): with open(output_multi_file, 'w') as fm: json.dump(needs_dep_img_blocks, fm, indent=2) + def fmt_github_output(self, name, output): + text = output + + text = text.replace("%", "%25") + text = text.replace("\n", "%0A") + text = text.replace("\r", "%0D") + + return "::set-output name=%s::%s" % (name, text) + def process_dockerfile(self, input_file): """ :param input_file: Input File From 996a3e400f804d3e4af4682e8eedf20ab0754f21 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 29 Jul 2022 11:33:10 -0700 Subject: [PATCH 029/123] add required shell: bash --- .github/actions/composite-docker/action.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/composite-docker/action.yml b/.github/actions/composite-docker/action.yml index 6b8896497..dcaaa490e 100644 --- a/.github/actions/composite-docker/action.yml +++ b/.github/actions/composite-docker/action.yml @@ -20,9 +20,6 @@ inputs: runs: using: "composite" steps: - - name: "Checkout" - uses: actions/checkout@v3 - - name: "Set up QEMU" uses: docker/setup-qemu-action@v2 @@ -37,6 +34,7 @@ runs: password: ${{ secrets.GITHUB_TOKEN }} - name: Pull "toolbox" + shell: bash run: docker pull ghcr.io/cocoastorm/webdevops/toolbox:latest continue-on-error: true From 35d4df9f144d73657499fafa0c33e2eb97ea027d Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 29 Jul 2022 11:49:09 -0700 Subject: [PATCH 030/123] wip --- .github/actions/composite-docker/action.yml | 18 +++++++++++++----- .github/workflows/docker.yml | 4 ++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/actions/composite-docker/action.yml b/.github/actions/composite-docker/action.yml index dcaaa490e..086d3d56e 100644 --- a/.github/actions/composite-docker/action.yml +++ b/.github/actions/composite-docker/action.yml @@ -1,6 +1,14 @@ name: 'Docker Composite Build' description: 'qemu + buildx + ghcr.io login + docker-build-push' inputs: + registry-user: + description: ghcr.io user + required: true + + registry-secret: + description: ghcr.io token + required: true + image-name: description: 'docker image name' required: true @@ -30,18 +38,18 @@ runs: uses: docker/login-action@v2 with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + username: ${{ inputs.registry-user }} + password: ${{ inputs.registry-secret }} - name: Pull "toolbox" shell: bash run: docker pull ghcr.io/cocoastorm/webdevops/toolbox:latest continue-on-error: true - - name: Build {{ $inputs.image-name }} + - name: Build {{ inputs.image-name }} uses: docker/build-push-action@v3 with: - context: {{ $inputs.image-context }} - platforms: {{ $inputs.image-platforms }} + context: {{ inputs.image-context }} + platforms: {{ inputs.image-platforms }} push: true tags: ${{ inputs.image-tags }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2842defa4..dd71a4941 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -46,6 +46,8 @@ jobs: - name: Docker Build Composite uses: ./.github/actions/composite-docker with: + registry-user: ${{ github.repository_owner }} + registry-secret: ${{ secrets.GITHUB_TOKEN }} image-name: ${{ matrix.name }} image-context: ${{ matrix.context }} image-tags: ${{ matrix.tags }} @@ -65,6 +67,8 @@ jobs: - name: Docker Build Composite uses: ./.github/actions/composite-docker with: + registry-user: ${{ github.repository_owner }} + registry-secret: ${{ secrets.GITHUB_TOKEN }} image-name: ${{ matrix.name }} image-context: ${{ matrix.content }} image-tags: ${{ matrix.tags }} From 397d88ed1789b267da7fa1a05cb4b82bf247b4f5 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 29 Jul 2022 11:50:52 -0700 Subject: [PATCH 031/123] wip --- .github/actions/composite-docker/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/composite-docker/action.yml b/.github/actions/composite-docker/action.yml index 086d3d56e..30adf5546 100644 --- a/.github/actions/composite-docker/action.yml +++ b/.github/actions/composite-docker/action.yml @@ -46,10 +46,10 @@ runs: run: docker pull ghcr.io/cocoastorm/webdevops/toolbox:latest continue-on-error: true - - name: Build {{ inputs.image-name }} + - name: Build ${{ inputs.image-name }} uses: docker/build-push-action@v3 with: - context: {{ inputs.image-context }} - platforms: {{ inputs.image-platforms }} + context: ${{ inputs.image-context }} + platforms: ${{ inputs.image-platforms }} push: true tags: ${{ inputs.image-tags }} From d6f158ce6fe80967ccd42f414401717a34321bc8 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 29 Jul 2022 11:59:22 -0700 Subject: [PATCH 032/123] wip: toolbox --- .github/workflows/docker.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index dd71a4941..de7422425 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,6 +13,21 @@ permissions: contents: read jobs: + build-toolbox-image: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: "Docker Build Composite: toolbox" + uses: ./.github/actions/composite-docker + with: + registry-user: ${{ github.repository_owner }} + registry-secret: ${{ secrets.GITHUB_TOKEN }} + image-name: "webdevops/toolbox" + image-context: "docker/toolbox/latest" + image-tags: "ghcr.io/cocoastorm/webdevops/toolbox:latest" + generate-matrix: runs-on: ubuntu-latest outputs: @@ -31,10 +46,12 @@ jobs: - name: Generate Matrix id: generate-matrix - run: python bin/console generate:gh-action-matrix --whitelist='toolbox' --whitelist='php-*/8.*/*' + run: python bin/console generate:gh-action-matrix --whitelist='php-*/8.*/*' build-base-images: - needs: generate-matrix + needs: + - build-toolbox-image + - generate-matrix runs-on: ubuntu-latest strategy: matrix: @@ -54,6 +71,7 @@ jobs: build-multi-images: needs: + - build-toolbox-image - generate-matrix - build-base-images runs-on: ubuntu-latest From 97ef098f9ec35e15a74f61912ef6161bbc8bbf74 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 29 Jul 2022 12:05:14 -0700 Subject: [PATCH 033/123] avoid running goreplace in Dockerfile for multi platform builds --- docker/bootstrap/alpine/Dockerfile | 1 - docker/bootstrap/centos-7/Dockerfile | 1 - docker/bootstrap/debian-10/Dockerfile | 1 - docker/bootstrap/debian-7/Dockerfile | 1 - docker/bootstrap/debian-8/Dockerfile | 1 - docker/bootstrap/debian-9/Dockerfile | 1 - docker/bootstrap/ubuntu-12.04/Dockerfile | 1 - docker/bootstrap/ubuntu-14.04/Dockerfile | 1 - docker/bootstrap/ubuntu-15.04/Dockerfile | 1 - docker/bootstrap/ubuntu-15.10/Dockerfile | 1 - docker/bootstrap/ubuntu-16.04/Dockerfile | 1 - docker/bootstrap/ubuntu-16.10/Dockerfile | 1 - docker/bootstrap/ubuntu-17.04/Dockerfile | 1 - docker/bootstrap/ubuntu-17.10/Dockerfile | 1 - docker/bootstrap/ubuntu-18.04/Dockerfile | 1 - docker/php-official/5.6/Dockerfile | 1 - docker/php-official/7.0/Dockerfile | 1 - docker/php-official/7.1-alpine/Dockerfile | 1 - docker/php-official/7.1/Dockerfile | 1 - docker/php-official/7.2-alpine/Dockerfile | 1 - docker/php-official/7.2/Dockerfile | 1 - docker/php-official/7.3-alpine/Dockerfile | 1 - docker/php-official/7.3/Dockerfile | 1 - docker/php-official/7.4-alpine/Dockerfile | 1 - docker/php-official/7.4/Dockerfile | 1 - docker/php-official/8.0-alpine/Dockerfile | 1 - docker/php-official/8.0/Dockerfile | 1 - docker/samson-deployment/latest/Dockerfile | 1 - docker/toolbox/latest/Dockerfile | 3 +-- docker/typo3-solr/3.1/Dockerfile | 1 - docker/typo3-solr/5.0/Dockerfile | 1 - docker/typo3-solr/6.0/Dockerfile | 1 - docker/typo3-solr/6.1/Dockerfile | 1 - docker/typo3-solr/6.5/Dockerfile | 1 - docker/typo3-solr/7.0/Dockerfile | 1 - docker/typo3-solr/7.5/Dockerfile | 1 - docker/typo3-solr/8.0/Dockerfile | 1 - docker/typo3-solr/8.1/Dockerfile | 1 - template/Dockerfile/tools.jinja2 | 3 +-- 39 files changed, 2 insertions(+), 41 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 71c1b1995..163f5f9ae 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 2f03b8865..44441db4d 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index b09fda648..4e65ebf45 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index eb1c0196f..ac061d483 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index e68f84c3f..61495a867 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 06be28535..e5b5b2492 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 872ff47ba..b814ad048 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index e6b88c95b..00979ced7 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 9988fd0c0..b62b2791a 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index fe304f0ae..9166c08f8 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 8946c66ef..bc4992a6e 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index c28178250..909b91d42 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 322338186..07eb25bab 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 965f7b2c1..482691454 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 6d8c5cefc..42a85bfa7 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index a7bb419de..cc8abc696 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index a14d6aa4c..de7bd1411 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index f6055c4fc..20723d928 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 885fba017..7a486e7d1 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 949e1a81d..92ccb89e9 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index fc76c498f..368703cd0 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 61675bc8a..8888c3530 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index fbdc5e075..dc18534a2 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 7db7e9fc1..f02875ed5 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index d9d7d08d3..a9fb3b2a6 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 432fac418..6b4636493 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 1da7a083b..acd1b3f1f 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index b5b881983..10efcf825 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index 498eddb41..af0fc71cb 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -27,5 +27,4 @@ RUN apk add --no-cache \ && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ - && "/usr/local/bin/go-replace" --version + && chmod +x "/usr/local/bin/go-replace" diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 034f37153..ff7d7559f 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index c10458072..9c82fc099 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 6d8df467f..2719d072a 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 0c890fe98..f231c67b7 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index c8dcff9b6..d2c858f3e 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 005bafc33..96ce0a390 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index d05824e3a..9e1278f59 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 954a07a04..d8c455a98 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 8b8cec7f9..5e357bc29 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -17,7 +17,6 @@ RUN mkdir -p \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ # Install gosu && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index b75f7ed14..40d3e350d 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -3,8 +3,7 @@ && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-$grArch-linux" \ - && chmod +x "{{ path }}/go-replace" \ - && "{{ path }}/go-replace" --version + && chmod +x "{{ path }}/go-replace" {%- endmacro %} {% macro gosu(path="/sbin", version="1.10") -%} From 6a393f435b546c1739b5051a65e08fc747b7eae0 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 29 Jul 2022 12:10:05 -0700 Subject: [PATCH 034/123] gh-actions: fallback to default permissions --- .github/workflows/docker.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index de7422425..93c05ce73 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,9 +9,6 @@ on: concurrency: group: "${{ github.ref }}" -permissions: - contents: read - jobs: build-toolbox-image: runs-on: ubuntu-latest From fd41f5db433ea41ff225e44898c302aa003efbde Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 08:08:07 -0700 Subject: [PATCH 035/123] remove wip generate:ghactions command --- bin/command/generate_ghactions_command.py | 121 ---------------------- bin/console | 2 - 2 files changed, 123 deletions(-) delete mode 100644 bin/command/generate_ghactions_command.py diff --git a/bin/command/generate_ghactions_command.py b/bin/command/generate_ghactions_command.py deleted file mode 100644 index 1f60064fe..000000000 --- a/bin/command/generate_ghactions_command.py +++ /dev/null @@ -1,121 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -import os -import pprint -from pathlib import Path -from cleo import Output -from jinja2 import Environment, FileSystemLoader -from webdevops import DockerfileUtility -from webdevops.command import BaseCommand - -class GenerateGHActionsCommand(BaseCommand): - """ - Generate Github Actions template - - generate:ghactions - {docker images?* : Docker images (whitelist)} - {--whitelist=?* : image/tag whitelist } - {--blacklist=?* : image/tag blacklist } - """ - - image_prefix = '' - dockerfile_path = '' - - def run_task(self, configuration): - image_prefix = configuration.get('docker.imagePrefix') - template_path = os.path.join(configuration.get('templatePath'), 'Github') - dockerfile_path = configuration.get('dockerPath') - github_actions_path = configuration.get('githubActionsPath') - github_action_file = os.path.join(github_actions_path, 'docker.yml') - - whitelist = self.get_whitelist() - blacklist = self.get_blacklist() - - self.image_prefix = image_prefix - self.dockerfile_path = dockerfile_path - - if Output.VERBOSITY_VERBOSE <= self.output.get_verbosity(): - self.line('-> image prefix : %s' % image_prefix) - self.line('-> docker path : %s' % dockerfile_path) - self.line('-> template path : %s' % template_path) - - if whitelist: - self.line('-> whitelist :') - for crit in whitelist: - self.line("\t * %s" % crit) - - if blacklist: - self.line('-> blacklist :') - for crit in blacklist: - self.line("\t * %s" % crit) - - env = Environment( - autoescape=False, - loader=FileSystemLoader([template_path]), - trim_blocks=False - ) - - dockerfiles = DockerfileUtility.find_file_in_path( - dockerfile_path=dockerfile_path, - filename="Dockerfile.jinja2", - whitelist=whitelist, blacklist=blacklist, - ) - - dockerfile_blocks = [self.process_dockerfile(file) for file in dockerfiles] - - base_img_blocks = [] - multistage_img_blocks = [] - - for block in dockerfile_blocks: - block_input = block['input'] - dockerfile_input = os.path.splitext(block_input)[0] - - multistage_imgs = DockerfileUtility.parse_dockerfile_multistage_images(dockerfile_input) - - if len(multistage_imgs) > 0: - multistage_img_blocks.append(block) - else: - base_img_blocks.append(block) - - print("base images:") - print(base_img_blocks) - - print("multistage images:") - print(multistage_img_blocks) - - template = env.get_template('docker_action.jinja2') - rendered_content = template.render(dockerfiles=dockerfile_blocks) - - Path(github_actions_path).mkdir(parents=True, exist_ok=True) - - with open(github_action_file, 'w') as file_output: - file_output.write(rendered_content) - - self.line('written to %s' % github_action_file) - - def process_dockerfile(self, input_file): - """ - :param input_file: Input File - :type input_file: str - """ - - output_file = os.path.split(input_file)[0] - - docker_image = os.path.basename(os.path.dirname(output_file)) - docker_tag = os.path.basename(output_file) - - context_dir = os.path.relpath(output_file, os.path.dirname(self.dockerfile_path)) - - img = { - 'input': input_file, - 'name': f"{docker_image}:{docker_tag}", - 'context': context_dir, - 'tags': f"{self.image_prefix}/{docker_image}:{docker_tag}" - } - - if Output.VERBOSITY_NORMAL <= self.output.get_verbosity(): - self.line("* Build block for %s" % img["name"]) - self.line(" context_path: %s" % context_dir) - - return img diff --git a/bin/console b/bin/console index a725e77b4..c6fde4ecb 100755 --- a/bin/console +++ b/bin/console @@ -26,7 +26,6 @@ from command.test_serverspec_command import TestServerspecCommand from command.generate_dockerfile_command import GenerateDockerfileCommand from command.generate_graph_command import GenerateGraphCommand from command.generate_provision_command import GenerateProvisionCommand -from command.generate_ghactions_command import GenerateGHActionsCommand from command.generate_gh_action_matrix_command import GenerateGHActionMatrixCommand if __name__ == '__main__': @@ -102,7 +101,6 @@ if __name__ == '__main__': application.add(GenerateDockerfileCommand(configuration=configuration)) application.add(GenerateGraphCommand(configuration=configuration)) application.add(GenerateProvisionCommand(configuration=configuration)) - application.add(GenerateGHActionsCommand(configuration=configuration)) application.add(GenerateGHActionMatrixCommand(configuration=configuration)) application.run() From 7f30d05f314292a1f1201fbb2b0adaf3ff814d66 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 08:10:01 -0700 Subject: [PATCH 036/123] try max 2 jobs per matrix --- .github/workflows/docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 93c05ce73..692542692 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -51,6 +51,7 @@ jobs: - generate-matrix runs-on: ubuntu-latest strategy: + max-parallel: 2 matrix: include: ${{ fromJson(needs.generate-matrix.outputs.base) }} steps: @@ -73,6 +74,7 @@ jobs: - build-base-images runs-on: ubuntu-latest strategy: + max-parallel: 2 matrix: include: ${{ fromJson(needs.generate-matrix.outputs.multi) }} steps: From 9ab2f81c1c171cad75ec22039363a53381d7322e Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 09:42:45 -0700 Subject: [PATCH 037/123] max parallel 1? --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 692542692..97d721f32 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -51,7 +51,7 @@ jobs: - generate-matrix runs-on: ubuntu-latest strategy: - max-parallel: 2 + max-parallel: 1 matrix: include: ${{ fromJson(needs.generate-matrix.outputs.base) }} steps: @@ -74,7 +74,7 @@ jobs: - build-base-images runs-on: ubuntu-latest strategy: - max-parallel: 2 + max-parallel: 1 matrix: include: ${{ fromJson(needs.generate-matrix.outputs.multi) }} steps: From 1524be7e110efa3c9b20e41f5210a7caeea3489c Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 11:31:24 -0700 Subject: [PATCH 038/123] shove $BUILDPLATFORM build arg --- template/Dockerfile/docker.jinja2 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index dc17193b9..cf5498426 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -1,9 +1,17 @@ -{% macro from(image, tag="latest", user="webdevops") -%} +{% macro from(image, tag="latest", user="webdevops", platform=True) -%} +{% if platform -%} +FROM --platform=$BUILDPLATFORM {{ user }}/{{ image }}:{{ tag }} +{%- else -%} FROM {{ user }}/{{ image }}:{{ tag }} +{%- endif %} {%- endmacro %} -{% macro fromOfficial(image, tag="latest") -%} +{% macro fromOfficial(image, tag="latest", platform=True) -%} +{% if platform -%} +FROM --platform=$BUILDPLATFORM {{ user }}/{{ image }}:{{ tag }} +{%- else -%} FROM {{ image }}:{{ tag }} +{%- endif %} {%- endmacro %} {% macro version() -%} From 8dd65207f4c50e90bd8b486aeb9f4287a750c0e7 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 11:31:39 -0700 Subject: [PATCH 039/123] $BUILDPLATFORM arg for FROM statements (multistage builds) --- docker/ansible/alpine/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/ansible/ubuntu-17.04/Dockerfile | 2 +- docker/apache-dev/alpine/Dockerfile | 2 +- docker/apache-dev/centos-7/Dockerfile | 2 +- docker/apache-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-17.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-17.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-18.04/Dockerfile | 2 +- docker/apache/alpine/Dockerfile | 2 +- docker/apache/centos-7/Dockerfile | 2 +- docker/apache/debian-10/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/apache/ubuntu-16.10/Dockerfile | 2 +- docker/apache/ubuntu-17.04/Dockerfile | 2 +- docker/apache/ubuntu-17.10/Dockerfile | 2 +- docker/apache/ubuntu-18.04/Dockerfile | 2 +- docker/base-app/alpine/Dockerfile | 2 +- docker/base-app/centos-7/Dockerfile | 2 +- docker/base-app/debian-10/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-app/ubuntu-16.10/Dockerfile | 2 +- docker/base-app/ubuntu-17.04/Dockerfile | 2 +- docker/base-app/ubuntu-17.10/Dockerfile | 2 +- docker/base-app/ubuntu-18.04/Dockerfile | 2 +- docker/base/alpine/Dockerfile | 2 +- docker/base/centos-7/Dockerfile | 2 +- docker/base/debian-10/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/base/ubuntu-16.10/Dockerfile | 2 +- docker/base/ubuntu-17.04/Dockerfile | 2 +- docker/base/ubuntu-17.10/Dockerfile | 2 +- docker/base/ubuntu-18.04/Dockerfile | 2 +- docker/bootstrap/alpine/Dockerfile | 4 ++-- docker/bootstrap/centos-7/Dockerfile | 4 ++-- docker/bootstrap/debian-10/Dockerfile | 4 ++-- docker/bootstrap/debian-7/Dockerfile | 4 ++-- docker/bootstrap/debian-8/Dockerfile | 4 ++-- docker/bootstrap/debian-9/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-12.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-14.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-15.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-15.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-16.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-16.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-17.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-17.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-18.04/Dockerfile | 4 ++-- docker/certbot/latest/Dockerfile | 2 +- docker/dockerfile-build-env/latest/Dockerfile | 2 +- docker/liquibase/latest/Dockerfile | 2 +- docker/liquibase/mysql/Dockerfile | 2 +- docker/liquibase/postgres/Dockerfile | 2 +- docker/liquidsoap/latest/Dockerfile | 2 +- docker/mail-sandbox/latest/Dockerfile | 2 +- docker/nginx-dev/alpine/Dockerfile | 2 +- docker/nginx-dev/centos-7/Dockerfile | 2 +- docker/nginx-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-17.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-17.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-18.04/Dockerfile | 2 +- docker/nginx/alpine/Dockerfile | 2 +- docker/nginx/centos-7/Dockerfile | 2 +- docker/nginx/debian-10/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/nginx/ubuntu-16.10/Dockerfile | 2 +- docker/nginx/ubuntu-17.04/Dockerfile | 2 +- docker/nginx/ubuntu-17.10/Dockerfile | 2 +- docker/nginx/ubuntu-18.04/Dockerfile | 2 +- docker/php-apache-dev/5.6/Dockerfile | 2 +- docker/php-apache-dev/7.0/Dockerfile | 2 +- docker/php-apache-dev/7.1-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.1/Dockerfile | 2 +- docker/php-apache-dev/7.2-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.2/Dockerfile | 2 +- docker/php-apache-dev/7.3-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.3/Dockerfile | 2 +- docker/php-apache-dev/7.4-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.4/Dockerfile | 2 +- docker/php-apache-dev/8.0-alpine/Dockerfile | 2 +- docker/php-apache-dev/8.0/Dockerfile | 2 +- docker/php-apache-dev/centos-7-php56/Dockerfile | 2 +- docker/php-apache-dev/centos-7-php7/Dockerfile | 2 +- docker/php-apache-dev/centos-7/Dockerfile | 2 +- docker/php-apache-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-17.04/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-17.10/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-18.04/Dockerfile | 2 +- docker/php-apache/5.6/Dockerfile | 2 +- docker/php-apache/7.0/Dockerfile | 2 +- docker/php-apache/7.1-alpine/Dockerfile | 2 +- docker/php-apache/7.1/Dockerfile | 2 +- docker/php-apache/7.2-alpine/Dockerfile | 2 +- docker/php-apache/7.2/Dockerfile | 2 +- docker/php-apache/7.3-alpine/Dockerfile | 2 +- docker/php-apache/7.3/Dockerfile | 2 +- docker/php-apache/7.4-alpine/Dockerfile | 2 +- docker/php-apache/7.4/Dockerfile | 2 +- docker/php-apache/8.0-alpine/Dockerfile | 2 +- docker/php-apache/8.0/Dockerfile | 2 +- docker/php-apache/centos-7-php56/Dockerfile | 2 +- docker/php-apache/centos-7-php7/Dockerfile | 2 +- docker/php-apache/centos-7/Dockerfile | 2 +- docker/php-apache/debian-10/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-apache/ubuntu-16.10/Dockerfile | 2 +- docker/php-apache/ubuntu-17.04/Dockerfile | 2 +- docker/php-apache/ubuntu-17.10/Dockerfile | 2 +- docker/php-apache/ubuntu-18.04/Dockerfile | 2 +- docker/php-dev/5.6/Dockerfile | 2 +- docker/php-dev/7.0/Dockerfile | 2 +- docker/php-dev/7.1-alpine/Dockerfile | 2 +- docker/php-dev/7.1/Dockerfile | 2 +- docker/php-dev/7.2-alpine/Dockerfile | 2 +- docker/php-dev/7.2/Dockerfile | 2 +- docker/php-dev/7.3-alpine/Dockerfile | 2 +- docker/php-dev/7.3/Dockerfile | 2 +- docker/php-dev/7.4-alpine/Dockerfile | 2 +- docker/php-dev/7.4/Dockerfile | 2 +- docker/php-dev/8.0-alpine/Dockerfile | 2 +- docker/php-dev/8.0/Dockerfile | 2 +- docker/php-dev/centos-7-php56/Dockerfile | 2 +- docker/php-dev/centos-7-php7/Dockerfile | 2 +- docker/php-dev/centos-7/Dockerfile | 2 +- docker/php-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/php-dev/ubuntu-17.04/Dockerfile | 2 +- docker/php-dev/ubuntu-17.10/Dockerfile | 2 +- docker/php-dev/ubuntu-18.04/Dockerfile | 2 +- docker/php-nginx-dev/5.6/Dockerfile | 2 +- docker/php-nginx-dev/7.0/Dockerfile | 2 +- docker/php-nginx-dev/7.1-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.1/Dockerfile | 2 +- docker/php-nginx-dev/7.2-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.2/Dockerfile | 2 +- docker/php-nginx-dev/7.3-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.3/Dockerfile | 2 +- docker/php-nginx-dev/7.4-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.4/Dockerfile | 2 +- docker/php-nginx-dev/8.0-alpine/Dockerfile | 2 +- docker/php-nginx-dev/8.0/Dockerfile | 2 +- docker/php-nginx-dev/centos-7-php56/Dockerfile | 2 +- docker/php-nginx-dev/centos-7-php7/Dockerfile | 2 +- docker/php-nginx-dev/centos-7/Dockerfile | 2 +- docker/php-nginx-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 2 +- docker/php-nginx/5.6/Dockerfile | 2 +- docker/php-nginx/7.0/Dockerfile | 2 +- docker/php-nginx/7.1-alpine/Dockerfile | 2 +- docker/php-nginx/7.1/Dockerfile | 2 +- docker/php-nginx/7.2-alpine/Dockerfile | 2 +- docker/php-nginx/7.2/Dockerfile | 2 +- docker/php-nginx/7.3-alpine/Dockerfile | 2 +- docker/php-nginx/7.3/Dockerfile | 2 +- docker/php-nginx/7.4-alpine/Dockerfile | 2 +- docker/php-nginx/7.4/Dockerfile | 2 +- docker/php-nginx/8.0-alpine/Dockerfile | 2 +- docker/php-nginx/8.0/Dockerfile | 2 +- docker/php-nginx/centos-7-php56/Dockerfile | 2 +- docker/php-nginx/centos-7-php7/Dockerfile | 2 +- docker/php-nginx/centos-7/Dockerfile | 2 +- docker/php-nginx/debian-10/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-nginx/ubuntu-16.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-17.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-17.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-18.04/Dockerfile | 2 +- docker/php-official/5.6/Dockerfile | 4 ++-- docker/php-official/7.0/Dockerfile | 4 ++-- docker/php-official/7.1-alpine/Dockerfile | 4 ++-- docker/php-official/7.1/Dockerfile | 4 ++-- docker/php-official/7.2-alpine/Dockerfile | 4 ++-- docker/php-official/7.2/Dockerfile | 4 ++-- docker/php-official/7.3-alpine/Dockerfile | 4 ++-- docker/php-official/7.3/Dockerfile | 4 ++-- docker/php-official/7.4-alpine/Dockerfile | 4 ++-- docker/php-official/7.4/Dockerfile | 4 ++-- docker/php-official/8.0-alpine/Dockerfile | 4 ++-- docker/php-official/8.0/Dockerfile | 4 ++-- docker/php/centos-7-php56/Dockerfile | 2 +- docker/php/centos-7-php7/Dockerfile | 2 +- docker/php/centos-7/Dockerfile | 2 +- docker/php/debian-10/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/php/ubuntu-16.10/Dockerfile | 2 +- docker/php/ubuntu-17.04/Dockerfile | 2 +- docker/php/ubuntu-17.10/Dockerfile | 2 +- docker/php/ubuntu-18.04/Dockerfile | 2 +- docker/piwik/latest/Dockerfile | 2 +- docker/postfix/latest/Dockerfile | 2 +- docker/samson-deployment/latest/Dockerfile | 4 ++-- docker/sphinx/latest/Dockerfile | 2 +- docker/ssh/latest/Dockerfile | 2 +- docker/storage/latest/Dockerfile | 2 +- docker/toolbox/latest/Dockerfile | 2 +- docker/typo3-solr/3.1/Dockerfile | 4 ++-- docker/typo3-solr/5.0/Dockerfile | 4 ++-- docker/typo3-solr/6.0/Dockerfile | 4 ++-- docker/typo3-solr/6.1/Dockerfile | 4 ++-- docker/typo3-solr/6.5/Dockerfile | 4 ++-- docker/typo3-solr/7.0/Dockerfile | 4 ++-- docker/typo3-solr/7.5/Dockerfile | 4 ++-- docker/typo3-solr/8.0/Dockerfile | 4 ++-- docker/typo3-solr/8.1/Dockerfile | 4 ++-- docker/varnish/latest/Dockerfile | 2 +- docker/vsftp/latest/Dockerfile | 2 +- 315 files changed, 352 insertions(+), 352 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index ba2c87605..a2f7cba35 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine RUN set -x \ # Install ansible diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 87ea57281..8b5a2866d 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 RUN set -x \ # Install ansible diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index bed9b04c4..8d56810dc 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 RUN set -x \ # Install ansible diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 9914c5b10..1ea1eeb9c 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 RUN set -x \ # Install ansible diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 74c5c965e..015d11b54 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 279dc25ec..f65e86854 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index ae87b4ff7..290e4083b 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 902c77c67..f067892f8 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 70b7e05a9..fbe126a9a 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 1edb5ef9e..f1800fd85 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 RUN set -x \ # Install ansible diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index 30e8915c5..4ffbfb568 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 RUN set -x \ # Install ansible diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 23ec18044..51aa595e8 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:alpine ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index e0b199ef3..3e691d5a9 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:centos-7 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index 7fceeaafc..501c8715b 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index e23743989..3e54801dc 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-7 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 58b393ec0..7466f11a7 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-8 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 27e582295..4cbcf8897 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-9 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 48d22c682..cfdd1cfcb 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-12.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 4e0b8f8d6..41a8e8efd 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-14.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 7308c21ab..3248c1692 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 51d44ae07..555ef8aed 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index e921b69e1..4d378c31e 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 6eda084b5..11f8f0d72 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index 218149235..b132d9e4f 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index 4dbbb49f6..b6b8a6ee6 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index 80285015f..ac410bbef 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-18.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index 4d99a98a0..6fdff63a6 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index b45910e78..1476e82c2 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index e1a72eccf..aba306a64 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index b72586b56..cb1f0758d 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index db64598e2..1e2e90c47 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 94195aea6..4a5653ea4 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 17d2b2215..568597354 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 3c5ecb8f6..e0a976a69 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 90f611b57..9fb7e6443 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 72cfa92b4..f21a53be5 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 46371ec28..ec85eb2dc 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index 9b7b92e89..e7dbf5c11 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index f598a89bc..cb728ac1e 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index f6e142c1d..9bdb425ef 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index dce6ea344..61e505296 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index e16dbb650..0a479bd90 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 7f63f616d..f2a5ac3d0 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index 5afb814eb..2ebdc6b35 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index b960492d9..f18c068bf 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 17eda5442..49237af2f 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 87e677fac..79c5b6364 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 9789bfae8..c2f03c96d 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 9629f2dfb..1c4536410 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 70259fa4a..0f3bb38ce 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index e1f7a438a..ad58488c5 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index dceba56f5..0ea7b4676 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 65b49e524..e2efd117e 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index a3b845835..38e4b93eb 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index f50e9ac99..62b3b7f87 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index f814bd97b..85ceb2db5 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 3fc786eb0..be2c70e80 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 96bd53975..0bb8fa63a 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index 27eb40ae4..3d9a01adf 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-10 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index d5bc0c5ef..c149f1d37 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index c6efeb3de..f6d708f37 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 76b682bc3..c071067fe 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index c5194ea13..25edf2ca6 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 8fb118560..8170e9180 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index d2e501813..d5944660f 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 953cc0ee0..4051b07a4 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index b9bb96cdd..31d68ddeb 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 7f7be0fbd..720a307c4 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.10 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index 01e9c446b..080fef41e 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index 41c43284a..c2c882890 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.10 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index 888eaaec9..e51f6a0cd 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-18.04 ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 163f5f9ae..1d5b96d6e 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM alpine:3.11 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/alpine:3.11 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 44441db4d..7b8bbaf88 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM centos:7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/centos:7 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 4e65ebf45..484c9cdcc 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM debian:buster +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/debian:buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index ac061d483..b2024aa85 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM debian:7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/debian:7 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 61495a867..d5932c9b1 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM debian:8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/debian:8 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index e5b5b2492..5051b8a5c 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM debian:stretch +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/debian:stretch LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index b814ad048..ba06c1c54 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:12.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 00979ced7..abb7aff91 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:14.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index b62b2791a..1b718891d 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:15.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 9166c08f8..d55c8a070 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:15.10 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index bc4992a6e..1d6c85623 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:16.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 909b91d42..136be3f9a 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:16.10 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 07eb25bab..bff47db27 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:17.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 482691454..4b79d39ea 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:17.10 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 42a85bfa7..093bb3ce8 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM ubuntu:18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:18.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 20a9a2587..b918dc8fb 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine VOLUME /etc/letsencrypt VOLUME /var/www diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 8a63abde0..aa91d1ddb 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-18.04 RUN apt-install \ build-essential \ diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index e56e4364b..2143386f1 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM openjdk:8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/openjdk:8 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index a2d11d00e..19ef4d98c 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM openjdk:8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/openjdk:8 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index 0d3fb9344..1d2618c0a 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM openjdk:8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/openjdk:8 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index cd0abe08b..4d539ebeb 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:latest +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:latest # Install services RUN /usr/local/bin/apt-install \ diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index f52260237..84b2d37f2 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:latest +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:latest ENV MAILBOX_USERNAME="dev" \ MAILBOX_PASSWORD="dev" diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile index 0eb522c79..6a8a81cd5 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:alpine ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index e4e10833c..8b49de485 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:centos-7 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-10/Dockerfile b/docker/nginx-dev/debian-10/Dockerfile index fbe941588..a532f2007 100644 --- a/docker/nginx-dev/debian-10/Dockerfile +++ b/docker/nginx-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 218f8c5e8..a00f0f9d3 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-7 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index e1f88bc8c..f6a87116a 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-8 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 56aeba486..eedf2845c 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-9 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index acd7dc889..0972f22f3 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-12.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index c0b6fc6c4..fc40f49b4 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-14.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index d3430bf8a..078bf7d63 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index cc2c46fcc..3626e5014 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index d8c0ed8a1..9136b64f1 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 8e0eaed03..7fcd84c2c 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile b/docker/nginx-dev/ubuntu-17.04/Dockerfile index a6fedfccb..9f7f4e724 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile b/docker/nginx-dev/ubuntu-17.10/Dockerfile index ce6893611..9d319ab5f 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.10 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile b/docker/nginx-dev/ubuntu-18.04/Dockerfile index 1165bdbf4..b99da7490 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-18.04 ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index b39c1a8b6..ab0db62fa 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index ce55fba2e..bec8f22c6 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index 9fcdb9059..7db0f421d 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 93a39a138..ac92ec0f6 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index d9c4774c7..34f55feb4 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 3de217257..fc806fb10 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 36f780f26..1f8c6962b 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 765e5e614..32055985b 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 535a4a1c7..5fb29b44b 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 270028bed..93cdc3e9c 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index a7e9785ff..82e9c8a91 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 9184cdf16..2a8a3cd7c 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index d53a9cc32..71db037c7 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index f495fc4e4..a3759e145 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index fcd0fed85..362edd2c8 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index 55588cf20..63fdb9ad2 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:5.6 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:5.6 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 033c196b8..252f25626 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.0 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index b8efab538..e7110935b 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.1-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index 048e63699..dba0a6cfb 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.1 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index 7917c4b84..2dcaeb548 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.2-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index 434ae916b..348efccd8 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.2 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index 49b79c31e..203b613e4 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.3-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.3-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 7d21f4980..3ae96b418 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.3 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.3 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index e25f0b26c..713062d45 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.4-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.4-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index 4cdb8b9dc..b18fd6784 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:7.4 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.4 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index c23603f6c..21bc4331b 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.0-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-apache:8.0-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index 3a3a2a1f0..f0a541005 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.0 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:8.0 ENV WEB_DOCUMENT_ROOT=/app \ 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 79cf3428b..1e51d4d9b 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:centos-7-php56 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7-php56 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index a9d6ddff7..9762a672b 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:centos-7-php7 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 52fc8a51f..da83aa36e 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:centos-7 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile index 13f3ae66c..6d6027a3d 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:debian-10 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index bffdc9062..96b4e9ed5 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:debian-7 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ 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 c40c6886b..97b043f81 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:debian-8-php7 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-8-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index ebbe4275d..ff8707575 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:debian-8 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 6f29afbaa..5e47348fd 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:debian-9 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ 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 521505f8a..ce1ac43f4 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ 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 0a4cb38c6..8e77fbc92 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ 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 e6433856c..dd5cc2f48 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ 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 b612158d8..ddcc02697 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ 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 90a86b386..00cdd82dd 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index f86a3d697..8a073fc87 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index ccbdde509..b3d16944c 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index ab75db046..ca7beebc3 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index bee2acdcd..ea1a1f92b 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index fc7177c41..3768386a5 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:5.6 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index 7bdb936c6..98d8d28d9 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index b31c722eb..0e05c3e26 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index 1a80e95a1..1ffea3d51 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.1 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index 83bf46343..aac6cff01 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index 1e8fc3fcf..d2aee3770 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.2 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 04240517b..26e5ac105 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index 4ff156a1c..e5cf8693d 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.3 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index bb66897df..e88901bb1 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index 1266a376d..00747aeb4 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.4 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 7ec21afe2..0d18be499 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index cfa10673a..6467e1ab6 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:8.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index ed1a6b785..c98da2846 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 4f4040468..19e0dd285 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 062d338b5..74f208d0c 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index 31b4a231d..fc795c554 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 1f1753972..73d641f9d 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 9afb7eb36..ac6b789c7 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 4ded5291f..89b036ca5 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index d5571b720..41b38bd58 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 6daaa02ae..3edc30993 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index cd4cf7c78..93fc111e8 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 85a330b0e..bd3369717 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 69384a1fd..14da70198 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index e0f993315..ef4343a62 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index 50761d917..e6431b13c 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index 9f2bdd016..ac12c14e2 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index 09ff6e6c5..a4e824d5f 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index 059937833..00f4e0f96 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index 256ac11f9..c93a56d8b 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:5.6 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index f8cecf27d..5d4b53efd 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index 7a71a0158..e248fc1e4 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 0ccc1c231..d476350c3 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.1 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index d868442a4..6edd2adcd 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index cc2e6dea0..fb31dd92f 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.2 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index 4e0b6a249..88458042d 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 4a5a4386e..4207e4551 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.3 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index c9d8d5450..6915ad855 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 0cb7c07b4..613b33a1e 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.4 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index fae379511..743d4adad 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 6e8b01842..9446aeadd 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:8.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 2c58ae8e9..1c405db12 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index a8eeaf8f3..8186e509a 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 5c8ed9a42..d255b7862 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index ea5bc9551..87e8db7c4 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index d1b942cb3..cdc15ab54 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 259d6a410..ec79b9444 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index b09874704..139f08b71 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 8956b3707..b614ab941 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index f46dfee7b..137d272b6 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 3fc40da65..bd5f318bc 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 2924394c4..b767cc154 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index cba611482..471f92a06 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 07e489fc6..02faa7a6b 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 9aa713c09..9ec564e31 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index 8c8e5f22e..d3d60394f 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index d6f4fe0fe..dbde2f3bc 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index fec35ecd1..ebe4c7e3c 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index d587e3538..da13a11b7 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:5.6 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:5.6 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index 0e7e7663b..659ab812b 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.0 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index 0ac95c75b..1baee2b89 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.1-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 91c446bf0..19d12d30e 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.1 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index b5602ce9e..d575af75e 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.2-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index 0434992ed..0f1a106f0 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.2 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index 41b7cfb18..d7a85e510 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.3-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.3-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index e35485523..2e9aa80f4 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.3 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.3 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 2e9668020..5310ff4bb 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.4-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.4-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index ac80ed6ad..968a6b669 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.4 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.4 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 99d02ac98..16e9f2b02 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.0-alpine +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:8.0-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index d5321d655..c213655ae 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.0 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:8.0 ENV WEB_DOCUMENT_ROOT=/app \ 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 9e628f253..0b1f89858 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:centos-7-php56 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7-php56 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index 200f890eb..bede1bbd2 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:centos-7-php7 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 958178e90..00e6809bb 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:centos-7 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile index 1c894dbe3..9588a26a3 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:debian-10 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 5f9a3234a..f24312b56 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:debian-7 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ 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 802408826..d4f2c01f7 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:debian-8-php7 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-8-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index d6d8a1eae..96bc5e9dd 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:debian-8 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index 46deccdcc..dae5b2bb2 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:debian-9 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ 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 d4fb27a40..490f65ea3 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ 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 88f1a2589..242c4db92 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ 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 17e52c8f6..0d9394588 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ 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 5270614f7..18d8cccfb 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ 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 b5967e002..129e2defe 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 124549f78..eface987a 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index fa3d5d7ef..9cd5c7b3c 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index 868f5bf6e..1b4cfa952 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index 500ff3bcd..17f6dd1bc 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index 2443a7017..6699e8bbf 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:5.6 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index cece8f00e..1ef66c693 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index e9de69772..b22f7e67b 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index e1561e15f..1c1d15782 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.1 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index 11389ad63..6b831ac97 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index 3a00de5c2..f469281ad 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.2 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index fe69f013c..a627c49cf 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index 762bc3397..c8e0c55b0 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.3 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index eef2affd2..57ddd327f 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index d513e99e2..1bb09f550 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:7.4 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index 4ca06aa5e..cbe40d837 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index a6ecb1355..d136cbbad 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:8.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 9bb33fcad..6d6887b73 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 7ac8c3f97..4d313785f 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index ddea17ee9..341a9d9d5 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:centos-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index 38a9b980c..f17d549ff 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index d5f2cfe55..5cb5247d2 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index b49f7faf6..fc50bfd55 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 6da164647..1e45021a3 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-8 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 6a9ebc26e..bf9f9b481 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:debian-9 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index c51cfbb0e..d35385933 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 1c0b76b64..6d5f898eb 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 2b3881422..e8cb7e6cf 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 956fb2a7a..d1fd6ea42 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index dee9a0301..f739e2bda 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 16f6d06ac..d65a3150c 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index 0b8e3ea50..de77909ba 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index 535fb9060..b5000bd2e 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index 88ac8c6f0..3a3988ae2 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index cc8abc696..72744b88f 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:5.6-fpm-stretch +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6-fpm-stretch LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index de7bd1411..33026c8ab 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.0-fpm-stretch +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0-fpm-stretch LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 20723d928..f328bcdeb 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.1-fpm-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 7a486e7d1..c928812e2 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.1-fpm-buster +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 92ccb89e9..a30c7733a 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.2-fpm-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 368703cd0..41ff235e9 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.2-fpm-buster +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 8888c3530..5af402665 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.3-fpm-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index dc18534a2..303c87661 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.3-fpm-buster +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index f02875ed5..5206c3989 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.4-fpm-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index a9fb3b2a6..a2bf1e787 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:7.4-fpm-buster +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 6b4636493..2d6ee25cd 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:8.0-fpm-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index acd1b3f1f..ef9ce1272 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM php:8.0-fpm-buster +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 283970fb5..c18e803d5 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:centos-7 +FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index 2f1302db3..93a4651c4 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:centos-7 +FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index eec9aff56..b05f41305 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:centos-7 +FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile index 9a3194fd4..ea988e574 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:debian-10 +FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index acab930e4..f8da8d935 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:debian-7 +FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 6976fe746..6012c9a61 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:debian-8 +FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 1f8b75d67..4fc27564d 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:debian-8 +FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-8 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 31b2f8e0b..e7c72c93a 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:debian-9 +FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-9 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 8500ff916..b4864bd16 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-12.04 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-12.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 7952a1121..7c69e292d 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-14.04 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-14.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index b7041841d..c2dbf126a 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-15.04 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-15.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index aa1fe7caa..987c33f27 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-15.10 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-15.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 042bb6f03..8ab0f064f 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-16.04 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-16.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 4f3133dc2..915fa2ed8 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-16.10 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-16.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile index dba18c285..048209705 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-17.04 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-17.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile index bd7c1755b..153aa4e13 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-17.10 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-17.10 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile index 093cad5f5..ea6c24ad6 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-18.04 +FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-18.04 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index 1e90cba76..a945a83b6 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:7.1 +FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1 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 352a16bac..ff876aee1 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:latest +FROM --platform=$BUILDPLATFORM webdevops/base-app:latest COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 10efcf825..2f9eea3f8 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM zendesk/samson:latest +FROM --platform=$BUILDPLATFORM zendesk/samson:latest ENV TERM="xterm" \ LANG="C.UTF-8" \ diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 710b4d73a..b5157bdd1 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine RUN set -x \ && apk-install \ diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 87c7c50e1..4d2cabaef 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:latest +FROM --platform=$BUILDPLATFORM webdevops/base-app:latest RUN set -x \ && docker-service enable ssh \ diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index ace1f12cf..67ce49c59 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -3,5 +3,5 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM alpine:latest +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/alpine:latest diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index af0fc71cb..88a179fb7 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM alpine:latest +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/alpine:latest RUN apk add --no-cache \ ca-certificates \ diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index ff7d7559f..75b7ff5f4 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM guywithnose/solr:4.10.4 +FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 9c82fc099..33ab40b07 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM guywithnose/solr:4.10.4 +FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 2719d072a..893f6dce3 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM solr:6.3.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.3.0 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index f231c67b7..b2b9a0d3a 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM solr:6.3.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.3.0 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index d2c858f3e..440a5414f 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM solr:6.6.2 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.6.2 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 96ce0a390..e6ece385d 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM solr:6.3.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.3.0 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 9e1278f59..b08ca34fd 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM solr:6.6.2 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.6.2 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index d8c455a98..be33744f7 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM solr:6.6.2 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.6.2 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 5e357bc29..24b9984af 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -5,7 +5,7 @@ # Staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM solr:6.6.3 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.6.3 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 89e41dd9b..0c652b49f 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index e72ec3492..b8fb46563 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM ghcr.io/cocoastorm/webdevops/base:latest +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:latest ENV FTP_USER=application \ FTP_PASSWORD=application \ From f9680c91bc10b6a349aefa834627cd0f4e72aa98 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 11:35:06 -0700 Subject: [PATCH 040/123] oops official image macro shouldn't have user --- template/Dockerfile/docker.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index cf5498426..f9c55d360 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -8,7 +8,7 @@ FROM {{ user }}/{{ image }}:{{ tag }} {% macro fromOfficial(image, tag="latest", platform=True) -%} {% if platform -%} -FROM --platform=$BUILDPLATFORM {{ user }}/{{ image }}:{{ tag }} +FROM --platform=$BUILDPLATFORM {{ image }}:{{ tag }} {%- else -%} FROM {{ image }}:{{ tag }} {%- endif %} From 086525e49a6630c55d4ca628ebe9d31c634f9d88 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 11:35:31 -0700 Subject: [PATCH 041/123] remove user prefix from official FROM statements --- docker/bootstrap/alpine/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-10/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/bootstrap/ubuntu-16.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-17.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-17.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-18.04/Dockerfile | 2 +- docker/liquibase/latest/Dockerfile | 2 +- docker/liquibase/mysql/Dockerfile | 2 +- docker/liquibase/postgres/Dockerfile | 2 +- docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1-alpine/Dockerfile | 2 +- docker/php-official/7.1/Dockerfile | 2 +- docker/php-official/7.2-alpine/Dockerfile | 2 +- docker/php-official/7.2/Dockerfile | 2 +- docker/php-official/7.3-alpine/Dockerfile | 2 +- docker/php-official/7.3/Dockerfile | 2 +- docker/php-official/7.4-alpine/Dockerfile | 2 +- docker/php-official/7.4/Dockerfile | 2 +- docker/php-official/8.0-alpine/Dockerfile | 2 +- docker/php-official/8.0/Dockerfile | 2 +- docker/storage/latest/Dockerfile | 2 +- docker/toolbox/latest/Dockerfile | 2 +- docker/typo3-solr/6.0/Dockerfile | 2 +- docker/typo3-solr/6.1/Dockerfile | 2 +- docker/typo3-solr/6.5/Dockerfile | 2 +- docker/typo3-solr/7.0/Dockerfile | 2 +- docker/typo3-solr/7.5/Dockerfile | 2 +- docker/typo3-solr/8.0/Dockerfile | 2 +- docker/typo3-solr/8.1/Dockerfile | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 1d5b96d6e..f6d9e3f52 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/alpine:3.11 +FROM --platform=$BUILDPLATFORM alpine:3.11 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 7b8bbaf88..b6853164b 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/centos:7 +FROM --platform=$BUILDPLATFORM centos:7 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 484c9cdcc..aa50c7341 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/debian:buster +FROM --platform=$BUILDPLATFORM debian:buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index b2024aa85..15d46363e 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/debian:7 +FROM --platform=$BUILDPLATFORM debian:7 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index d5932c9b1..1a71aa88b 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/debian:8 +FROM --platform=$BUILDPLATFORM debian:8 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 5051b8a5c..51e033868 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/debian:stretch +FROM --platform=$BUILDPLATFORM debian:stretch LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index ba06c1c54..0afcc0c8e 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:12.04 +FROM --platform=$BUILDPLATFORM ubuntu:12.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index abb7aff91..25b8af1ea 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:14.04 +FROM --platform=$BUILDPLATFORM ubuntu:14.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 1b718891d..ca0bc5de5 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:15.04 +FROM --platform=$BUILDPLATFORM ubuntu:15.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index d55c8a070..bfdc5f36f 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:15.10 +FROM --platform=$BUILDPLATFORM ubuntu:15.10 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 1d6c85623..ed933ba14 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:16.04 +FROM --platform=$BUILDPLATFORM ubuntu:16.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 136be3f9a..f1058125d 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:16.10 +FROM --platform=$BUILDPLATFORM ubuntu:16.10 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index bff47db27..45f2bf83c 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:17.04 +FROM --platform=$BUILDPLATFORM ubuntu:17.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 4b79d39ea..df8c2dc6b 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:17.10 +FROM --platform=$BUILDPLATFORM ubuntu:17.10 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 093bb3ce8..9d5ca854a 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/ubuntu:18.04 +FROM --platform=$BUILDPLATFORM ubuntu:18.04 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index 2143386f1..93073796f 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/openjdk:8 +FROM --platform=$BUILDPLATFORM openjdk:8 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index 19ef4d98c..4100b18df 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/openjdk:8 +FROM --platform=$BUILDPLATFORM openjdk:8 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index 1d2618c0a..d2e4ca809 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/openjdk:8 +FROM --platform=$BUILDPLATFORM openjdk:8 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 72744b88f..519e4edeb 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6-fpm-stretch +FROM --platform=$BUILDPLATFORM php:5.6-fpm-stretch LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 33026c8ab..91d171613 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0-fpm-stretch +FROM --platform=$BUILDPLATFORM php:7.0-fpm-stretch LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index f328bcdeb..1786d4798 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-fpm-alpine +FROM --platform=$BUILDPLATFORM php:7.1-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index c928812e2..2605fa260 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-fpm-buster +FROM --platform=$BUILDPLATFORM php:7.1-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index a30c7733a..87bc96619 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-fpm-alpine +FROM --platform=$BUILDPLATFORM php:7.2-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 41ff235e9..1098dcf97 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-fpm-buster +FROM --platform=$BUILDPLATFORM php:7.2-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 5af402665..2504c9943 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-fpm-alpine +FROM --platform=$BUILDPLATFORM php:7.3-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 303c87661..70394effe 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-fpm-buster +FROM --platform=$BUILDPLATFORM php:7.3-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 5206c3989..152f2425d 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-fpm-alpine +FROM --platform=$BUILDPLATFORM php:7.4-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index a2bf1e787..a375a795a 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-fpm-buster +FROM --platform=$BUILDPLATFORM php:7.4-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 2d6ee25cd..bc7785183 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-fpm-alpine +FROM --platform=$BUILDPLATFORM php:8.0-fpm-alpine LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index ef9ce1272..53cc0021b 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-fpm-buster +FROM --platform=$BUILDPLATFORM php:8.0-fpm-buster LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index 67ce49c59..b33caadb6 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -3,5 +3,5 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/alpine:latest +FROM --platform=$BUILDPLATFORM alpine:latest diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index 88a179fb7..37836c64b 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/alpine:latest +FROM --platform=$BUILDPLATFORM alpine:latest RUN apk add --no-cache \ ca-certificates \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 893f6dce3..e54bf7c55 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.3.0 +FROM --platform=$BUILDPLATFORM solr:6.3.0 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index b2b9a0d3a..a610fceaf 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.3.0 +FROM --platform=$BUILDPLATFORM solr:6.3.0 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 440a5414f..ebb34cd88 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.6.2 +FROM --platform=$BUILDPLATFORM solr:6.6.2 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index e6ece385d..6bb4bbb43 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.3.0 +FROM --platform=$BUILDPLATFORM solr:6.3.0 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index b08ca34fd..0a3e32439 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.6.2 +FROM --platform=$BUILDPLATFORM solr:6.6.2 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index be33744f7..04e559de5 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.6.2 +FROM --platform=$BUILDPLATFORM solr:6.6.2 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 24b9984af..76e72e900 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p \ && chmod +x "/baselayout/sbin/gosu" -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/solr:6.6.3 +FROM --platform=$BUILDPLATFORM solr:6.6.3 LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ From 4638eb629bc81b1ccf28abb8e5a229ccc7573868 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 12:48:14 -0700 Subject: [PATCH 042/123] tweak dockerfile from regex for "--platform" flag --- bin/command/generate_gh_action_matrix_command.py | 15 +++++++++++---- bin/webdevops/DockerfileUtility.py | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index e1a9b40ee..e687a09d1 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -18,19 +18,20 @@ class GenerateGHActionMatrixCommand(BaseCommand): {--blacklist=?* : image/tag blacklist } """ + image_user = '' image_prefix = '' dockerfile_path = '' def run_task(self, configuration): - image_prefix = configuration.get('docker.imageUser') or configuration.get('docker.imagePrefix') + image_user = configuration.get('docker.imageUser') + image_prefix = configuration.get('docker.imagePrefix') template_path = os.path.join(configuration.get('templatePath'), 'Github') dockerfile_path = configuration.get('dockerPath') - github_actions_path = configuration.get('githubActionsPath') - github_action_file = os.path.join(github_actions_path, 'docker.yml') whitelist = self.get_whitelist() blacklist = self.get_blacklist() + self.image_user = image_user self.image_prefix = image_prefix self.dockerfile_path = dockerfile_path @@ -114,6 +115,12 @@ def fmt_github_output(self, name, output): return "::set-output name=%s::%s" % (name, text) + def fmt_tags(self, image, tag): + if self.image_user: + return f"{self.image_user}/{self.image_prefix}/{image}:{tag}" + else: + return f"{self.image_prefix}/{image}:{tag}" + def process_dockerfile(self, input_file): """ :param input_file: Input File @@ -131,7 +138,7 @@ def process_dockerfile(self, input_file): 'input': input_file, 'name': f"{docker_image}:{docker_tag}", 'context': context_dir, - 'tags': f"{self.image_prefix}/{docker_image}:{docker_tag}" + 'tags': self.fmt_tags(docker_image, docker_tag) } if Output.VERBOSITY_NORMAL <= self.output.get_verbosity(): diff --git a/bin/webdevops/DockerfileUtility.py b/bin/webdevops/DockerfileUtility.py index 4902e352e..9b805a0c9 100644 --- a/bin/webdevops/DockerfileUtility.py +++ b/bin/webdevops/DockerfileUtility.py @@ -22,8 +22,8 @@ import re from pathlib import Path -DOCKERFILE_STATEMENT_FROM_RE = re.compile(r'FROM\s+(?P[^\s:]+)(:(?P[^\s:]+))?(?!.*\s+AS)', re.MULTILINE) -DOCKERFILE_STATEMENT_FROM_MULTISTAGE_RE = re.compile(r'FROM\s+(?P[^\s:]+)(:(?P[^\s:]+))?(\s+AS)', re.MULTILINE) +DOCKERFILE_STATEMENT_FROM_RE = re.compile(r'FROM\s+(?P--platform=\S+\s)?(?P[^\s:]+)(:(?P[^\s:]+))?(?!.*\s+AS)', re.MULTILINE) +DOCKERFILE_STATEMENT_FROM_MULTISTAGE_RE = re.compile(r'FROM\s+(?P--platform=\S+\s)?(?P[^\s:]+)(:(?P[^\s:]+))?(\s+AS)', re.MULTILINE) def find_file_in_path(dockerfile_path, filename="Dockerfile", whitelist=False, blacklist=False): """ From 7ab17e0bd5591ddcabf0b4e231968b896438edc8 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 13:42:33 -0700 Subject: [PATCH 043/123] bump back to 2 max-parallel --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 97d721f32..692542692 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -51,7 +51,7 @@ jobs: - generate-matrix runs-on: ubuntu-latest strategy: - max-parallel: 1 + max-parallel: 2 matrix: include: ${{ fromJson(needs.generate-matrix.outputs.base) }} steps: @@ -74,7 +74,7 @@ jobs: - build-base-images runs-on: ubuntu-latest strategy: - max-parallel: 1 + max-parallel: 2 matrix: include: ${{ fromJson(needs.generate-matrix.outputs.multi) }} steps: From ab25c219b1a6c910320897b395595b234cdbb202 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 14:17:51 -0700 Subject: [PATCH 044/123] remove typo, should be context, not content --- .github/workflows/docker.yml | 4 ++-- bin/command/generate_gh_action_matrix_command.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 692542692..edf1bc3f3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -69,8 +69,8 @@ jobs: build-multi-images: needs: - - build-toolbox-image - generate-matrix + - build-toolbox-image - build-base-images runs-on: ubuntu-latest strategy: @@ -87,6 +87,6 @@ jobs: registry-user: ${{ github.repository_owner }} registry-secret: ${{ secrets.GITHUB_TOKEN }} image-name: ${{ matrix.name }} - image-context: ${{ matrix.content }} + image-context: ${{ matrix.context }} image-tags: ${{ matrix.tags }} diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index e687a09d1..08e235a93 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -68,7 +68,6 @@ def run_task(self, configuration): from_img = DockerfileUtility.parse_dockerfile_from_statement(dockerfile_input) if image_prefix in from_img: - block['needs_parent'] = True needs_dep_img_blocks.append(block) else: base_img_blocks.append(block) From f3c155484937a164e6f9ae5fa8df80ef1b42131d Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 15:58:34 -0700 Subject: [PATCH 045/123] comment out "base_path = os.path.dirname(path)" --- bin/webdevops/DockerfileUtility.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/webdevops/DockerfileUtility.py b/bin/webdevops/DockerfileUtility.py index 9b805a0c9..ad40d8de1 100644 --- a/bin/webdevops/DockerfileUtility.py +++ b/bin/webdevops/DockerfileUtility.py @@ -116,7 +116,7 @@ def parse_docker_info_from_path(path): ret = [] for path in find_dockerfile_in_path_recursive(base_path): - base_path = os.path.dirname(path) + # base_path = os.path.dirname(path) if os.path.isfile(path) and os.path.basename(path) == 'Dockerfile': dockerfile = { 'path': path, From 7f3fa3f0dc730f33b14c9f88ce84d494f6663898 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 16:00:21 -0700 Subject: [PATCH 046/123] replace call with find_dockerfiles_in_path to get better image tags --- .../generate_gh_action_matrix_command.py | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index 08e235a93..ff6e5b043 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -50,9 +50,16 @@ def run_task(self, configuration): for crit in blacklist: self.line("\t * %s" % crit) - dockerfiles = DockerfileUtility.find_file_in_path( - dockerfile_path=dockerfile_path, - filename="Dockerfile.jinja2", + # dockerfiles = DockerfileUtility.find_file_in_path( + # dockerfile_path=dockerfile_path, + # filename="Dockerfile.jinja2", + # whitelist=whitelist, blacklist=blacklist, + # ) + + dockerfiles = DockerfileUtility.find_dockerfiles_in_path( + base_path=self.configuration.get('dockerPath'), + path_regex=self.configuration.get('docker.pathRegex'), + image_prefix=self.configuration.get('docker.imagePrefix'), whitelist=whitelist, blacklist=blacklist, ) @@ -75,8 +82,6 @@ def run_task(self, configuration): # base images base_images = [] for base_img in base_img_blocks: - base_img['needs_parent'] = False - base_images.append(base_img) # toolbox should be first :tm: @@ -120,12 +125,8 @@ def fmt_tags(self, image, tag): else: return f"{self.image_prefix}/{image}:{tag}" - def process_dockerfile(self, input_file): - """ - :param input_file: Input File - :type input_file: str - """ - + def process_dockerfile(self, dockerfile): + input_file = dockerfile['abspath'] output_file = os.path.split(input_file)[0] docker_image = os.path.basename(os.path.dirname(output_file)) @@ -137,7 +138,7 @@ def process_dockerfile(self, input_file): 'input': input_file, 'name': f"{docker_image}:{docker_tag}", 'context': context_dir, - 'tags': self.fmt_tags(docker_image, docker_tag) + 'tags': dockerfile['image']['fullname'], } if Output.VERBOSITY_NORMAL <= self.output.get_verbosity(): From 9569417c1b8ffd064e89026bd51e1525cd35cf0e Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 16:01:17 -0700 Subject: [PATCH 047/123] support glob like matching --- bin/webdevops/DockerfileUtility.py | 33 +++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/bin/webdevops/DockerfileUtility.py b/bin/webdevops/DockerfileUtility.py index ad40d8de1..009110a23 100644 --- a/bin/webdevops/DockerfileUtility.py +++ b/bin/webdevops/DockerfileUtility.py @@ -139,20 +139,39 @@ def filter_dockerfile(dockerfile_list, whitelist=False, blacklist=False): """ Filter Dockerfiles by white- and blacklist """ + dockerfiles = [] + + # support glob-like style matching + def dockerfile_path_matches_term(dockerfile, term): + dockerfile_relpath = Path(os.path.relpath(dockerfile['path'], dockerfile['basePath'])) + return dockerfile_relpath.match(term) + + # support glob-like matching with a list of terms + def dockerfile_path_match_list(dockerfile, term_list): + for term in term_list: + if dockerfile_path_matches_term(dockerfile, term): + return True + return False + if whitelist: - tmp = [] for dockerfile in dockerfile_list: + dockerfile_name = dockerfile['image']['fullname'] + for term in whitelist: - if term in dockerfile['image']['fullname']: - tmp.append(dockerfile) + if term in dockerfile_name: + dockerfiles.append(dockerfile) break - dockerfile_list = tmp + + if dockerfile_path_matches_term(dockerfile, term): + dockerfiles.append(dockerfile) + else: + dockerfiles = dockerfile_list if blacklist: - for term in blacklist: - dockerfile_list = [x for x in dockerfile_list if term not in x['image']['fullname']] + dockerfiles = [f for f in dockerfiles if f['image']['fullname'] not in blacklist] + dockerfiles = [f for f in dockerfiles if not dockerfile_path_match_list(f, blacklist)] - return dockerfile_list + return dockerfiles def find_dockerfile_in_path_recursive(basePath): From d1b0c44655321578bd2ba74d445fa6d8c76a720a Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 2 Aug 2022 16:05:34 -0700 Subject: [PATCH 048/123] blacklist php-official images (they're symlinked anyways) --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index edf1bc3f3..c4288f961 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -43,7 +43,7 @@ jobs: - name: Generate Matrix id: generate-matrix - run: python bin/console generate:gh-action-matrix --whitelist='php-*/8.*/*' + run: python bin/console generate:gh-action-matrix --whitelist='php*/8.*/*' --blacklist='php-official/*/**' build-base-images: needs: From afe12abdc2c74ade31af514314f99c803ae3a128 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 3 Aug 2022 15:45:58 -0700 Subject: [PATCH 049/123] tweak user prefix into user + image prefix --- bin/command/generate_dockerfile_command.py | 6 +++++- bin/command/generate_gh_action_matrix_command.py | 4 +++- conf/console.yml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/command/generate_dockerfile_command.py b/bin/command/generate_dockerfile_command.py index 584c5c052..aaf4437a2 100644 --- a/bin/command/generate_dockerfile_command.py +++ b/bin/command/generate_dockerfile_command.py @@ -65,7 +65,11 @@ def run_task(self, configuration): trim_blocks=False ) - self.template.globals = {"user": self.configuration.get('docker.imageUser') or 'webdevops'} + image_user = self.configuration.get('docker.imageUser') + image_prefix = self.configuration.get('docker.imagePrefix') + + user_image_prefix = f"{image_user}/{image_prefix}" if image_user else image_prefix + self.template.globals = {"user": user_image_prefix or 'webdevops'} for file in DockerfileUtility.find_file_in_path(dockerfile_path=dockerfile_path, filename="Dockerfile.jinja2", whitelist=whitelist, blacklist=blacklist): self.process_dockerfile(file) diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index ff6e5b043..797cf300c 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -56,10 +56,12 @@ def run_task(self, configuration): # whitelist=whitelist, blacklist=blacklist, # ) + user_image_prefix = f"{image_user}/{image_prefix}" if image_user else image_prefix + dockerfiles = DockerfileUtility.find_dockerfiles_in_path( base_path=self.configuration.get('dockerPath'), path_regex=self.configuration.get('docker.pathRegex'), - image_prefix=self.configuration.get('docker.imagePrefix'), + image_prefix=user_image_prefix, whitelist=whitelist, blacklist=blacklist, ) diff --git a/conf/console.yml b/conf/console.yml index e7f4558a1..8010d1908 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -13,7 +13,7 @@ blacklistFile: 'BLACKLIST' docker: imagePrefix: 'webdevops' - imageUser: 'ghcr.io/cocoastorm/webdevops' + imageUser: 'ghcr.io/cocoastorm' autoLatestTag: 'ubuntu-18.04' pathRegex: '/(?P[^/]+)/(?P[^/]+)/Dockerfile$' autoPull: True From 47b5ea95866c55344744c553555818a2a003a3af Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 3 Aug 2022 16:03:03 -0700 Subject: [PATCH 050/123] [skip ci] remove Makefile step for github --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 99291ae71..5540affc8 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,6 @@ provision: bin/console generate:dockerfile bin/console generate:provision -github: - bin/console generate:ghactions --whitelist=php-*/8.*/* - push: bin/console docker:push --threads=auto From 36f2dc872d1d0e8606b3929d19a143f8aa70e3dc Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 16:58:26 -0700 Subject: [PATCH 051/123] patch dockerfile template so "ARG TARGETARCH" is exposed --- bin/patch.py | 35 +++++++++++++++++++++++++++++++ template/Dockerfile/docker.jinja2 | 4 ++++ template/Dockerfile/tools.jinja2 | 11 +++++----- 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 bin/patch.py diff --git a/bin/patch.py b/bin/patch.py new file mode 100644 index 000000000..412913fb9 --- /dev/null +++ b/bin/patch.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import os + +def find_append_to_file(filename, find, insert): + """find and append text in a file.""" + with open(filename, 'r') as in_file: + buf = in_file.readlines() + + with open(filename, 'w') as out_file: + for line in buf: + out_file.write(line) + + if find in line: + out_file.write("\n") + out_file.write(insert + "\n") + +if __name__ == "__main__": + script_path = os.path.dirname(os.path.realpath(__file__)) + root_path = os.path.dirname(script_path) + dockerfiles_path = os.path.join(root_path, 'docker') + + dockerfiles = [] + + for root, dirs, files in os.walk(dockerfiles_path): + for file in files: + if file.endswith(".jinja2"): + dockerfiles.append(os.path.join(root, file)) + + for dockerfile in dockerfiles: + find_pattern = "docker.from" + insert_line = "{{ docker.platformArgs() }}" + + find_append_to_file(dockerfile, find_pattern, insert_line) diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index f9c55d360..5ee37a11d 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -14,6 +14,10 @@ FROM {{ image }}:{{ tag }} {%- endif %} {%- endmacro %} +{% macro platformArgs() -%} +ARG TARGETARCH +{%- endmacro %} + {% macro version() -%} LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 40d3e350d..ff92d32f6 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,16 +1,15 @@ {% macro goreplace(path="/usr/local/bin", version="1.1.2") -%} ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-$grArch-linux" \ - && chmod +x "{{ path }}/go-replace" + && chmod +x "{{ path }}/go-replace" \ + && go-replace version {%- endmacro %} {% macro gosu(path="/sbin", version="1.10") -%} # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch" \ - && wget -O "{{ path }}/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch.asc" \ + && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$TARGETARCH" \ + && wget -O "{{ path }}/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify {{ path }}/gosu.asc "{{ path }}/gosu" \ From e6822224d0fdf6afafd87844210e4a5d9f5d111c Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 16:59:19 -0700 Subject: [PATCH 052/123] add macro platformArgs() --- docker/ansible/alpine/Dockerfile.jinja2 | 2 ++ docker/ansible/centos-7/Dockerfile.jinja2 | 2 ++ docker/ansible/debian-7/Dockerfile.jinja2 | 2 ++ docker/ansible/debian-8/Dockerfile.jinja2 | 2 ++ docker/ansible/debian-9/Dockerfile.jinja2 | 2 ++ docker/ansible/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/ansible/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/ansible/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/ansible/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/ansible/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/ansible/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/apache-dev/alpine/Dockerfile.jinja2 | 2 ++ docker/apache-dev/centos-7/Dockerfile.jinja2 | 2 ++ docker/apache-dev/debian-10/Dockerfile.jinja2 | 2 ++ docker/apache-dev/debian-7/Dockerfile.jinja2 | 2 ++ docker/apache-dev/debian-8/Dockerfile.jinja2 | 2 ++ docker/apache-dev/debian-9/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/apache/alpine/Dockerfile.jinja2 | 2 ++ docker/apache/centos-7/Dockerfile.jinja2 | 2 ++ docker/apache/debian-10/Dockerfile.jinja2 | 2 ++ docker/apache/debian-7/Dockerfile.jinja2 | 2 ++ docker/apache/debian-8/Dockerfile.jinja2 | 2 ++ docker/apache/debian-9/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/apache/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/base-app/alpine/Dockerfile.jinja2 | 2 ++ docker/base-app/centos-7/Dockerfile.jinja2 | 2 ++ docker/base-app/debian-10/Dockerfile.jinja2 | 2 ++ docker/base-app/debian-7/Dockerfile.jinja2 | 2 ++ docker/base-app/debian-8/Dockerfile.jinja2 | 2 ++ docker/base-app/debian-9/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/base-app/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/base/alpine/Dockerfile.jinja2 | 2 ++ docker/base/centos-7/Dockerfile.jinja2 | 2 ++ docker/base/debian-10/Dockerfile.jinja2 | 2 ++ docker/base/debian-7/Dockerfile.jinja2 | 2 ++ docker/base/debian-8/Dockerfile.jinja2 | 2 ++ docker/base/debian-9/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/base/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/bootstrap/alpine/Dockerfile.jinja2 | 2 ++ docker/bootstrap/centos-7/Dockerfile.jinja2 | 2 ++ docker/bootstrap/debian-10/Dockerfile.jinja2 | 2 ++ docker/bootstrap/debian-7/Dockerfile.jinja2 | 2 ++ docker/bootstrap/debian-8/Dockerfile.jinja2 | 2 ++ docker/bootstrap/debian-9/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/certbot/latest/Dockerfile.jinja2 | 2 ++ docker/dockerfile-build-env/latest/Dockerfile.jinja2 | 2 ++ docker/liquibase/latest/Dockerfile.jinja2 | 2 ++ docker/liquibase/mysql/Dockerfile.jinja2 | 2 ++ docker/liquibase/postgres/Dockerfile.jinja2 | 2 ++ docker/liquidsoap/latest/Dockerfile.jinja2 | 2 ++ docker/mail-sandbox/latest/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/alpine/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/centos-7/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/debian-10/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/debian-7/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/debian-8/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/debian-9/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/nginx/alpine/Dockerfile.jinja2 | 2 ++ docker/nginx/centos-7/Dockerfile.jinja2 | 2 ++ docker/nginx/debian-10/Dockerfile.jinja2 | 2 ++ docker/nginx/debian-7/Dockerfile.jinja2 | 2 ++ docker/nginx/debian-8/Dockerfile.jinja2 | 2 ++ docker/nginx/debian-9/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/nginx/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/5.6/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.0/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.1/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.2/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.3/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/7.4/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/8.0/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/centos-7/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/debian-10/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/debian-7/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/debian-8/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/debian-9/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/php-apache/5.6/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.0/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.1/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.2/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.3-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.3/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.4-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache/7.4/Dockerfile.jinja2 | 2 ++ docker/php-apache/8.0-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache/8.0/Dockerfile.jinja2 | 2 ++ docker/php-apache/centos-7-php56/Dockerfile.jinja2 | 2 ++ docker/php-apache/centos-7-php7/Dockerfile.jinja2 | 2 ++ docker/php-apache/centos-7/Dockerfile.jinja2 | 2 ++ docker/php-apache/debian-10/Dockerfile.jinja2 | 2 ++ docker/php-apache/debian-7/Dockerfile.jinja2 | 2 ++ docker/php-apache/debian-8-php7/Dockerfile.jinja2 | 2 ++ docker/php-apache/debian-8/Dockerfile.jinja2 | 2 ++ docker/php-apache/debian-9/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/php-dev/5.6/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.0/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.1/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.2/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.3-alpine/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.3/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.4-alpine/Dockerfile.jinja2 | 2 ++ docker/php-dev/7.4/Dockerfile.jinja2 | 2 ++ docker/php-dev/8.0-alpine/Dockerfile.jinja2 | 2 ++ docker/php-dev/8.0/Dockerfile.jinja2 | 2 ++ docker/php-dev/centos-7-php56/Dockerfile.jinja2 | 2 ++ docker/php-dev/centos-7-php7/Dockerfile.jinja2 | 2 ++ docker/php-dev/centos-7/Dockerfile.jinja2 | 2 ++ docker/php-dev/debian-10/Dockerfile.jinja2 | 2 ++ docker/php-dev/debian-7/Dockerfile.jinja2 | 2 ++ docker/php-dev/debian-8-php7/Dockerfile.jinja2 | 2 ++ docker/php-dev/debian-8/Dockerfile.jinja2 | 2 ++ docker/php-dev/debian-9/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/5.6/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.0/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.1/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.2/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.3/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/7.4/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/8.0/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/centos-7/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/debian-10/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/debian-7/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/debian-8/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/debian-9/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx/5.6/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.0/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.1/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.2/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.3-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.3/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.4-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx/7.4/Dockerfile.jinja2 | 2 ++ docker/php-nginx/8.0-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx/8.0/Dockerfile.jinja2 | 2 ++ docker/php-nginx/centos-7-php56/Dockerfile.jinja2 | 2 ++ docker/php-nginx/centos-7-php7/Dockerfile.jinja2 | 2 ++ docker/php-nginx/centos-7/Dockerfile.jinja2 | 2 ++ docker/php-nginx/debian-10/Dockerfile.jinja2 | 2 ++ docker/php-nginx/debian-7/Dockerfile.jinja2 | 2 ++ docker/php-nginx/debian-8-php7/Dockerfile.jinja2 | 2 ++ docker/php-nginx/debian-8/Dockerfile.jinja2 | 2 ++ docker/php-nginx/debian-9/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/php-official/5.6/Dockerfile.jinja2 | 2 ++ docker/php-official/7.0/Dockerfile.jinja2 | 2 ++ docker/php-official/7.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-official/7.1/Dockerfile.jinja2 | 2 ++ docker/php-official/7.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-official/7.2/Dockerfile.jinja2 | 2 ++ docker/php-official/7.3-alpine/Dockerfile.jinja2 | 2 ++ docker/php-official/7.3/Dockerfile.jinja2 | 2 ++ docker/php-official/7.4-alpine/Dockerfile.jinja2 | 2 ++ docker/php-official/7.4/Dockerfile.jinja2 | 2 ++ docker/php-official/8.0-alpine/Dockerfile.jinja2 | 2 ++ docker/php-official/8.0/Dockerfile.jinja2 | 2 ++ docker/php/centos-7-php56/Dockerfile.jinja2 | 2 ++ docker/php/centos-7-php7/Dockerfile.jinja2 | 2 ++ docker/php/centos-7/Dockerfile.jinja2 | 2 ++ docker/php/debian-10/Dockerfile.jinja2 | 2 ++ docker/php/debian-7/Dockerfile.jinja2 | 2 ++ docker/php/debian-8-php7/Dockerfile.jinja2 | 2 ++ docker/php/debian-8/Dockerfile.jinja2 | 2 ++ docker/php/debian-9/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-12.04/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-14.04/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-15.04/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-16.04/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-16.10/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-17.04/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-17.10/Dockerfile.jinja2 | 2 ++ docker/php/ubuntu-18.04/Dockerfile.jinja2 | 2 ++ docker/piwik/latest/Dockerfile.jinja2 | 2 ++ docker/postfix/latest/Dockerfile.jinja2 | 2 ++ docker/samson-deployment/latest/Dockerfile.jinja2 | 2 ++ docker/sphinx/latest/Dockerfile.jinja2 | 2 ++ docker/ssh/latest/Dockerfile.jinja2 | 2 ++ docker/storage/latest/Dockerfile.jinja2 | 2 ++ docker/toolbox/latest/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/3.1/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/5.0/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/6.0/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/6.1/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/6.5/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/7.0/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/7.5/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/8.0/Dockerfile.jinja2 | 2 ++ docker/typo3-solr/8.1/Dockerfile.jinja2 | 2 ++ docker/varnish/latest/Dockerfile.jinja2 | 2 ++ docker/vsftp/latest/Dockerfile.jinja2 | 2 ++ 315 files changed, 630 insertions(+) diff --git a/docker/ansible/alpine/Dockerfile.jinja2 b/docker/ansible/alpine/Dockerfile.jinja2 index bfd6f7da9..5b3a55a0d 100644 --- a/docker/ansible/alpine/Dockerfile.jinja2 +++ b/docker/ansible/alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "alpine", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.alpine() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/centos-7/Dockerfile.jinja2 b/docker/ansible/centos-7/Dockerfile.jinja2 index e206f91d1..0bacfec0c 100644 --- a/docker/ansible/centos-7/Dockerfile.jinja2 +++ b/docker/ansible/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "centos-7", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.centos() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/debian-7/Dockerfile.jinja2 b/docker/ansible/debian-7/Dockerfile.jinja2 index 77c307ff6..385e34165 100644 --- a/docker/ansible/debian-7/Dockerfile.jinja2 +++ b/docker/ansible/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "debian-7", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.debian() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/debian-8/Dockerfile.jinja2 b/docker/ansible/debian-8/Dockerfile.jinja2 index 8fe2772f4..36633ed19 100644 --- a/docker/ansible/debian-8/Dockerfile.jinja2 +++ b/docker/ansible/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "debian-8", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.debian() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/debian-9/Dockerfile.jinja2 b/docker/ansible/debian-9/Dockerfile.jinja2 index 4158595ee..86e308c84 100644 --- a/docker/ansible/debian-9/Dockerfile.jinja2 +++ b/docker/ansible/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "debian-9", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.debian() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 index ec179eac4..53781cacc 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.ubuntu() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 index c88966a69..e237f2e90 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.ubuntu() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 index aeddf178b..51069a98c 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.ubuntu() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 index 08bae0f25..439007fc6 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.ubuntu() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 index d223a5b98..eee0c29e8 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.ubuntu() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 index 562aff95c..5e5d33dc3 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ansible.ubuntu() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/apache-dev/alpine/Dockerfile.jinja2 b/docker/apache-dev/alpine/Dockerfile.jinja2 index fb13290d6..4ae6e6490 100644 --- a/docker/apache-dev/alpine/Dockerfile.jinja2 +++ b/docker/apache-dev/alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/centos-7/Dockerfile.jinja2 b/docker/apache-dev/centos-7/Dockerfile.jinja2 index 29b416c38..a912b03b9 100644 --- a/docker/apache-dev/centos-7/Dockerfile.jinja2 +++ b/docker/apache-dev/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/debian-10/Dockerfile.jinja2 b/docker/apache-dev/debian-10/Dockerfile.jinja2 index 88839c406..b451d068c 100644 --- a/docker/apache-dev/debian-10/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/debian-7/Dockerfile.jinja2 b/docker/apache-dev/debian-7/Dockerfile.jinja2 index af718294c..b15801e5c 100644 --- a/docker/apache-dev/debian-7/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/debian-8/Dockerfile.jinja2 b/docker/apache-dev/debian-8/Dockerfile.jinja2 index 23670bf0e..7479a78c8 100644 --- a/docker/apache-dev/debian-8/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/debian-9/Dockerfile.jinja2 b/docker/apache-dev/debian-9/Dockerfile.jinja2 index efc0ad866..102aa7622 100644 --- a/docker/apache-dev/debian-9/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 index 559267c0b..1970d348e 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 index 340d42f8b..1beccdac9 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 index 5d7266890..18fb4edc6 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 index 38aa3dda2..8adae1013 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 index 524618c29..9808b050a 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 index fd6476d8c..f463c5d8a 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 index b8c4ff28a..3c60758f4 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 index 806ffa9c6..9a9b2a497 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 index 6a5a4e92b..9cd317c01 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("apache", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/alpine/Dockerfile.jinja2 b/docker/apache/alpine/Dockerfile.jinja2 index 8595255b5..6354eb04e 100644 --- a/docker/apache/alpine/Dockerfile.jinja2 +++ b/docker/apache/alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/centos-7/Dockerfile.jinja2 b/docker/apache/centos-7/Dockerfile.jinja2 index 470c03e35..3a10bc45f 100644 --- a/docker/apache/centos-7/Dockerfile.jinja2 +++ b/docker/apache/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-10/Dockerfile.jinja2 b/docker/apache/debian-10/Dockerfile.jinja2 index fbc1559c4..e84d32bb3 100644 --- a/docker/apache/debian-10/Dockerfile.jinja2 +++ b/docker/apache/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-7/Dockerfile.jinja2 b/docker/apache/debian-7/Dockerfile.jinja2 index 4c97fde66..f15407a5d 100644 --- a/docker/apache/debian-7/Dockerfile.jinja2 +++ b/docker/apache/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-8/Dockerfile.jinja2 b/docker/apache/debian-8/Dockerfile.jinja2 index 5409b70e2..45b58a0f6 100644 --- a/docker/apache/debian-8/Dockerfile.jinja2 +++ b/docker/apache/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-9/Dockerfile.jinja2 b/docker/apache/debian-9/Dockerfile.jinja2 index f1151e1a3..b6f8e5006 100644 --- a/docker/apache/debian-9/Dockerfile.jinja2 +++ b/docker/apache/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 index f00752109..7b653a700 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 index 7aa283465..aecf7dde6 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 index 5d116f629..94f2caa81 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 index 5a73a2377..ff4ae2b29 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 index b8344fc2f..2d3d40c27 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 index 4ddbbbe90..847085631 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-17.04/Dockerfile.jinja2 b/docker/apache/ubuntu-17.04/Dockerfile.jinja2 index b1fc8ff69..c54db185e 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-17.10/Dockerfile.jinja2 b/docker/apache/ubuntu-17.10/Dockerfile.jinja2 index dd165d292..f339061d0 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-18.04/Dockerfile.jinja2 b/docker/apache/ubuntu-18.04/Dockerfile.jinja2 index d1a1aacb2..8cf580ad6 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/alpine/Dockerfile.jinja2 b/docker/base-app/alpine/Dockerfile.jinja2 index b83d4aea6..2651c39ef 100644 --- a/docker/base-app/alpine/Dockerfile.jinja2 +++ b/docker/base-app/alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/centos-7/Dockerfile.jinja2 b/docker/base-app/centos-7/Dockerfile.jinja2 index ae34ae96f..ae2b2c462 100644 --- a/docker/base-app/centos-7/Dockerfile.jinja2 +++ b/docker/base-app/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-10/Dockerfile.jinja2 b/docker/base-app/debian-10/Dockerfile.jinja2 index b5be7a229..27ab346f0 100644 --- a/docker/base-app/debian-10/Dockerfile.jinja2 +++ b/docker/base-app/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-7/Dockerfile.jinja2 b/docker/base-app/debian-7/Dockerfile.jinja2 index d93b3d17f..ec907d048 100644 --- a/docker/base-app/debian-7/Dockerfile.jinja2 +++ b/docker/base-app/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-8/Dockerfile.jinja2 b/docker/base-app/debian-8/Dockerfile.jinja2 index 07982484b..be2db5d68 100644 --- a/docker/base-app/debian-8/Dockerfile.jinja2 +++ b/docker/base-app/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-9/Dockerfile.jinja2 b/docker/base-app/debian-9/Dockerfile.jinja2 index 67471e263..c44b8787e 100644 --- a/docker/base-app/debian-9/Dockerfile.jinja2 +++ b/docker/base-app/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 index f8f8f1213..5b8176b41 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 index 731863a1c..2c651b227 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 index f44afa045..4e5450c34 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 index d6108ace8..7cbb62d6a 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 index acac2fb2d..e713fd2d2 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 index 072de87f8..b89ba7309 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 index bbb281a41..6ee636559 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 index 2708ab759..2da39ef1e 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 index fea79f442..5d22da728 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/alpine/Dockerfile.jinja2 b/docker/base/alpine/Dockerfile.jinja2 index 268003546..fc24ca48a 100644 --- a/docker/base/alpine/Dockerfile.jinja2 +++ b/docker/base/alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/centos-7/Dockerfile.jinja2 b/docker/base/centos-7/Dockerfile.jinja2 index a6d3d6e6d..d4dcc36d8 100644 --- a/docker/base/centos-7/Dockerfile.jinja2 +++ b/docker/base/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-10/Dockerfile.jinja2 b/docker/base/debian-10/Dockerfile.jinja2 index 81a240177..83ccaa5eb 100644 --- a/docker/base/debian-10/Dockerfile.jinja2 +++ b/docker/base/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-7/Dockerfile.jinja2 b/docker/base/debian-7/Dockerfile.jinja2 index bde3f57ca..9597c96ca 100644 --- a/docker/base/debian-7/Dockerfile.jinja2 +++ b/docker/base/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-8/Dockerfile.jinja2 b/docker/base/debian-8/Dockerfile.jinja2 index 992ce22f8..94e0c8d13 100644 --- a/docker/base/debian-8/Dockerfile.jinja2 +++ b/docker/base/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-9/Dockerfile.jinja2 b/docker/base/debian-9/Dockerfile.jinja2 index b451f2f1a..55e86fbc9 100644 --- a/docker/base/debian-9/Dockerfile.jinja2 +++ b/docker/base/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-12.04/Dockerfile.jinja2 index 147151f1a..85cccd97c 100644 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-14.04/Dockerfile.jinja2 b/docker/base/ubuntu-14.04/Dockerfile.jinja2 index 8561f5de9..a656fac9a 100644 --- a/docker/base/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-15.04/Dockerfile.jinja2 b/docker/base/ubuntu-15.04/Dockerfile.jinja2 index bf27cbdaf..3c6c4401f 100644 --- a/docker/base/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-15.10/Dockerfile.jinja2 b/docker/base/ubuntu-15.10/Dockerfile.jinja2 index 6c034549f..47a322351 100644 --- a/docker/base/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-16.04/Dockerfile.jinja2 b/docker/base/ubuntu-16.04/Dockerfile.jinja2 index 794fdb286..11d2ff017 100644 --- a/docker/base/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-16.10/Dockerfile.jinja2 b/docker/base/ubuntu-16.10/Dockerfile.jinja2 index f0dcce3f0..49f4c94d8 100644 --- a/docker/base/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-17.04/Dockerfile.jinja2 b/docker/base/ubuntu-17.04/Dockerfile.jinja2 index 659743315..e71f66bff 100644 --- a/docker/base/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-17.10/Dockerfile.jinja2 b/docker/base/ubuntu-17.10/Dockerfile.jinja2 index 8de3d7ccc..4921a119a 100644 --- a/docker/base/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-18.04/Dockerfile.jinja2 b/docker/base/ubuntu-18.04/Dockerfile.jinja2 index f6df7f273..e083e10de 100644 --- a/docker/base/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/bootstrap/alpine/Dockerfile.jinja2 b/docker/bootstrap/alpine/Dockerfile.jinja2 index dcad0dafe..5d259fd97 100644 --- a/docker/bootstrap/alpine/Dockerfile.jinja2 +++ b/docker/bootstrap/alpine/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("alpine", "3.11") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/centos-7/Dockerfile.jinja2 b/docker/bootstrap/centos-7/Dockerfile.jinja2 index 5bbf3d242..254a0ffd4 100644 --- a/docker/bootstrap/centos-7/Dockerfile.jinja2 +++ b/docker/bootstrap/centos-7/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("centos", "7") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general(charset='en_US.utf8') }} diff --git a/docker/bootstrap/debian-10/Dockerfile.jinja2 b/docker/bootstrap/debian-10/Dockerfile.jinja2 index bc23c18da..b57f4573d 100644 --- a/docker/bootstrap/debian-10/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-10/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("debian", "buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/debian-7/Dockerfile.jinja2 b/docker/bootstrap/debian-7/Dockerfile.jinja2 index 25fbc709d..b8ae6b8b3 100644 --- a/docker/bootstrap/debian-7/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-7/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("debian", "7") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/debian-8/Dockerfile.jinja2 b/docker/bootstrap/debian-8/Dockerfile.jinja2 index f1cba9545..14906dce4 100644 --- a/docker/bootstrap/debian-8/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-8/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("debian", "8") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/debian-9/Dockerfile.jinja2 b/docker/bootstrap/debian-9/Dockerfile.jinja2 index ba837d3d1..079afa606 100644 --- a/docker/bootstrap/debian-9/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-9/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("debian", "stretch") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 index 181fcc103..c01d2e759 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "12.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 index 98389ef9e..a395e2be6 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "14.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 index cb8b42299..95dfd3900 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "15.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 index 77587894c..465b4e83f 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "15.10") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 index e7be167e1..2fe19786a 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "16.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 index fce528a31..6e92f6069 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "16.10") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 index 4a4fb0555..8c1accdd3 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "17.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 index ee54b451f..bbfae5169 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "17.10") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 index 93072e14a..34d061acd 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("ubuntu", "18.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/certbot/latest/Dockerfile.jinja2 b/docker/certbot/latest/Dockerfile.jinja2 index da0785b79..7e54a1648 100644 --- a/docker/certbot/latest/Dockerfile.jinja2 +++ b/docker/certbot/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "alpine", user) }} +{{ docker.platformArgs() }} + {{ docker.volume('/etc/letsencrypt') }} {{ docker.volume('/var/www') }} diff --git a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 index bf4d10877..8d5e1d71e 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 +++ b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app","ubuntu-18.04") }} +{{ docker.platformArgs() }} + RUN apt-install \ build-essential \ gpg-agent \ diff --git a/docker/liquibase/latest/Dockerfile.jinja2 b/docker/liquibase/latest/Dockerfile.jinja2 index 98e37ca63..bcec7fbfb 100644 --- a/docker/liquibase/latest/Dockerfile.jinja2 +++ b/docker/liquibase/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.fromOfficial("openjdk", "8") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.liquibase('3.6.3', 'com.mysql.jdbc.Driver', '/usr/share/java/mysql.jar') }} diff --git a/docker/liquibase/mysql/Dockerfile.jinja2 b/docker/liquibase/mysql/Dockerfile.jinja2 index 2ce99e8d1..64d593b76 100644 --- a/docker/liquibase/mysql/Dockerfile.jinja2 +++ b/docker/liquibase/mysql/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.fromOfficial("openjdk", "8") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.liquibase('3.6.3', 'org.mariadb.jdbc.Driver', '/usr/share/java/mariadb-java-client.jar') }} diff --git a/docker/liquibase/postgres/Dockerfile.jinja2 b/docker/liquibase/postgres/Dockerfile.jinja2 index 135bec47a..ad7165afd 100644 --- a/docker/liquibase/postgres/Dockerfile.jinja2 +++ b/docker/liquibase/postgres/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.fromOfficial("openjdk", "8") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.liquibase('3.6.3', 'org.postgresql.Driver', '/usr/share/java/postgresql.jar') }} diff --git a/docker/liquidsoap/latest/Dockerfile.jinja2 b/docker/liquidsoap/latest/Dockerfile.jinja2 index df69f0822..df78bb9a3 100644 --- a/docker/liquidsoap/latest/Dockerfile.jinja2 +++ b/docker/liquidsoap/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "latest", user) }} +{{ docker.platformArgs() }} + # Install services RUN /usr/local/bin/apt-install \ liquidsoap \ diff --git a/docker/mail-sandbox/latest/Dockerfile.jinja2 b/docker/mail-sandbox/latest/Dockerfile.jinja2 index f6ed20114..2d16456f5 100644 --- a/docker/mail-sandbox/latest/Dockerfile.jinja2 +++ b/docker/mail-sandbox/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx") }} +{{ docker.platformArgs() }} + {{ environment.mailbox() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/alpine/Dockerfile.jinja2 b/docker/nginx-dev/alpine/Dockerfile.jinja2 index 51af24079..25ed8c73b 100644 --- a/docker/nginx-dev/alpine/Dockerfile.jinja2 +++ b/docker/nginx-dev/alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/centos-7/Dockerfile.jinja2 b/docker/nginx-dev/centos-7/Dockerfile.jinja2 index 8020c115b..48dac02a5 100644 --- a/docker/nginx-dev/centos-7/Dockerfile.jinja2 +++ b/docker/nginx-dev/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/debian-10/Dockerfile.jinja2 b/docker/nginx-dev/debian-10/Dockerfile.jinja2 index 6421f1037..d700b50d8 100644 --- a/docker/nginx-dev/debian-10/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/debian-7/Dockerfile.jinja2 b/docker/nginx-dev/debian-7/Dockerfile.jinja2 index 4bd97088d..883c30e6f 100644 --- a/docker/nginx-dev/debian-7/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/debian-8/Dockerfile.jinja2 b/docker/nginx-dev/debian-8/Dockerfile.jinja2 index 85cbf99c6..93e1f0be4 100644 --- a/docker/nginx-dev/debian-8/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/debian-9/Dockerfile.jinja2 b/docker/nginx-dev/debian-9/Dockerfile.jinja2 index 523b7dacf..ce51d6087 100644 --- a/docker/nginx-dev/debian-9/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 index decaa1f1b..ffbedfc45 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 index 01b39b8f3..46167e6c5 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 index 3c45e2d23..95fb712f2 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 index 760020ca6..5556d42e3 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 index 395189328..115ba923f 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 index 9c98e046f..7ee2570b8 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 index a2bb47814..1576134c4 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 index a4233e384..ce85f8e29 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 index f6d3a3ed2..4cbc1950c 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("nginx", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ environment.webDevelopment() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/alpine/Dockerfile.jinja2 b/docker/nginx/alpine/Dockerfile.jinja2 index 392ec0679..da12c8533 100644 --- a/docker/nginx/alpine/Dockerfile.jinja2 +++ b/docker/nginx/alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/centos-7/Dockerfile.jinja2 b/docker/nginx/centos-7/Dockerfile.jinja2 index 7414e6197..a0cf8eb1c 100644 --- a/docker/nginx/centos-7/Dockerfile.jinja2 +++ b/docker/nginx/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-10/Dockerfile.jinja2 b/docker/nginx/debian-10/Dockerfile.jinja2 index 8eda6965e..1204e0a77 100644 --- a/docker/nginx/debian-10/Dockerfile.jinja2 +++ b/docker/nginx/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-7/Dockerfile.jinja2 b/docker/nginx/debian-7/Dockerfile.jinja2 index e37e786eb..11b5e80b5 100644 --- a/docker/nginx/debian-7/Dockerfile.jinja2 +++ b/docker/nginx/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-8/Dockerfile.jinja2 b/docker/nginx/debian-8/Dockerfile.jinja2 index b0710b65c..60ce91092 100644 --- a/docker/nginx/debian-8/Dockerfile.jinja2 +++ b/docker/nginx/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-9/Dockerfile.jinja2 b/docker/nginx/debian-9/Dockerfile.jinja2 index b2adb6cea..0449d5922 100644 --- a/docker/nginx/debian-9/Dockerfile.jinja2 +++ b/docker/nginx/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 index e5eff0f23..fa97e3aa8 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 index 67c0cc6e1..0597cb70b 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 index b73735f6c..b94d3f5e4 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 index 21d458888..54df0f415 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 index 64784b235..f06669cac 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 index 39705e3fd..deb93fce6 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 index 38517d575..11fe01f67 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 index 1badc316d..f6eb8e643 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 index 1c5ac20d8..665376a3c 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/php-apache-dev/5.6/Dockerfile.jinja2 b/docker/php-apache-dev/5.6/Dockerfile.jinja2 index 8ab1976a9..b597a3972 100644 --- a/docker/php-apache-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-apache-dev/5.6/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "5.6") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.0/Dockerfile.jinja2 b/docker/php-apache-dev/7.0/Dockerfile.jinja2 index 476b9f009..448b671db 100644 --- a/docker/php-apache-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.0") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 index db426431b..8ba1af347 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.1-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.1/Dockerfile.jinja2 b/docker/php-apache-dev/7.1/Dockerfile.jinja2 index dfce87d70..87e9dcddf 100644 --- a/docker/php-apache-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.1") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 index e89c70b13..ed00c22e7 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.2-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.2/Dockerfile.jinja2 b/docker/php-apache-dev/7.2/Dockerfile.jinja2 index 47eaa3a98..3843e290c 100644 --- a/docker/php-apache-dev/7.2/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.2") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 index de49b5af5..40423c6d7 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.3-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.3/Dockerfile.jinja2 b/docker/php-apache-dev/7.3/Dockerfile.jinja2 index 92b911b81..e87c5ea9c 100644 --- a/docker/php-apache-dev/7.3/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.3/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.3") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 index 1bd2244da..49ecd23b8 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.4-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.4/Dockerfile.jinja2 b/docker/php-apache-dev/7.4/Dockerfile.jinja2 index 608ae77e6..88beb3db9 100644 --- a/docker/php-apache-dev/7.4/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.4/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "7.4") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 index 4c7c36014..972d0237f 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "8.0-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/8.0/Dockerfile.jinja2 b/docker/php-apache-dev/8.0/Dockerfile.jinja2 index c326cb319..73bede1fc 100644 --- a/docker/php-apache-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "8.0") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 index 44ea7caac..af8615608 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "centos-7-php56") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 index 27dbed6ff..f113a3121 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "centos-7-php7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7/Dockerfile.jinja2 index ad9dce5e8..47518bb4c 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "centos-7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-10/Dockerfile.jinja2 b/docker/php-apache-dev/debian-10/Dockerfile.jinja2 index d2aa7ac07..19d0fcdcd 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "debian-10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-7/Dockerfile.jinja2 index 45691eea9..a6011ddab 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "debian-7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 index ac68d986d..05c6bfd55 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "debian-8-php7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8/Dockerfile.jinja2 index 1bd854db3..6d922ba67 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "debian-8") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 b/docker/php-apache-dev/debian-9/Dockerfile.jinja2 index 31212501c..851e086ce 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "debian-9") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 index f8e123a67..d7f43c49d 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-12.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 index 4ae062d4e..75d590ec4 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-14.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 index 3a15b19e5..a3d7fe0c1 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-15.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 index 5edba2b22..e20f68b1e 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-15.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 index ca1f2e7ad..cbee857ed 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-16.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 index a0079f7af..5073a092b 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-16.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 index 261d0531b..08ad442b8 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-17.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 index 090334b15..0f94e82fe 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-17.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 index 09a315ffb..2b25710dd 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "ubuntu-18.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache/5.6/Dockerfile.jinja2 b/docker/php-apache/5.6/Dockerfile.jinja2 index 2db736604..c2629c958 100644 --- a/docker/php-apache/5.6/Dockerfile.jinja2 +++ b/docker/php-apache/5.6/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "5.6", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.0/Dockerfile.jinja2 b/docker/php-apache/7.0/Dockerfile.jinja2 index 251bb160b..48b9a6bc4 100644 --- a/docker/php-apache/7.0/Dockerfile.jinja2 +++ b/docker/php-apache/7.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.0", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 b/docker/php-apache/7.1-alpine/Dockerfile.jinja2 index 922932d4d..82766465e 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.1-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.1/Dockerfile.jinja2 b/docker/php-apache/7.1/Dockerfile.jinja2 index 0af2dfc41..4b349d0ff 100644 --- a/docker/php-apache/7.1/Dockerfile.jinja2 +++ b/docker/php-apache/7.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.1", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 b/docker/php-apache/7.2-alpine/Dockerfile.jinja2 index dae387eba..5a971df40 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.2-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.2/Dockerfile.jinja2 b/docker/php-apache/7.2/Dockerfile.jinja2 index 7f684dd0d..733815558 100644 --- a/docker/php-apache/7.2/Dockerfile.jinja2 +++ b/docker/php-apache/7.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.2", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 b/docker/php-apache/7.3-alpine/Dockerfile.jinja2 index 7a87624b6..d94f16f05 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.3-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.3-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.3/Dockerfile.jinja2 b/docker/php-apache/7.3/Dockerfile.jinja2 index 4b3f817df..7725b315d 100644 --- a/docker/php-apache/7.3/Dockerfile.jinja2 +++ b/docker/php-apache/7.3/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.3", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 b/docker/php-apache/7.4-alpine/Dockerfile.jinja2 index 26ec932bb..3ea3bf7e9 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.4-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.4-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.4/Dockerfile.jinja2 b/docker/php-apache/7.4/Dockerfile.jinja2 index ff29df1f4..b85564385 100644 --- a/docker/php-apache/7.4/Dockerfile.jinja2 +++ b/docker/php-apache/7.4/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.4", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 index cf372a237..4f0b50527 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.0-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.0/Dockerfile.jinja2 b/docker/php-apache/8.0/Dockerfile.jinja2 index 1c9443613..07a6e7f42 100644 --- a/docker/php-apache/8.0/Dockerfile.jinja2 +++ b/docker/php-apache/8.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.0", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 index 10d72d9bb..353a85626 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7-php56", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 index b2207b9db..f4ad3b365 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7-php7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7/Dockerfile.jinja2 b/docker/php-apache/centos-7/Dockerfile.jinja2 index 23044aca4..ca78b6aa5 100644 --- a/docker/php-apache/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-10/Dockerfile.jinja2 b/docker/php-apache/debian-10/Dockerfile.jinja2 index 428b45078..906e2a856 100644 --- a/docker/php-apache/debian-10/Dockerfile.jinja2 +++ b/docker/php-apache/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-7/Dockerfile.jinja2 b/docker/php-apache/debian-7/Dockerfile.jinja2 index ec969a984..eb6932f4c 100644 --- a/docker/php-apache/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 index 9441817d8..768aa908c 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-8-php7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-8/Dockerfile.jinja2 b/docker/php-apache/debian-8/Dockerfile.jinja2 index 4940762c5..fdcfd0005 100644 --- a/docker/php-apache/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-9/Dockerfile.jinja2 b/docker/php-apache/debian-9/Dockerfile.jinja2 index a102f2896..88e319bac 100644 --- a/docker/php-apache/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 index 78029221c..d6d8a9e1d 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 index 2735b8b5b..90ca74e4d 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 index 7212adf3e..002a55ff8 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 index 3e8bbd6e9..d29bf064c 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 index b6c81a6bb..bf3521379 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 index 4601a7911..66861e1ae 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 index 10b5cb5aa..9aeafcf10 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 index c519cc97b..07c64e006 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 index 64bfc423a..8cf8b4af9 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-dev/5.6/Dockerfile.jinja2 b/docker/php-dev/5.6/Dockerfile.jinja2 index 699d7bbf3..f9ec2bb38 100644 --- a/docker/php-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-dev/5.6/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "5.6", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.0/Dockerfile.jinja2 b/docker/php-dev/7.0/Dockerfile.jinja2 index acb44b14b..a05f16d8c 100644 --- a/docker/php-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-dev/7.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.0", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-dev/7.1-alpine/Dockerfile.jinja2 index 32e57f325..6372730b8 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.1-alpine", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.1/Dockerfile.jinja2 b/docker/php-dev/7.1/Dockerfile.jinja2 index 0beb01540..80275a2b5 100644 --- a/docker/php-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-dev/7.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.1", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-dev/7.2-alpine/Dockerfile.jinja2 index bff14d2f5..59c8dc70b 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.2-alpine", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.2/Dockerfile.jinja2 b/docker/php-dev/7.2/Dockerfile.jinja2 index 88a209e72..e5ad542f9 100644 --- a/docker/php-dev/7.2/Dockerfile.jinja2 +++ b/docker/php-dev/7.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.2", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-dev/7.3-alpine/Dockerfile.jinja2 index e0e099c17..cc2c0afea 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.3-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.3-alpine", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.3/Dockerfile.jinja2 b/docker/php-dev/7.3/Dockerfile.jinja2 index c2b8c2f21..e9301e47d 100644 --- a/docker/php-dev/7.3/Dockerfile.jinja2 +++ b/docker/php-dev/7.3/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.3", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-dev/7.4-alpine/Dockerfile.jinja2 index c9062e252..e5f71b16f 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.4-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.4-alpine", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/7.4/Dockerfile.jinja2 b/docker/php-dev/7.4/Dockerfile.jinja2 index c7a235cc5..25852b2b0 100644 --- a/docker/php-dev/7.4/Dockerfile.jinja2 +++ b/docker/php-dev/7.4/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.4", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 index bb991a931..537bc8bfc 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.0-alpine", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/8.0/Dockerfile.jinja2 b/docker/php-dev/8.0/Dockerfile.jinja2 index 53f206137..4277f927c 100644 --- a/docker/php-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-dev/8.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.0", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 index 13fd69b16..2f248d85d 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7-php56", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 index d978bc56f..527a4895c 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7-php7", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/centos-7/Dockerfile.jinja2 b/docker/php-dev/centos-7/Dockerfile.jinja2 index be1d708fd..2f7fd5b06 100644 --- a/docker/php-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/debian-10/Dockerfile.jinja2 b/docker/php-dev/debian-10/Dockerfile.jinja2 index 4daaa2ea4..2167d4575 100644 --- a/docker/php-dev/debian-10/Dockerfile.jinja2 +++ b/docker/php-dev/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/debian-7/Dockerfile.jinja2 b/docker/php-dev/debian-7/Dockerfile.jinja2 index a773a5e94..dfebc302f 100644 --- a/docker/php-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-dev/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 index 0e29a9919..2f9153d3f 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-8-php7", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/debian-8/Dockerfile.jinja2 b/docker/php-dev/debian-8/Dockerfile.jinja2 index 15c617407..bd82ec98a 100644 --- a/docker/php-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-dev/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/debian-9/Dockerfile.jinja2 b/docker/php-dev/debian-9/Dockerfile.jinja2 index 8c9b2df24..b49994556 100644 --- a/docker/php-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-dev/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 index 4a6929256..1b9e049f4 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 index 9f3ca5b84..f5e1d4a6b 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 index c372defcf..4826a4f47 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 index 1daddfcb3..5b520c14b 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 index c179ffe3e..804e2a300 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 index 6b249e2e7..fbf5d3f62 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 index 8b117eda6..fad47138a 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 index 0f9577bbe..d67a901db 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 index a4087d33b..0e3c7d15f 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-nginx-dev/5.6/Dockerfile.jinja2 b/docker/php-nginx-dev/5.6/Dockerfile.jinja2 index ab94282f7..4d42d9c9e 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/5.6/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "5.6") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.0/Dockerfile.jinja2 b/docker/php-nginx-dev/7.0/Dockerfile.jinja2 index 0594efaf9..e9688f399 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.0") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 index 150eb99f9..7760025a7 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.1-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.1/Dockerfile.jinja2 b/docker/php-nginx-dev/7.1/Dockerfile.jinja2 index ad48cc80c..a0de042c3 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.1") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 index 1d7722c61..5251cbd64 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.2-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.2/Dockerfile.jinja2 b/docker/php-nginx-dev/7.2/Dockerfile.jinja2 index 70534778c..9ebb3b175 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.2") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 index 3192db11a..5f718c8ec 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.3-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.3/Dockerfile.jinja2 b/docker/php-nginx-dev/7.3/Dockerfile.jinja2 index 014aa1162..0e805e3b5 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.3/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.3") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 index 18cd03bed..45c39bc9e 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.4-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.4/Dockerfile.jinja2 b/docker/php-nginx-dev/7.4/Dockerfile.jinja2 index ef32fba4e..7ac4f7722 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.4/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.4") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 index 15a0bcd4c..094ebac10 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "8.0-alpine") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0/Dockerfile.jinja2 index 3ca36395d..6d2f8d560 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "8.0") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 index d10622c83..d94654ec6 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "centos-7-php56") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 index da776eb1d..b7c30cf92 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "centos-7-php7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 index fc7be71dd..d3f0a4457 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "centos-7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-10/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-10/Dockerfile.jinja2 index e7cdf3877..bd48c09c9 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "debian-10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 index a6f338d13..d8755ace5 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "debian-7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 index 933d504c8..e09162f43 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "debian-8-php7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 index 06fb289d5..ac8b035a8 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "debian-8") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 index 723e808fe..3f747750e 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "debian-9") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 index 46addf4c2..db1875e40 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-12.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 index e29677227..411499ae2 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-14.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 index e0354aec2..dc1a5b168 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-15.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 index f4e112c9f..bdce721d0 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-15.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 index 5c6afad71..a67af4aa9 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-16.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 index 5775f6282..e1f365540 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-16.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 index 211fc59e8..c3eb17cf6 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-17.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 index f06d9f88b..6cf66d67f 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-17.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 index 3a7acc84f..b470311af 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "ubuntu-18.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx/5.6/Dockerfile.jinja2 b/docker/php-nginx/5.6/Dockerfile.jinja2 index cf21d8e8d..2bc43716a 100644 --- a/docker/php-nginx/5.6/Dockerfile.jinja2 +++ b/docker/php-nginx/5.6/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "5.6", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.0/Dockerfile.jinja2 b/docker/php-nginx/7.0/Dockerfile.jinja2 index a8d49a92b..d3aa347ff 100644 --- a/docker/php-nginx/7.0/Dockerfile.jinja2 +++ b/docker/php-nginx/7.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.0", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 index f4677e831..c6837c237 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.1-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.1/Dockerfile.jinja2 b/docker/php-nginx/7.1/Dockerfile.jinja2 index b6f3d0f5d..b4cfd9f47 100644 --- a/docker/php-nginx/7.1/Dockerfile.jinja2 +++ b/docker/php-nginx/7.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.1", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 index bb8b44e0d..e44556cc1 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.2-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.2/Dockerfile.jinja2 b/docker/php-nginx/7.2/Dockerfile.jinja2 index a1baf12c9..18290a969 100644 --- a/docker/php-nginx/7.2/Dockerfile.jinja2 +++ b/docker/php-nginx/7.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.2", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 index d8226754c..3bd1026c4 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.3-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.3/Dockerfile.jinja2 b/docker/php-nginx/7.3/Dockerfile.jinja2 index 9061af9a3..a0c6ab052 100644 --- a/docker/php-nginx/7.3/Dockerfile.jinja2 +++ b/docker/php-nginx/7.3/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.3", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 index fea8c4f08..1ef5df6f4 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.4-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/7.4/Dockerfile.jinja2 b/docker/php-nginx/7.4/Dockerfile.jinja2 index 5974c69a5..822cf3319 100644 --- a/docker/php-nginx/7.4/Dockerfile.jinja2 +++ b/docker/php-nginx/7.4/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "7.4", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 index 4ed9fce77..f5e877e64 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.0-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/8.0/Dockerfile.jinja2 b/docker/php-nginx/8.0/Dockerfile.jinja2 index 850395936..16dfc3c6c 100644 --- a/docker/php-nginx/8.0/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.0", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 index c302494ac..5a631384c 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7-php56", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 index af4f75726..f1fabfa8e 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7-php7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/centos-7/Dockerfile.jinja2 b/docker/php-nginx/centos-7/Dockerfile.jinja2 index 5e0ba6c52..56644aab8 100644 --- a/docker/php-nginx/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "centos-7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/debian-10/Dockerfile.jinja2 b/docker/php-nginx/debian-10/Dockerfile.jinja2 index 6125a5a58..e4db32c61 100644 --- a/docker/php-nginx/debian-10/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/debian-7/Dockerfile.jinja2 b/docker/php-nginx/debian-7/Dockerfile.jinja2 index bd2f0bb82..9a9e639d7 100644 --- a/docker/php-nginx/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 index ec1cc03df..b4c66d1ac 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-8-php7", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/debian-8/Dockerfile.jinja2 b/docker/php-nginx/debian-8/Dockerfile.jinja2 index bee91c379..11bb9abdc 100644 --- a/docker/php-nginx/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-8", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/debian-9/Dockerfile.jinja2 b/docker/php-nginx/debian-9/Dockerfile.jinja2 index ee60111a3..5813eea34 100644 --- a/docker/php-nginx/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "debian-9", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 index 14edac582..d8048fe76 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-12.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 index 77c413c39..bce764aba 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-14.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 index e7699b996..f3a2f0a8f 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-15.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 index 5a39c3065..5d911d8d2 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-15.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 index 3a9d4a770..435fba5cc 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-16.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 index f9aad1413..62e498643 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-16.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 index 9b2bab5ce..50f547419 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-17.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 index 9f0784149..c07ec39dd 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-17.10", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 index cd39201b6..3cb77bfff 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "ubuntu-18.04", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-official/5.6/Dockerfile.jinja2 b/docker/php-official/5.6/Dockerfile.jinja2 index b2bb70146..45d701e4b 100644 --- a/docker/php-official/5.6/Dockerfile.jinja2 +++ b/docker/php-official/5.6/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "5.6-fpm-stretch") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.0/Dockerfile.jinja2 b/docker/php-official/7.0/Dockerfile.jinja2 index 2a4479fe8..4a5a007e6 100644 --- a/docker/php-official/7.0/Dockerfile.jinja2 +++ b/docker/php-official/7.0/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.0-fpm-stretch") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.1-alpine/Dockerfile.jinja2 b/docker/php-official/7.1-alpine/Dockerfile.jinja2 index e77ce3b1f..25b04010a 100644 --- a/docker/php-official/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.1-alpine/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.1-fpm-alpine") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.1/Dockerfile.jinja2 b/docker/php-official/7.1/Dockerfile.jinja2 index 88a127dea..8ed8938fb 100644 --- a/docker/php-official/7.1/Dockerfile.jinja2 +++ b/docker/php-official/7.1/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.1-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.2-alpine/Dockerfile.jinja2 b/docker/php-official/7.2-alpine/Dockerfile.jinja2 index 0da3b9ed4..15233b3be 100644 --- a/docker/php-official/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.2-alpine/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.2-fpm-alpine") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.2/Dockerfile.jinja2 b/docker/php-official/7.2/Dockerfile.jinja2 index 4fbc80ca1..0b873abd2 100644 --- a/docker/php-official/7.2/Dockerfile.jinja2 +++ b/docker/php-official/7.2/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.2-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.3-alpine/Dockerfile.jinja2 b/docker/php-official/7.3-alpine/Dockerfile.jinja2 index ee4e372cd..0df9074bf 100644 --- a/docker/php-official/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.3-alpine/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.3-fpm-alpine") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.3/Dockerfile.jinja2 b/docker/php-official/7.3/Dockerfile.jinja2 index c3e745b57..840ebd934 100644 --- a/docker/php-official/7.3/Dockerfile.jinja2 +++ b/docker/php-official/7.3/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.3-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.4-alpine/Dockerfile.jinja2 b/docker/php-official/7.4-alpine/Dockerfile.jinja2 index bd57ee1da..a59575459 100644 --- a/docker/php-official/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.4-alpine/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.4-fpm-alpine") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.4/Dockerfile.jinja2 b/docker/php-official/7.4/Dockerfile.jinja2 index 23d7ab176..e3cd25ad4 100644 --- a/docker/php-official/7.4/Dockerfile.jinja2 +++ b/docker/php-official/7.4/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "7.4-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/8.0-alpine/Dockerfile.jinja2 b/docker/php-official/8.0-alpine/Dockerfile.jinja2 index 67c09e270..cba6c842e 100644 --- a/docker/php-official/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.0-alpine/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "8.0-fpm-alpine") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/8.0/Dockerfile.jinja2 b/docker/php-official/8.0/Dockerfile.jinja2 index 9d1a1c169..edaa40901 100644 --- a/docker/php-official/8.0/Dockerfile.jinja2 +++ b/docker/php-official/8.0/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("php", "8.0-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php/centos-7-php56/Dockerfile.jinja2 b/docker/php/centos-7-php56/Dockerfile.jinja2 index f5c767356..843e52734 100644 --- a/docker/php/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php/centos-7-php56/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "centos-7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/centos-7-php7/Dockerfile.jinja2 b/docker/php/centos-7-php7/Dockerfile.jinja2 index 3b1e51e02..816c4d644 100644 --- a/docker/php/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php/centos-7-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "centos-7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/centos-7/Dockerfile.jinja2 b/docker/php/centos-7/Dockerfile.jinja2 index f36ae87f7..f55cf4fdd 100644 --- a/docker/php/centos-7/Dockerfile.jinja2 +++ b/docker/php/centos-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "centos-7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/debian-10/Dockerfile.jinja2 b/docker/php/debian-10/Dockerfile.jinja2 index 8cdc0da4e..7014c40e5 100644 --- a/docker/php/debian-10/Dockerfile.jinja2 +++ b/docker/php/debian-10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "debian-10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/debian-7/Dockerfile.jinja2 b/docker/php/debian-7/Dockerfile.jinja2 index 056da8be4..9bd28bad0 100644 --- a/docker/php/debian-7/Dockerfile.jinja2 +++ b/docker/php/debian-7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "debian-7") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/debian-8-php7/Dockerfile.jinja2 b/docker/php/debian-8-php7/Dockerfile.jinja2 index bad6f58f6..72151597f 100644 --- a/docker/php/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php/debian-8-php7/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "debian-8") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/debian-8/Dockerfile.jinja2 b/docker/php/debian-8/Dockerfile.jinja2 index e0f6fcbc4..dedc2c865 100644 --- a/docker/php/debian-8/Dockerfile.jinja2 +++ b/docker/php/debian-8/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "debian-8") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/debian-9/Dockerfile.jinja2 b/docker/php/debian-9/Dockerfile.jinja2 index a83c39396..77fa63a3b 100644 --- a/docker/php/debian-9/Dockerfile.jinja2 +++ b/docker/php/debian-9/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "debian-9") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-12.04/Dockerfile.jinja2 b/docker/php/ubuntu-12.04/Dockerfile.jinja2 index 876a24298..7749b46cb 100644 --- a/docker/php/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-12.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-14.04/Dockerfile.jinja2 b/docker/php/ubuntu-14.04/Dockerfile.jinja2 index e127c6f47..38bb08c3b 100644 --- a/docker/php/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-14.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-15.04/Dockerfile.jinja2 b/docker/php/ubuntu-15.04/Dockerfile.jinja2 index bf2c75120..b0188f119 100644 --- a/docker/php/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-15.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-15.10/Dockerfile.jinja2 b/docker/php/ubuntu-15.10/Dockerfile.jinja2 index b1f0f8493..a68415cc9 100644 --- a/docker/php/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-15.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-16.04/Dockerfile.jinja2 b/docker/php/ubuntu-16.04/Dockerfile.jinja2 index 1ed5da803..2c590b425 100644 --- a/docker/php/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-16.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-16.10/Dockerfile.jinja2 b/docker/php/ubuntu-16.10/Dockerfile.jinja2 index 4a7c52af0..49ba7aa22 100644 --- a/docker/php/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-16.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-17.04/Dockerfile.jinja2 b/docker/php/ubuntu-17.04/Dockerfile.jinja2 index ef4cbf27c..0902b26f2 100644 --- a/docker/php/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-17.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-17.10/Dockerfile.jinja2 b/docker/php/ubuntu-17.10/Dockerfile.jinja2 index 3ce1c7de1..93d33884d 100644 --- a/docker/php/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-17.10") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/php/ubuntu-18.04/Dockerfile.jinja2 b/docker/php/ubuntu-18.04/Dockerfile.jinja2 index 1ee41faed..09f926a48 100644 --- a/docker/php/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app", "ubuntu-18.04") }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.phpComposerVersion() }} diff --git a/docker/piwik/latest/Dockerfile.jinja2 b/docker/piwik/latest/Dockerfile.jinja2 index 7a085c017..36b95c019 100644 --- a/docker/piwik/latest/Dockerfile.jinja2 +++ b/docker/piwik/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.1") }} +{{ docker.platformArgs() }} + ENV WEB_DOCUMENT_ROOT /app/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/postfix/latest/Dockerfile.jinja2 b/docker/postfix/latest/Dockerfile.jinja2 index c9e07770d..b6e1f595a 100644 --- a/docker/postfix/latest/Dockerfile.jinja2 +++ b/docker/postfix/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app") }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2 index f1aefa1d6..10d763a7b 100644 --- a/docker/samson-deployment/latest/Dockerfile.jinja2 +++ b/docker/samson-deployment/latest/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.from("samson", user="zendesk") }} +{{ docker.platformArgs() }} + {{ environment.general() }} {{ environment.base() }} {{ environment.baseApp() }} diff --git a/docker/sphinx/latest/Dockerfile.jinja2 b/docker/sphinx/latest/Dockerfile.jinja2 index 8a5ef97ff..715acd88a 100644 --- a/docker/sphinx/latest/Dockerfile.jinja2 +++ b/docker/sphinx/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("bootstrap", "alpine", user) }} +{{ docker.platformArgs() }} + RUN set -x \ {{ sphinx.alpine() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/ssh/latest/Dockerfile.jinja2 b/docker/ssh/latest/Dockerfile.jinja2 index b98601b60..221c67c89 100644 --- a/docker/ssh/latest/Dockerfile.jinja2 +++ b/docker/ssh/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base-app") }} +{{ docker.platformArgs() }} + RUN set -x \ {{ ssh.ubuntu() }} \ {{ provision.runBootstrap() }} \ diff --git a/docker/storage/latest/Dockerfile.jinja2 b/docker/storage/latest/Dockerfile.jinja2 index 256881353..8b3be030e 100644 --- a/docker/storage/latest/Dockerfile.jinja2 +++ b/docker/storage/latest/Dockerfile.jinja2 @@ -1,2 +1,4 @@ {{ docker.fromOfficial("alpine") }} +{{ docker.platformArgs() }} + diff --git a/docker/toolbox/latest/Dockerfile.jinja2 b/docker/toolbox/latest/Dockerfile.jinja2 index 8b81a1fdf..61594aacb 100644 --- a/docker/toolbox/latest/Dockerfile.jinja2 +++ b/docker/toolbox/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.fromOfficial("alpine") }} +{{ docker.platformArgs() }} + RUN apk add --no-cache \ ca-certificates \ dpkg \ diff --git a/docker/typo3-solr/3.1/Dockerfile.jinja2 b/docker/typo3-solr/3.1/Dockerfile.jinja2 index 63f74a711..a6be385c2 100644 --- a/docker/typo3-solr/3.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/3.1/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.from(user="guywithnose", image="solr", tag="4.10.4") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/5.0/Dockerfile.jinja2 b/docker/typo3-solr/5.0/Dockerfile.jinja2 index c02967abb..53f134ca5 100644 --- a/docker/typo3-solr/5.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/5.0/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.from(user="guywithnose", image="solr", tag="4.10.4") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/6.0/Dockerfile.jinja2 b/docker/typo3-solr/6.0/Dockerfile.jinja2 index e00929d27..6142cbbeb 100644 --- a/docker/typo3-solr/6.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.0/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("solr", "6.3.0") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/6.1/Dockerfile.jinja2 b/docker/typo3-solr/6.1/Dockerfile.jinja2 index f3f878ad2..bf43fd1d5 100644 --- a/docker/typo3-solr/6.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.1/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("solr", "6.3.0") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/6.5/Dockerfile.jinja2 b/docker/typo3-solr/6.5/Dockerfile.jinja2 index c600dbbbf..a00047fd9 100644 --- a/docker/typo3-solr/6.5/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.5/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("solr", "6.6.2") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/7.0/Dockerfile.jinja2 b/docker/typo3-solr/7.0/Dockerfile.jinja2 index 4068fcddb..0d52233ce 100644 --- a/docker/typo3-solr/7.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/7.0/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("solr", "6.3.0") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/7.5/Dockerfile.jinja2 b/docker/typo3-solr/7.5/Dockerfile.jinja2 index 6b5b15910..45d8100e9 100644 --- a/docker/typo3-solr/7.5/Dockerfile.jinja2 +++ b/docker/typo3-solr/7.5/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("solr", "6.6.2") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/8.0/Dockerfile.jinja2 b/docker/typo3-solr/8.0/Dockerfile.jinja2 index 5357696f9..f30316996 100644 --- a/docker/typo3-solr/8.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/8.0/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("solr", "6.6.2") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/8.1/Dockerfile.jinja2 b/docker/typo3-solr/8.1/Dockerfile.jinja2 index 8620a7c86..f7c2a6f81 100644 --- a/docker/typo3-solr/8.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/8.1/Dockerfile.jinja2 @@ -2,6 +2,8 @@ {{ docker.fromOfficial("solr", "6.6.3") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/varnish/latest/Dockerfile.jinja2 b/docker/varnish/latest/Dockerfile.jinja2 index c047f7eea..a1bc04ade 100644 --- a/docker/varnish/latest/Dockerfile.jinja2 +++ b/docker/varnish/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "alpine", user) }} +{{ docker.platformArgs() }} + {{ varnish.env() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/vsftp/latest/Dockerfile.jinja2 b/docker/vsftp/latest/Dockerfile.jinja2 index 1023521aa..e91de0240 100644 --- a/docker/vsftp/latest/Dockerfile.jinja2 +++ b/docker/vsftp/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("base", "latest", user) }} +{{ docker.platformArgs() }} + {{ environment.ftp() }} {{ docker.copy('conf/', '/opt/docker/') }} From 9d0d0f165c2e9320523f5bdc12e524874144bde7 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 16:59:34 -0700 Subject: [PATCH 053/123] Dockerfiles now have "ARG TARGETARCH" inserted --- docker/ansible/alpine/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/ansible/ubuntu-17.04/Dockerfile | 2 ++ docker/apache-dev/alpine/Dockerfile | 2 ++ docker/apache-dev/centos-7/Dockerfile | 2 ++ docker/apache-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 ++ docker/apache-dev/ubuntu-17.04/Dockerfile | 2 ++ docker/apache-dev/ubuntu-17.10/Dockerfile | 2 ++ docker/apache-dev/ubuntu-18.04/Dockerfile | 2 ++ docker/apache/alpine/Dockerfile | 2 ++ docker/apache/centos-7/Dockerfile | 2 ++ docker/apache/debian-10/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/apache/ubuntu-16.10/Dockerfile | 2 ++ docker/apache/ubuntu-17.04/Dockerfile | 2 ++ docker/apache/ubuntu-17.10/Dockerfile | 2 ++ docker/apache/ubuntu-18.04/Dockerfile | 2 ++ docker/base-app/alpine/Dockerfile | 2 ++ docker/base-app/centos-7/Dockerfile | 2 ++ docker/base-app/debian-10/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-app/ubuntu-16.10/Dockerfile | 2 ++ docker/base-app/ubuntu-17.04/Dockerfile | 2 ++ docker/base-app/ubuntu-17.10/Dockerfile | 2 ++ docker/base-app/ubuntu-18.04/Dockerfile | 2 ++ docker/base/alpine/Dockerfile | 2 ++ docker/base/centos-7/Dockerfile | 2 ++ docker/base/debian-10/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/base/ubuntu-16.10/Dockerfile | 2 ++ docker/base/ubuntu-17.04/Dockerfile | 2 ++ docker/base/ubuntu-17.10/Dockerfile | 2 ++ docker/base/ubuntu-18.04/Dockerfile | 2 ++ docker/bootstrap/alpine/Dockerfile | 11 ++++++----- docker/bootstrap/centos-7/Dockerfile | 11 ++++++----- docker/bootstrap/debian-10/Dockerfile | 11 ++++++----- docker/bootstrap/debian-7/Dockerfile | 11 ++++++----- docker/bootstrap/debian-8/Dockerfile | 11 ++++++----- docker/bootstrap/debian-9/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-12.04/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-14.04/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-15.04/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-15.10/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-16.04/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-16.10/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-17.04/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-17.10/Dockerfile | 11 ++++++----- docker/bootstrap/ubuntu-18.04/Dockerfile | 11 ++++++----- docker/certbot/latest/Dockerfile | 2 ++ docker/dockerfile-build-env/latest/Dockerfile | 2 ++ docker/liquibase/latest/Dockerfile | 2 ++ docker/liquibase/mysql/Dockerfile | 2 ++ docker/liquibase/postgres/Dockerfile | 2 ++ docker/liquidsoap/latest/Dockerfile | 2 ++ docker/mail-sandbox/latest/Dockerfile | 2 ++ docker/nginx-dev/alpine/Dockerfile | 2 ++ docker/nginx-dev/centos-7/Dockerfile | 2 ++ docker/nginx-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 ++ docker/nginx-dev/ubuntu-17.04/Dockerfile | 2 ++ docker/nginx-dev/ubuntu-17.10/Dockerfile | 2 ++ docker/nginx-dev/ubuntu-18.04/Dockerfile | 2 ++ docker/nginx/alpine/Dockerfile | 2 ++ docker/nginx/centos-7/Dockerfile | 2 ++ docker/nginx/debian-10/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/nginx/ubuntu-16.10/Dockerfile | 2 ++ docker/nginx/ubuntu-17.04/Dockerfile | 2 ++ docker/nginx/ubuntu-17.10/Dockerfile | 2 ++ docker/nginx/ubuntu-18.04/Dockerfile | 2 ++ docker/php-apache-dev/5.6/Dockerfile | 2 ++ docker/php-apache-dev/7.0/Dockerfile | 2 ++ docker/php-apache-dev/7.1-alpine/Dockerfile | 2 ++ docker/php-apache-dev/7.1/Dockerfile | 2 ++ docker/php-apache-dev/7.2-alpine/Dockerfile | 2 ++ docker/php-apache-dev/7.2/Dockerfile | 2 ++ docker/php-apache-dev/7.3-alpine/Dockerfile | 2 ++ docker/php-apache-dev/7.3/Dockerfile | 2 ++ docker/php-apache-dev/7.4-alpine/Dockerfile | 2 ++ docker/php-apache-dev/7.4/Dockerfile | 2 ++ docker/php-apache-dev/8.0-alpine/Dockerfile | 2 ++ docker/php-apache-dev/8.0/Dockerfile | 2 ++ docker/php-apache-dev/centos-7-php56/Dockerfile | 2 ++ docker/php-apache-dev/centos-7-php7/Dockerfile | 2 ++ docker/php-apache-dev/centos-7/Dockerfile | 2 ++ docker/php-apache-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 ++ docker/php-apache-dev/ubuntu-17.04/Dockerfile | 2 ++ docker/php-apache-dev/ubuntu-17.10/Dockerfile | 2 ++ docker/php-apache-dev/ubuntu-18.04/Dockerfile | 2 ++ docker/php-apache/5.6/Dockerfile | 2 ++ docker/php-apache/7.0/Dockerfile | 2 ++ docker/php-apache/7.1-alpine/Dockerfile | 2 ++ docker/php-apache/7.1/Dockerfile | 2 ++ docker/php-apache/7.2-alpine/Dockerfile | 2 ++ docker/php-apache/7.2/Dockerfile | 2 ++ docker/php-apache/7.3-alpine/Dockerfile | 2 ++ docker/php-apache/7.3/Dockerfile | 2 ++ docker/php-apache/7.4-alpine/Dockerfile | 2 ++ docker/php-apache/7.4/Dockerfile | 2 ++ docker/php-apache/8.0-alpine/Dockerfile | 2 ++ docker/php-apache/8.0/Dockerfile | 2 ++ docker/php-apache/centos-7-php56/Dockerfile | 2 ++ docker/php-apache/centos-7-php7/Dockerfile | 2 ++ docker/php-apache/centos-7/Dockerfile | 2 ++ docker/php-apache/debian-10/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-apache/ubuntu-16.10/Dockerfile | 2 ++ docker/php-apache/ubuntu-17.04/Dockerfile | 2 ++ docker/php-apache/ubuntu-17.10/Dockerfile | 2 ++ docker/php-apache/ubuntu-18.04/Dockerfile | 2 ++ docker/php-dev/5.6/Dockerfile | 2 ++ docker/php-dev/7.0/Dockerfile | 2 ++ docker/php-dev/7.1-alpine/Dockerfile | 2 ++ docker/php-dev/7.1/Dockerfile | 2 ++ docker/php-dev/7.2-alpine/Dockerfile | 2 ++ docker/php-dev/7.2/Dockerfile | 2 ++ docker/php-dev/7.3-alpine/Dockerfile | 2 ++ docker/php-dev/7.3/Dockerfile | 2 ++ docker/php-dev/7.4-alpine/Dockerfile | 2 ++ docker/php-dev/7.4/Dockerfile | 2 ++ docker/php-dev/8.0-alpine/Dockerfile | 2 ++ docker/php-dev/8.0/Dockerfile | 2 ++ docker/php-dev/centos-7-php56/Dockerfile | 2 ++ docker/php-dev/centos-7-php7/Dockerfile | 2 ++ docker/php-dev/centos-7/Dockerfile | 2 ++ docker/php-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 ++ docker/php-dev/ubuntu-17.04/Dockerfile | 2 ++ docker/php-dev/ubuntu-17.10/Dockerfile | 2 ++ docker/php-dev/ubuntu-18.04/Dockerfile | 2 ++ docker/php-nginx-dev/5.6/Dockerfile | 2 ++ docker/php-nginx-dev/7.0/Dockerfile | 2 ++ docker/php-nginx-dev/7.1-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/7.1/Dockerfile | 2 ++ docker/php-nginx-dev/7.2-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/7.2/Dockerfile | 2 ++ docker/php-nginx-dev/7.3-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/7.3/Dockerfile | 2 ++ docker/php-nginx-dev/7.4-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/7.4/Dockerfile | 2 ++ docker/php-nginx-dev/8.0-alpine/Dockerfile | 2 ++ docker/php-nginx-dev/8.0/Dockerfile | 2 ++ docker/php-nginx-dev/centos-7-php56/Dockerfile | 2 ++ docker/php-nginx-dev/centos-7-php7/Dockerfile | 2 ++ docker/php-nginx-dev/centos-7/Dockerfile | 2 ++ docker/php-nginx-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 ++ docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 2 ++ docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 2 ++ docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 2 ++ docker/php-nginx/5.6/Dockerfile | 2 ++ docker/php-nginx/7.0/Dockerfile | 2 ++ docker/php-nginx/7.1-alpine/Dockerfile | 2 ++ docker/php-nginx/7.1/Dockerfile | 2 ++ docker/php-nginx/7.2-alpine/Dockerfile | 2 ++ docker/php-nginx/7.2/Dockerfile | 2 ++ docker/php-nginx/7.3-alpine/Dockerfile | 2 ++ docker/php-nginx/7.3/Dockerfile | 2 ++ docker/php-nginx/7.4-alpine/Dockerfile | 2 ++ docker/php-nginx/7.4/Dockerfile | 2 ++ docker/php-nginx/8.0-alpine/Dockerfile | 2 ++ docker/php-nginx/8.0/Dockerfile | 2 ++ docker/php-nginx/centos-7-php56/Dockerfile | 2 ++ docker/php-nginx/centos-7-php7/Dockerfile | 2 ++ docker/php-nginx/centos-7/Dockerfile | 2 ++ docker/php-nginx/debian-10/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-nginx/ubuntu-16.10/Dockerfile | 2 ++ docker/php-nginx/ubuntu-17.04/Dockerfile | 2 ++ docker/php-nginx/ubuntu-17.10/Dockerfile | 2 ++ docker/php-nginx/ubuntu-18.04/Dockerfile | 2 ++ docker/php-official/5.6/Dockerfile | 11 ++++++----- docker/php-official/7.0/Dockerfile | 11 ++++++----- docker/php-official/7.1-alpine/Dockerfile | 11 ++++++----- docker/php-official/7.1/Dockerfile | 11 ++++++----- docker/php-official/7.2-alpine/Dockerfile | 11 ++++++----- docker/php-official/7.2/Dockerfile | 11 ++++++----- docker/php-official/7.3-alpine/Dockerfile | 11 ++++++----- docker/php-official/7.3/Dockerfile | 11 ++++++----- docker/php-official/7.4-alpine/Dockerfile | 11 ++++++----- docker/php-official/7.4/Dockerfile | 11 ++++++----- docker/php-official/8.0-alpine/Dockerfile | 11 ++++++----- docker/php-official/8.0/Dockerfile | 11 ++++++----- docker/php/centos-7-php56/Dockerfile | 2 ++ docker/php/centos-7-php7/Dockerfile | 2 ++ docker/php/centos-7/Dockerfile | 2 ++ docker/php/debian-10/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/php/ubuntu-16.10/Dockerfile | 2 ++ docker/php/ubuntu-17.04/Dockerfile | 2 ++ docker/php/ubuntu-17.10/Dockerfile | 2 ++ docker/php/ubuntu-18.04/Dockerfile | 2 ++ docker/piwik/latest/Dockerfile | 2 ++ docker/postfix/latest/Dockerfile | 2 ++ docker/samson-deployment/latest/Dockerfile | 11 ++++++----- docker/sphinx/latest/Dockerfile | 2 ++ docker/ssh/latest/Dockerfile | 2 ++ docker/storage/latest/Dockerfile | 2 ++ docker/toolbox/latest/Dockerfile | 8 +++++--- docker/typo3-solr/3.1/Dockerfile | 11 ++++++----- docker/typo3-solr/5.0/Dockerfile | 11 ++++++----- docker/typo3-solr/6.0/Dockerfile | 11 ++++++----- docker/typo3-solr/6.1/Dockerfile | 11 ++++++----- docker/typo3-solr/6.5/Dockerfile | 11 ++++++----- docker/typo3-solr/7.0/Dockerfile | 11 ++++++----- docker/typo3-solr/7.5/Dockerfile | 11 ++++++----- docker/typo3-solr/8.0/Dockerfile | 11 ++++++----- docker/typo3-solr/8.1/Dockerfile | 11 ++++++----- docker/varnish/latest/Dockerfile | 2 ++ docker/vsftp/latest/Dockerfile | 2 ++ 315 files changed, 781 insertions(+), 188 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index a2f7cba35..3fc0b15a0 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +ARG TARGETARCH + RUN set -x \ # Install ansible && apk-install \ diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 8b5a2866d..3d22b19a6 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 +ARG TARGETARCH + RUN set -x \ # Install ansible && yum-install \ diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 8d56810dc..5c47c8b63 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 1ea1eeb9c..f56aa8e16 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 015d11b54..ad12fdc0a 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index f65e86854..9b55c13a8 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 290e4083b..dfea6f2c6 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index f067892f8..8fd984de7 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index fbe126a9a..9c46035af 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index f1800fd85..6a44cb72d 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index 4ffbfb568..33705aa39 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 +ARG TARGETARCH + RUN set -x \ # Install ansible && apt-install \ diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 51aa595e8..04fcd594f 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:alpine +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 3e691d5a9..f3249e8df 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:centos-7 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index 501c8715b..b1206549a 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-10 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 3e54801dc..fdfa31969 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-7 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 7466f11a7..94fe63d4e 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-8 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 4cbcf8897..5510cc365 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-9 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index cfdd1cfcb..e05408760 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 41a8e8efd..60ecba4f6 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 3248c1692..e855ca243 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 555ef8aed..9675977ac 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 4d378c31e..bb8abc9b5 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 11f8f0d72..b21312e32 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index b132d9e4f..f0bcf16e6 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index b6b8a6ee6..a3a02a28c 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index ac410bbef..017a0bb03 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index 6fdff63a6..e966b2b04 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 1476e82c2..69a47e168 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index aba306a64..0cda0c858 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index cb1f0758d..843be55b6 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 1e2e90c47..7c6dece3f 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 4a5653ea4..688372925 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 568597354..a6a197f21 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index e0a976a69..23fbd309f 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 9fb7e6443..c7be91ae1 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index f21a53be5..7ab51c288 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index ec85eb2dc..f0c5783b4 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index e7dbf5c11..f6aa948df 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index cb728ac1e..580a35ab4 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index 9bdb425ef..4c153e225 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index 61e505296..25b293d1c 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index 0a479bd90..f8c1a46f4 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index f2a5ac3d0..9c67702e7 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index 2ebdc6b35..711a4cc18 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index f18c068bf..bfbe348eb 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 49237af2f..c1be2e581 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 79c5b6364..2e5ec540f 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index c2f03c96d..cf97e4d5d 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 1c4536410..b0a7cdd58 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 0f3bb38ce..85b833b6b 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index ad58488c5..f550622ad 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 0ea7b4676..e68f3dd67 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index e2efd117e..5d507d0a1 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index 38e4b93eb..f1f52b9ab 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index 62b3b7f87..63cc32a9e 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index 85ceb2db5..2c9ae8b08 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +ARG TARGETARCH + ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index be2c70e80..415e7f9b2 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 0bb8fa63a..e5c8e8462 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index 3d9a01adf..4cedcada7 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-10 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index c149f1d37..73d565765 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index f6d708f37..c01047f65 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index c071067fe..7d48879c9 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 25edf2ca6..1ff010e22 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 8170e9180..988cac374 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index d5944660f..9744276eb 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 4051b07a4..5d0bbd070 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 31d68ddeb..ca5ba4db7 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 720a307c4..060d74c64 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.10 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index 080fef41e..fde4f03ce 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index c2c882890..0c7b37fd6 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.10 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index e51f6a0cd..9d90f5681 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-18.04 +ARG TARGETARCH + ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index f6d9e3f52..53a53e7ce 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM alpine:3.11 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index b6853164b..eb9900a0e 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM centos:7 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index aa50c7341..02564039b 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM debian:buster +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 15d46363e..310685104 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM debian:7 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 1a71aa88b..4a688123b 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM debian:8 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 51e033868..8c59eb8c5 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM debian:stretch +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 0afcc0c8e..f3c8cc12f 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:12.04 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 25b8af1ea..20f0bfc54 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:14.04 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index ca0bc5de5..2deec9a09 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:15.04 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index bfdc5f36f..c98519a53 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:15.10 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index ed933ba14..beef31be4 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:16.04 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index f1058125d..129ae9446 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:16.10 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 45f2bf83c..0a6ae6046 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:17.04 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index df8c2dc6b..27d4dd7a2 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:17.10 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 9d5ca854a..97d53ef1d 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM ubuntu:18.04 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index b918dc8fb..a85f5388c 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +ARG TARGETARCH + VOLUME /etc/letsencrypt VOLUME /var/www diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index aa91d1ddb..0f80d081e 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-18.04 +ARG TARGETARCH + RUN apt-install \ build-essential \ gpg-agent \ diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index 93073796f..645371ed3 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM openjdk:8 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index 4100b18df..a07313707 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM openjdk:8 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index d2e4ca809..327fe3b63 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM openjdk:8 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index 4d539ebeb..166f5480d 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:latest +ARG TARGETARCH + # Install services RUN /usr/local/bin/apt-install \ liquidsoap \ diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 84b2d37f2..c9ba2448a 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:latest +ARG TARGETARCH + ENV MAILBOX_USERNAME="dev" \ MAILBOX_PASSWORD="dev" diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile index 6a8a81cd5..6b2c98fe4 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:alpine +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 8b49de485..7484e3018 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:centos-7 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/debian-10/Dockerfile b/docker/nginx-dev/debian-10/Dockerfile index a532f2007..31a51c30a 100644 --- a/docker/nginx-dev/debian-10/Dockerfile +++ b/docker/nginx-dev/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-10 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index a00f0f9d3..96d35688d 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-7 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index f6a87116a..d60bb4a49 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-8 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index eedf2845c..9df9a6228 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-9 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 0972f22f3..8cac4a312 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index fc40f49b4..ed10f5340 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 078bf7d63..7cb9c399e 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 3626e5014..261e7b22d 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 9136b64f1..ca5e837e5 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 7fcd84c2c..2a69fc987 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile b/docker/nginx-dev/ubuntu-17.04/Dockerfile index 9f7f4e724..c79b02f3f 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile b/docker/nginx-dev/ubuntu-17.10/Dockerfile index 9d319ab5f..7149fa6a7 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile b/docker/nginx-dev/ubuntu-18.04/Dockerfile index b99da7490..b2be85f20 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" COPY conf/ /opt/docker/ diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index ab0db62fa..30ff0e731 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index bec8f22c6..f2afeb3cd 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index 7db0f421d..e0b2bf4ab 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index ac92ec0f6..a2e8d8f39 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 34f55feb4..667bc31b7 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index fc806fb10..e02456111 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 1f8c6962b..25a479b78 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 32055985b..20bd9975d 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 5fb29b44b..af895240d 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 93cdc3e9c..7c90c7eeb 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 82e9c8a91..72b411779 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 2a8a3cd7c..1ef814e28 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index 71db037c7..335050c13 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index a3759e145..1d6532f64 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index 362edd2c8..46a752301 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index 63fdb9ad2..b42886dc9 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:5.6 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 252f25626..51ae80813 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.0 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index e7110935b..8e53c406b 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.1-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index dba0a6cfb..3c2c2996b 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.1 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index 2dcaeb548..6bcebd315 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.2-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index 348efccd8..6e0333d22 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.2 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index 203b613e4..5f7d9653a 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.3-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 3ae96b418..4d56e9171 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.3 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index 713062d45..dfe6cab25 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.4-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index b18fd6784..119a86eef 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.4 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 21bc4331b..45c5f079b 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:8.0-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index f0a541005..716661ec5 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:8.0 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 1e51d4d9b..9a8764a7c 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7-php56 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index 9762a672b..73c75e59d 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7-php7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index da83aa36e..7809777d8 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile index 6d6027a3d..a48de4246 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 96b4e9ed5..9ba6dc57b 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 97b043f81..2ea0893b1 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-8-php7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index ff8707575..4197c45a2 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-8 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 5e47348fd..04716ecdf 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-9 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index ce1ac43f4..6055d7d1e 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 8e77fbc92..5e7343f4d 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index dd5cc2f48..823c2a92b 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index ddcc02697..51581739b 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 00cdd82dd..c2c3ff9e8 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index 8a073fc87..384e36f9d 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index b3d16944c..0c287e720 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index ca7beebc3..8df2a1a0a 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index ea1a1f92b..b7914b966 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index 3768386a5..27caadb64 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index 98d8d28d9..229debd75 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index 0e05c3e26..6ba8b4b08 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index 1ffea3d51..69cb13eb3 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index aac6cff01..89d54b043 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index d2aee3770..e61502a11 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 26e5ac105..2ab2fc3e2 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index e5cf8693d..3eb5c4cb6 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index e88901bb1..3066004e6 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index 00747aeb4..07b2a261f 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 0d18be499..c8c82aad4 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index 6467e1ab6..4550d69bd 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index c98da2846..1dcec5ee2 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 19e0dd285..ad3544c3a 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 74f208d0c..576269b8b 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index fc795c554..2f97be691 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 73d641f9d..608b4a67a 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index ac6b789c7..c1718f05a 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 89b036ca5..4201b3039 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 41b38bd58..6b4b9409a 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 3edc30993..71e63824f 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 93fc111e8..956f19cee 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index bd3369717..6ce5929f3 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 14da70198..3bd4f60e4 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index ef4343a62..084458ca5 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index e6431b13c..831fcf1e3 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index ac12c14e2..a14e02992 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index a4e824d5f..3f419347e 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index 00f4e0f96..4b06bcb8c 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index c93a56d8b..1dd3414de 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 5d4b53efd..eb1805974 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index e248fc1e4..fb1371a95 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index d476350c3..397bdad1d 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index 6edd2adcd..946ef3acc 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index fb31dd92f..e2733f9cd 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index 88458042d..76a0d0540 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 4207e4551..275a04a64 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index 6915ad855..fe311a40a 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 613b33a1e..3c392e70c 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 743d4adad..c25fe23cd 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 9446aeadd..1af35769c 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 1c405db12..c01b17e9a 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index 8186e509a..cdb6cee19 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index d255b7862..0da28c05f 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index 87e8db7c4..09f439a87 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index cdc15ab54..9deb2227c 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index ec79b9444..a2058439d 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 139f08b71..507080ade 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index b614ab941..897ba9847 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 137d272b6..6d83195ab 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index bd5f318bc..46ebf6334 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index b767cc154..b4287e673 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 471f92a06..f7254c1e7 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 02faa7a6b..5c91f22ec 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 9ec564e31..7be07d4c6 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index d3d60394f..90d1bbbf2 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index dbde2f3bc..ab0ba6ad4 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index ebe4c7e3c..f5a3c97e2 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index da13a11b7..4cdfb9e59 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:5.6 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index 659ab812b..1f9d4cff0 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.0 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index 1baee2b89..81f745ef7 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 19d12d30e..d34557d5a 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index d575af75e..c41e2cc19 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.2-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index 0f1a106f0..978f4d3bf 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.2 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index d7a85e510..816981161 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.3-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index 2e9aa80f4..8f99c6cb4 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.3 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 5310ff4bb..92af63016 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.4-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index 968a6b669..b39c408a3 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.4 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 16e9f2b02..19aac5e6e 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:8.0-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index c213655ae..e92fa489a 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:8.0 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 0b1f89858..ab9a6252f 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7-php56 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index bede1bbd2..b1c0bcdc7 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7-php7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 00e6809bb..02684cbef 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile index 9588a26a3..c54578c55 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index f24312b56..52b12ac92 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index d4f2c01f7..358a05548 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-8-php7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 96bc5e9dd..c1cf4867f 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-8 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index dae5b2bb2..889807943 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-9 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 490f65ea3..cfcbdef59 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 242c4db92..b7184f0a7 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 0d9394588..cc3d3e33d 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 18d8cccfb..fb9d8dc01 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 129e2defe..e9158166d 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index eface987a..51406628c 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index 9cd5c7b3c..aa245e9cd 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index 1b4cfa952..1d28c8320 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index 17f6dd1bc..6c8dca667 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index 6699e8bbf..6471594fb 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index 1ef66c693..3a0eb8cb7 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index b22f7e67b..9ab91392c 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 1c1d15782..193d5acef 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index 6b831ac97..c82691dc0 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index f469281ad..d15e6ff46 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index a627c49cf..296144198 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index c8e0c55b0..e8a0a8171 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index 57ddd327f..3fab30751 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index 1bb09f550..0c73ffbb0 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index cbe40d837..23687c003 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index d136cbbad..476451899 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 6d6887b73..9dc6ed8f9 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 4d313785f..99f9d7ef1 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 341a9d9d5..531bdd631 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index f17d549ff..1c23bdc51 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 5cb5247d2..8670af30f 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index fc50bfd55..65869a389 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 1e45021a3..4e9c30811 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index bf9f9b481..af61c8f0f 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index d35385933..c82a128da 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 6d5f898eb..f0c4f6224 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index e8cb7e6cf..3853f84d6 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index d1fd6ea42..a4bc90f3d 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index f739e2bda..a9b695bcf 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index d65a3150c..1f9bdacbe 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index de77909ba..390aa8d58 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index b5000bd2e..1c03af37c 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index 3a3988ae2..938c6c9d9 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 519e4edeb..9caab99bd 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:5.6-fpm-stretch +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 91d171613..e7878487d 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.0-fpm-stretch +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 1786d4798..cae85b731 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.1-fpm-alpine +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 2605fa260..96e60b5b3 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.1-fpm-buster +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 87bc96619..fa1b752de 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.2-fpm-alpine +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 1098dcf97..39a94df6c 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.2-fpm-buster +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 2504c9943..9822faeba 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.3-fpm-alpine +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 70394effe..c211185b3 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.3-fpm-buster +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 152f2425d..3b2e55fd8 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.4-fpm-alpine +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index a375a795a..fcecb4b35 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:7.4-fpm-buster +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index bc7785183..be4318346 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:8.0-fpm-alpine +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 53cc0021b..85d6f78ea 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM php:8.0-fpm-buster +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index c18e803d5..8aa6e0b9c 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index 93a4651c4..d4ac2b349 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index b05f41305..56cbc1344 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile index ea988e574..5ef59a069 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index f8da8d935..06eeb4844 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-7 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 6012c9a61..9254cfe18 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-8 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 4fc27564d..e772903a2 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-8 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index e7c72c93a..1d2c70c36 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-9 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index b4864bd16..f211a9efc 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-12.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 7c69e292d..616b17f55 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-14.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index c2dbf126a..179386ff1 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-15.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 987c33f27..b03296d08 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-15.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 8ab0f064f..d7581ee2d 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-16.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 915fa2ed8..3affce675 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-16.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile index 048209705..b2968b03f 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-17.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile index 153aa4e13..f5efc091a 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-17.10 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile index ea6c24ad6..0c1ca5a30 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-18.04 +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index a945a83b6..4d8bb0e0d 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1 +ARG TARGETARCH + 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 ff876aee1..629edbb99 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:latest +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 2f9eea3f8..46f78e0dc 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM zendesk/samson:latest +ARG TARGETARCH + ENV TERM="xterm" \ LANG="C.UTF-8" \ LC_ALL="C.UTF-8" diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index b5157bdd1..8524718d7 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +ARG TARGETARCH + RUN set -x \ && apk-install \ # General python diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 4d2cabaef..1e7cc8c09 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:latest +ARG TARGETARCH + RUN set -x \ && docker-service enable ssh \ && docker-run-bootstrap \ diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index b33caadb6..1305ecfa0 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -5,3 +5,5 @@ FROM --platform=$BUILDPLATFORM alpine:latest +ARG TARGETARCH + diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index 37836c64b..d6b689577 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM alpine:latest +ARG TARGETARCH + RUN apk add --no-cache \ ca-certificates \ dpkg \ @@ -24,7 +26,7 @@ RUN apk add --no-cache \ git \ gnupg \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" + && chmod +x "/usr/local/bin/go-replace" \ + && go-replace version diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 75b7ff5f4..75e23757c 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 33ab40b07..10c342f0e 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index e54bf7c55..bb6b41f52 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM solr:6.3.0 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index a610fceaf..d0b7f0b89 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM solr:6.3.0 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index ebb34cd88..6079007f7 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM solr:6.6.2 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 6bb4bbb43..63dc5039c 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM solr:6.3.0 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 0a3e32439..d0d56202c 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM solr:6.6.2 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 04e559de5..5ea30cfbf 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM solr:6.6.2 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 76e72e900..7facc860e 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -13,14 +13,13 @@ RUN mkdir -p \ && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace" \ + && go-replace version \ # Install gosu - && export dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ @@ -30,6 +29,8 @@ RUN mkdir -p \ FROM --platform=$BUILDPLATFORM solr:6.6.3 +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 0c652b49f..189e884c0 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +ARG TARGETARCH + ENV VARNISH_PORT 80 ENV VARNISH_CONFIG "" diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index b8fb46563..a12cb901c 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -5,6 +5,8 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:latest +ARG TARGETARCH + ENV FTP_USER=application \ FTP_PASSWORD=application \ FTP_UID=1000 \ From 29a57f3c00d5e599eb3f79216d2afb83f902873d Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 17:04:17 -0700 Subject: [PATCH 054/123] avoid running go-replace in RUN as it will fail if platform is amd64 but binary is arm64 --- template/Dockerfile/tools.jinja2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index ff92d32f6..4e4488271 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -2,8 +2,7 @@ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-$grArch-linux" \ - && chmod +x "{{ path }}/go-replace" \ - && go-replace version + && chmod +x "{{ path }}/go-replace" {%- endmacro %} {% macro gosu(path="/sbin", version="1.10") -%} From fb82b19804ea2b7d54eb0d870d74b96865310d02 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 17:05:31 -0700 Subject: [PATCH 055/123] baselayout tool macros should be the default paths... maybe? --- template/Dockerfile/baselayout.jinja2 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index 6f180d3fc..a410aa092 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -2,16 +2,19 @@ {% import 'Dockerfile/tools.jinja2' as tools %} {% macro dockerStage() %} -# Staged baselayout builder +# staged baselayout builder {{ docker.from("toolbox", "latest", user) }} AS baselayout + +{{ docker.platformArgs() }} + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ # Baselayout scripts && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ - {{ tools.goreplace(path="/baselayout/usr/local/bin") }} \ - {{ tools.gosu(path="/baselayout/sbin") }} + {{ tools.goreplace() }} \ + {{ tools.gosu() }} {% endmacro %} {% macro copy() %} From 050a029931276ffa72bbee6fcba6b68e385bb2aa Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 17:06:29 -0700 Subject: [PATCH 056/123] maybe? --- docker/bootstrap/alpine/Dockerfile | 18 ++++++++++-------- docker/bootstrap/centos-7/Dockerfile | 18 ++++++++++-------- docker/bootstrap/debian-10/Dockerfile | 18 ++++++++++-------- docker/bootstrap/debian-7/Dockerfile | 18 ++++++++++-------- docker/bootstrap/debian-8/Dockerfile | 18 ++++++++++-------- docker/bootstrap/debian-9/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-12.04/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-14.04/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-15.04/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-15.10/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-16.04/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-16.10/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-17.04/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-17.10/Dockerfile | 18 ++++++++++-------- docker/bootstrap/ubuntu-18.04/Dockerfile | 18 ++++++++++-------- docker/php-official/5.6/Dockerfile | 18 ++++++++++-------- docker/php-official/7.0/Dockerfile | 18 ++++++++++-------- docker/php-official/7.1-alpine/Dockerfile | 18 ++++++++++-------- docker/php-official/7.1/Dockerfile | 18 ++++++++++-------- docker/php-official/7.2-alpine/Dockerfile | 18 ++++++++++-------- docker/php-official/7.2/Dockerfile | 18 ++++++++++-------- docker/php-official/7.3-alpine/Dockerfile | 18 ++++++++++-------- docker/php-official/7.3/Dockerfile | 18 ++++++++++-------- docker/php-official/7.4-alpine/Dockerfile | 18 ++++++++++-------- docker/php-official/7.4/Dockerfile | 18 ++++++++++-------- docker/php-official/8.0-alpine/Dockerfile | 18 ++++++++++-------- docker/php-official/8.0/Dockerfile | 18 ++++++++++-------- docker/samson-deployment/latest/Dockerfile | 18 ++++++++++-------- docker/toolbox/latest/Dockerfile | 3 +-- docker/typo3-solr/3.1/Dockerfile | 18 ++++++++++-------- docker/typo3-solr/5.0/Dockerfile | 18 ++++++++++-------- docker/typo3-solr/6.0/Dockerfile | 18 ++++++++++-------- docker/typo3-solr/6.1/Dockerfile | 18 ++++++++++-------- docker/typo3-solr/6.5/Dockerfile | 18 ++++++++++-------- docker/typo3-solr/7.0/Dockerfile | 18 ++++++++++-------- docker/typo3-solr/7.5/Dockerfile | 18 ++++++++++-------- docker/typo3-solr/8.0/Dockerfile | 18 ++++++++++-------- docker/typo3-solr/8.1/Dockerfile | 18 ++++++++++-------- 38 files changed, 371 insertions(+), 298 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 53a53e7ce..a47e4cc36 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM alpine:3.11 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index eb9900a0e..9b53361da 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM centos:7 diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 02564039b..293ac057a 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM debian:buster diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 310685104..e50017f34 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM debian:7 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 4a688123b..7af3376be 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM debian:8 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 8c59eb8c5..9d5df49fc 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM debian:stretch diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index f3c8cc12f..50986d426 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:12.04 diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 20f0bfc54..1e2ba701b 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:14.04 diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 2deec9a09..353500e53 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:15.04 diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index c98519a53..1de17c583 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:15.10 diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index beef31be4..7b631571d 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:16.04 diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 129ae9446..3246d3b8c 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:16.10 diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 0a6ae6046..413ca2748 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:17.04 diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 27d4dd7a2..711b7ffab 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:17.10 diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 97d53ef1d..314ab64e2 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:18.04 diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 9caab99bd..4b55f0b42 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:5.6-fpm-stretch diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index e7878487d..e87a8a21f 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.0-fpm-stretch diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index cae85b731..3dccf71ff 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.1-fpm-alpine diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 96e60b5b3..3ec351c0e 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.1-fpm-buster diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index fa1b752de..1f5d87df1 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.2-fpm-alpine diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 39a94df6c..55a149c41 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.2-fpm-buster diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 9822faeba..2dc35d534 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.3-fpm-alpine diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index c211185b3..f174991ac 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.3-fpm-buster diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 3b2e55fd8..48680486e 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.4-fpm-alpine diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index fcecb4b35..2a6817bd3 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.4-fpm-buster diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index be4318346..3e396cb80 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:8.0-fpm-alpine diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 85d6f78ea..d98845bb9 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM php:8.0-fpm-buster diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 46f78e0dc..790081aca 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM zendesk/samson:latest diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index d6b689577..b15f9fb2d 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -28,5 +28,4 @@ RUN apk add --no-cache \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ - && go-replace version + && chmod +x "/usr/local/bin/go-replace" diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 75e23757c..375e3514b 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 10c342f0e..d5a98cb0a 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index bb6b41f52..d3cc4e861 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.3.0 diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index d0b7f0b89..65122cdb9 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.3.0 diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 6079007f7..a994a2ec4 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.6.2 diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 63dc5039c..43d565f65 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.3.0 diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index d0d56202c..836e727b1 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.6.2 diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 5ea30cfbf..a4fb688a2 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.6.2 diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 7facc860e..500513064 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -14,17 +17,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && go-replace version \ + && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ + && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" + && chmod +x "/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.6.3 From 25bd9b97903809bf6411c5193f07995478ea810a Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 17:12:02 -0700 Subject: [PATCH 057/123] Revert "baselayout tool macros should be the default paths... maybe?" This reverts commit fb82b19804ea2b7d54eb0d870d74b96865310d02. --- template/Dockerfile/baselayout.jinja2 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index a410aa092..6f180d3fc 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -2,19 +2,16 @@ {% import 'Dockerfile/tools.jinja2' as tools %} {% macro dockerStage() %} -# staged baselayout builder +# Staged baselayout builder {{ docker.from("toolbox", "latest", user) }} AS baselayout - -{{ docker.platformArgs() }} - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ # Baselayout scripts && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ && sh /tmp/baselayout-install.sh /baselayout \ - {{ tools.goreplace() }} \ - {{ tools.gosu() }} + {{ tools.goreplace(path="/baselayout/usr/local/bin") }} \ + {{ tools.gosu(path="/baselayout/sbin") }} {% endmacro %} {% macro copy() %} From 975a4c6d22ecbd29678d8f84a4cfa25a0021668f Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 17:12:18 -0700 Subject: [PATCH 058/123] nvm makes sense --- docker/bootstrap/alpine/Dockerfile | 17 +++++++---------- docker/bootstrap/centos-7/Dockerfile | 17 +++++++---------- docker/bootstrap/debian-10/Dockerfile | 17 +++++++---------- docker/bootstrap/debian-7/Dockerfile | 17 +++++++---------- docker/bootstrap/debian-8/Dockerfile | 17 +++++++---------- docker/bootstrap/debian-9/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-12.04/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-14.04/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-15.04/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-15.10/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-16.04/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-16.10/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-17.04/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-17.10/Dockerfile | 17 +++++++---------- docker/bootstrap/ubuntu-18.04/Dockerfile | 17 +++++++---------- docker/php-official/5.6/Dockerfile | 17 +++++++---------- docker/php-official/7.0/Dockerfile | 17 +++++++---------- docker/php-official/7.1-alpine/Dockerfile | 17 +++++++---------- docker/php-official/7.1/Dockerfile | 17 +++++++---------- docker/php-official/7.2-alpine/Dockerfile | 17 +++++++---------- docker/php-official/7.2/Dockerfile | 17 +++++++---------- docker/php-official/7.3-alpine/Dockerfile | 17 +++++++---------- docker/php-official/7.3/Dockerfile | 17 +++++++---------- docker/php-official/7.4-alpine/Dockerfile | 17 +++++++---------- docker/php-official/7.4/Dockerfile | 17 +++++++---------- docker/php-official/8.0-alpine/Dockerfile | 17 +++++++---------- docker/php-official/8.0/Dockerfile | 17 +++++++---------- docker/samson-deployment/latest/Dockerfile | 17 +++++++---------- docker/typo3-solr/3.1/Dockerfile | 17 +++++++---------- docker/typo3-solr/5.0/Dockerfile | 17 +++++++---------- docker/typo3-solr/6.0/Dockerfile | 17 +++++++---------- docker/typo3-solr/6.1/Dockerfile | 17 +++++++---------- docker/typo3-solr/6.5/Dockerfile | 17 +++++++---------- docker/typo3-solr/7.0/Dockerfile | 17 +++++++---------- docker/typo3-solr/7.5/Dockerfile | 17 +++++++---------- docker/typo3-solr/8.0/Dockerfile | 17 +++++++---------- docker/typo3-solr/8.1/Dockerfile | 17 +++++++---------- 37 files changed, 259 insertions(+), 370 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index a47e4cc36..fc665898e 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM alpine:3.11 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 9b53361da..3e57b8095 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM centos:7 diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 293ac057a..a78bddd32 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM debian:buster diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index e50017f34..69f855a88 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM debian:7 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 7af3376be..e2bb1ccd6 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM debian:8 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 9d5df49fc..b12f5278e 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM debian:stretch diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 50986d426..78313a46a 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:12.04 diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 1e2ba701b..206f8bd25 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:14.04 diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 353500e53..720501c63 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:15.04 diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 1de17c583..0aaa5714a 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:15.10 diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 7b631571d..2723d3c78 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:16.04 diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 3246d3b8c..ce2f12e25 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:16.10 diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 413ca2748..5d9a65e0d 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:17.04 diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 711b7ffab..78398f142 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:17.10 diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 314ab64e2..fc41c5adb 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM ubuntu:18.04 diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 4b55f0b42..7c10441de 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:5.6-fpm-stretch diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index e87a8a21f..aa7ced6ad 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.0-fpm-stretch diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 3dccf71ff..8f06d1e41 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.1-fpm-alpine diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 3ec351c0e..29d1fbe9e 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.1-fpm-buster diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 1f5d87df1..6e7dd30cc 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.2-fpm-alpine diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 55a149c41..35e352e8a 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.2-fpm-buster diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 2dc35d534..d1be67ae3 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.3-fpm-alpine diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index f174991ac..846801f9d 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.3-fpm-buster diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 48680486e..bb2961644 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.4-fpm-alpine diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 2a6817bd3..6cf75b016 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:7.4-fpm-buster diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 3e396cb80..7f9162a53 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:8.0-fpm-alpine diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index d98845bb9..69afdd6cf 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM php:8.0-fpm-buster diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 790081aca..820a34b72 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM zendesk/samson:latest diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 375e3514b..228018e2d 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index d5a98cb0a..5801b94de 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index d3cc4e861..12d864d43 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.3.0 diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 65122cdb9..11346a244 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.3.0 diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index a994a2ec4..a58e4f0db 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.6.2 diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 43d565f65..f21f2dd7c 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.3.0 diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 836e727b1..e8363dc75 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.6.2 diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index a4fb688a2..284d4375c 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.6.2 diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 500513064..61fecb801 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -4,11 +4,8 @@ #+++++++++++++++++++++++++++++++++++++++ -# staged baselayout builder +# Staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout - -ARG TARGETARCH - RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ @@ -17,16 +14,16 @@ RUN mkdir -p \ && sh /tmp/baselayout-install.sh /baselayout \ ## Install go-replace && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" \ + && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace" \ # Install gosu - && wget -O "/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ + && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ + && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /sbin/gosu.asc "/sbin/gosu" \ + && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ && rm -rf "$GNUPGHOME" \ - && chmod +x "/sbin/gosu" + && chmod +x "/baselayout/sbin/gosu" FROM --platform=$BUILDPLATFORM solr:6.6.3 From 5877e4a52202e01ec9646b78f511f35ab8f8c418 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 17:15:17 -0700 Subject: [PATCH 059/123] work pls. --- docker/bootstrap/alpine/Dockerfile | 5 ++++- docker/bootstrap/centos-7/Dockerfile | 5 ++++- docker/bootstrap/debian-10/Dockerfile | 5 ++++- docker/bootstrap/debian-7/Dockerfile | 5 ++++- docker/bootstrap/debian-8/Dockerfile | 5 ++++- docker/bootstrap/debian-9/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-12.04/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-14.04/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-15.04/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-15.10/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-16.04/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-16.10/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-17.04/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-17.10/Dockerfile | 5 ++++- docker/bootstrap/ubuntu-18.04/Dockerfile | 5 ++++- docker/php-official/5.6/Dockerfile | 5 ++++- docker/php-official/7.0/Dockerfile | 5 ++++- docker/php-official/7.1-alpine/Dockerfile | 5 ++++- docker/php-official/7.1/Dockerfile | 5 ++++- docker/php-official/7.2-alpine/Dockerfile | 5 ++++- docker/php-official/7.2/Dockerfile | 5 ++++- docker/php-official/7.3-alpine/Dockerfile | 5 ++++- docker/php-official/7.3/Dockerfile | 5 ++++- docker/php-official/7.4-alpine/Dockerfile | 5 ++++- docker/php-official/7.4/Dockerfile | 5 ++++- docker/php-official/8.0-alpine/Dockerfile | 5 ++++- docker/php-official/8.0/Dockerfile | 5 ++++- docker/samson-deployment/latest/Dockerfile | 5 ++++- docker/typo3-solr/3.1/Dockerfile | 5 ++++- docker/typo3-solr/5.0/Dockerfile | 5 ++++- docker/typo3-solr/6.0/Dockerfile | 5 ++++- docker/typo3-solr/6.1/Dockerfile | 5 ++++- docker/typo3-solr/6.5/Dockerfile | 5 ++++- docker/typo3-solr/7.0/Dockerfile | 5 ++++- docker/typo3-solr/7.5/Dockerfile | 5 ++++- docker/typo3-solr/8.0/Dockerfile | 5 ++++- docker/typo3-solr/8.1/Dockerfile | 5 ++++- template/Dockerfile/baselayout.jinja2 | 5 ++++- 38 files changed, 152 insertions(+), 38 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index fc665898e..9f4a8a342 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 3e57b8095..4a511e4c3 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index a78bddd32..3b787fff6 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 69f855a88..6a22ce901 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index e2bb1ccd6..53636a27d 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index b12f5278e..5c54d1077 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 78313a46a..0556d0592 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 206f8bd25..2f0fe2dc0 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 720501c63..d81468384 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 0aaa5714a..2b0a03584 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 2723d3c78..b8177955c 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index ce2f12e25..8484b648f 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 5d9a65e0d..12ddaa629 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 78398f142..ada7ee785 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index fc41c5adb..60ce94521 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 7c10441de..7d9ec2197 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index aa7ced6ad..b633ec4d6 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 8f06d1e41..2dcf48a0d 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 29d1fbe9e..aa2739a4f 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 6e7dd30cc..8bf91b319 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 35e352e8a..8a076e3ed 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index d1be67ae3..eae103bca 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 846801f9d..accefc0d4 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index bb2961644..c8ae537bd 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 6cf75b016..6bf906d27 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 7f9162a53..274389572 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 69afdd6cf..124aa71c8 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 820a34b72..306714e3c 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 228018e2d..fe7354537 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 5801b94de..f176b7138 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 12d864d43..fc68afbf5 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 11346a244..1b1be2802 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index a58e4f0db..0bb26ea12 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index f21f2dd7c..9c9598917 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index e8363dc75..96ff4913d 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 284d4375c..8926a36d7 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 61fecb801..5f899347e 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -4,8 +4,11 @@ #+++++++++++++++++++++++++++++++++++++++ -# Staged baselayout builder +# staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout + +ARG TARGETARCH + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index 6f180d3fc..e23b5691d 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -2,8 +2,11 @@ {% import 'Dockerfile/tools.jinja2' as tools %} {% macro dockerStage() %} -# Staged baselayout builder +# staged baselayout builder {{ docker.from("toolbox", "latest", user) }} AS baselayout + +{{ docker.platformArgs() }} + RUN mkdir -p \ /baselayout/sbin \ /baselayout/usr/local/bin \ From 14447b2cd21d77536736efcbc623e1c6efa7a576 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 4 Aug 2022 21:58:55 -0700 Subject: [PATCH 060/123] worth a shot: don't preemptively pull toolbox img --- .github/actions/composite-docker/action.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/actions/composite-docker/action.yml b/.github/actions/composite-docker/action.yml index 30adf5546..072f8a194 100644 --- a/.github/actions/composite-docker/action.yml +++ b/.github/actions/composite-docker/action.yml @@ -41,11 +41,6 @@ runs: username: ${{ inputs.registry-user }} password: ${{ inputs.registry-secret }} - - name: Pull "toolbox" - shell: bash - run: docker pull ghcr.io/cocoastorm/webdevops/toolbox:latest - continue-on-error: true - - name: Build ${{ inputs.image-name }} uses: docker/build-push-action@v3 with: From 23ff80c06a2ee9c3018cea07e2bbccfa1d48f563 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 5 Aug 2022 17:04:27 -0700 Subject: [PATCH 061/123] wip --- docker/base-layout/latest/Dockerfile | 8 + docker/base-layout/latest/Dockerfile.jinja2 | 3 + .../latest/conf/usr/local/bin/apk-install | 11 + .../latest/conf/usr/local/bin/apk-upgrade | 11 + .../conf/usr/local/bin/apt-add-repository | 8 + .../latest/conf/usr/local/bin/apt-install | 24 + .../latest/conf/usr/local/bin/apt-update | 9 + .../latest/conf/usr/local/bin/apt-upgrade | 24 + .../conf/usr/local/bin/docker-image-cleanup | 36 ++ .../conf/usr/local/bin/docker-image-info | 87 +++ .../conf/usr/local/bin/docker-run-bootstrap | 51 ++ .../usr/local/bin/generate-dockerimage-info | 96 ++++ .../conf/usr/local/bin/generate-locales | 510 ++++++++++++++++++ .../latest/conf/usr/local/bin/go-replace | 24 + .../latest/conf/usr/local/bin/yum-install | 12 + .../latest/conf/usr/local/bin/yum-upgrade | 12 + docker/bootstrap/alpine/Dockerfile | 41 +- docker/bootstrap/centos-7/Dockerfile | 41 +- docker/bootstrap/debian-10/Dockerfile | 41 +- docker/bootstrap/debian-7/Dockerfile | 41 +- docker/bootstrap/debian-8/Dockerfile | 41 +- docker/bootstrap/debian-9/Dockerfile | 41 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 41 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 41 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 41 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 41 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 41 +- docker/bootstrap/ubuntu-16.10/Dockerfile | 41 +- docker/bootstrap/ubuntu-17.04/Dockerfile | 41 +- docker/bootstrap/ubuntu-17.10/Dockerfile | 41 +- docker/bootstrap/ubuntu-18.04/Dockerfile | 41 +- docker/go-replace-test/Dockerfile | 7 + docker/go-replace-test/build.sh | 8 + docker/php-official/5.6/Dockerfile | 41 +- docker/php-official/7.0/Dockerfile | 41 +- docker/php-official/7.1-alpine/Dockerfile | 41 +- docker/php-official/7.1/Dockerfile | 41 +- docker/php-official/7.2-alpine/Dockerfile | 41 +- docker/php-official/7.2/Dockerfile | 41 +- docker/php-official/7.3-alpine/Dockerfile | 41 +- docker/php-official/7.3/Dockerfile | 41 +- docker/php-official/7.4-alpine/Dockerfile | 41 +- docker/php-official/7.4/Dockerfile | 41 +- docker/php-official/8.0-alpine/Dockerfile | 41 +- docker/php-official/8.0/Dockerfile | 41 +- docker/samson-deployment/latest/Dockerfile | 41 +- docker/toolbox/{latest => alpine}/Dockerfile | 12 +- .../{latest => alpine}/Dockerfile.jinja2 | 7 +- docker/toolbox/buster/Dockerfile | 32 ++ docker/toolbox/buster/Dockerfile.jinja2 | 27 + docker/typo3-solr/3.1/Dockerfile | 41 +- docker/typo3-solr/5.0/Dockerfile | 41 +- docker/typo3-solr/6.0/Dockerfile | 41 +- docker/typo3-solr/6.1/Dockerfile | 41 +- docker/typo3-solr/6.5/Dockerfile | 41 +- docker/typo3-solr/7.0/Dockerfile | 41 +- docker/typo3-solr/7.5/Dockerfile | 41 +- docker/typo3-solr/8.0/Dockerfile | 41 +- docker/typo3-solr/8.1/Dockerfile | 41 +- .../general/usr/local/bin/apk-install | 11 + .../general/usr/local/bin/apk-upgrade | 11 + .../general/usr/local/bin/apt-add-repository | 8 + .../general/usr/local/bin/apt-install | 24 + .../general/usr/local/bin/apt-update | 9 + .../general/usr/local/bin/apt-upgrade | 24 + .../usr/local/bin/docker-image-cleanup | 36 ++ .../general/usr/local/bin/docker-image-info | 87 +++ .../usr/local/bin/docker-run-bootstrap | 51 ++ .../usr/local/bin/generate-dockerimage-info | 96 ++++ .../general/usr/local/bin/generate-locales | 510 ++++++++++++++++++ .../general/usr/local/bin/go-replace | 24 + .../general/usr/local/bin/yum-install | 12 + .../general/usr/local/bin/yum-upgrade | 12 + template/Dockerfile/baselayout.jinja2 | 17 +- template/Dockerfile/docker.jinja2 | 10 +- template/Dockerfile/tools.jinja2 | 26 +- 76 files changed, 2621 insertions(+), 883 deletions(-) create mode 100644 docker/base-layout/latest/Dockerfile create mode 100644 docker/base-layout/latest/Dockerfile.jinja2 create mode 100755 docker/base-layout/latest/conf/usr/local/bin/apk-install create mode 100755 docker/base-layout/latest/conf/usr/local/bin/apk-upgrade create mode 100755 docker/base-layout/latest/conf/usr/local/bin/apt-add-repository create mode 100755 docker/base-layout/latest/conf/usr/local/bin/apt-install create mode 100755 docker/base-layout/latest/conf/usr/local/bin/apt-update create mode 100755 docker/base-layout/latest/conf/usr/local/bin/apt-upgrade create mode 100755 docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup create mode 100755 docker/base-layout/latest/conf/usr/local/bin/docker-image-info create mode 100755 docker/base-layout/latest/conf/usr/local/bin/docker-run-bootstrap create mode 100755 docker/base-layout/latest/conf/usr/local/bin/generate-dockerimage-info create mode 100755 docker/base-layout/latest/conf/usr/local/bin/generate-locales create mode 100755 docker/base-layout/latest/conf/usr/local/bin/go-replace create mode 100755 docker/base-layout/latest/conf/usr/local/bin/yum-install create mode 100755 docker/base-layout/latest/conf/usr/local/bin/yum-upgrade create mode 100644 docker/go-replace-test/Dockerfile create mode 100644 docker/go-replace-test/build.sh rename docker/toolbox/{latest => alpine}/Dockerfile (58%) rename docker/toolbox/{latest => alpine}/Dockerfile.jinja2 (71%) create mode 100644 docker/toolbox/buster/Dockerfile create mode 100644 docker/toolbox/buster/Dockerfile.jinja2 create mode 100755 provisioning/base-layout/general/usr/local/bin/apk-install create mode 100755 provisioning/base-layout/general/usr/local/bin/apk-upgrade create mode 100755 provisioning/base-layout/general/usr/local/bin/apt-add-repository create mode 100755 provisioning/base-layout/general/usr/local/bin/apt-install create mode 100755 provisioning/base-layout/general/usr/local/bin/apt-update create mode 100755 provisioning/base-layout/general/usr/local/bin/apt-upgrade create mode 100755 provisioning/base-layout/general/usr/local/bin/docker-image-cleanup create mode 100755 provisioning/base-layout/general/usr/local/bin/docker-image-info create mode 100755 provisioning/base-layout/general/usr/local/bin/docker-run-bootstrap create mode 100755 provisioning/base-layout/general/usr/local/bin/generate-dockerimage-info create mode 100755 provisioning/base-layout/general/usr/local/bin/generate-locales create mode 100755 provisioning/base-layout/general/usr/local/bin/go-replace create mode 100755 provisioning/base-layout/general/usr/local/bin/yum-install create mode 100755 provisioning/base-layout/general/usr/local/bin/yum-upgrade diff --git a/docker/base-layout/latest/Dockerfile b/docker/base-layout/latest/Dockerfile new file mode 100644 index 000000000..fec1314c3 --- /dev/null +++ b/docker/base-layout/latest/Dockerfile @@ -0,0 +1,8 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/base-layout:latest +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM scratch + +COPY conf /baselayout diff --git a/docker/base-layout/latest/Dockerfile.jinja2 b/docker/base-layout/latest/Dockerfile.jinja2 new file mode 100644 index 000000000..fc49178df --- /dev/null +++ b/docker/base-layout/latest/Dockerfile.jinja2 @@ -0,0 +1,3 @@ +FROM scratch + +{{ docker.copy("conf", "/baselayout") }} diff --git a/docker/base-layout/latest/conf/usr/local/bin/apk-install b/docker/base-layout/latest/conf/usr/local/bin/apk-install new file mode 100755 index 000000000..079d06782 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/apk-install @@ -0,0 +1,11 @@ +#!/bin/sh + +set -o pipefail # trace ERR through pipes +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 + +# Install packages +apk add --no-cache --upgrade $* + +# Clear files (reduce snapshot size) +rm -rf /var/cache/apk/* diff --git a/docker/base-layout/latest/conf/usr/local/bin/apk-upgrade b/docker/base-layout/latest/conf/usr/local/bin/apk-upgrade new file mode 100755 index 000000000..f4b4ff3c9 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/apk-upgrade @@ -0,0 +1,11 @@ +#!/bin/sh + +set -o pipefail # trace ERR through pipes +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 + +# Install packages +apk upgrade --no-cache --force + +# Clear files (reduce snapshot size) +rm -rf /var/cache/apk/* diff --git a/docker/base-layout/latest/conf/usr/local/bin/apt-add-repository b/docker/base-layout/latest/conf/usr/local/bin/apt-add-repository new file mode 100755 index 000000000..5e6ba6d2f --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/apt-add-repository @@ -0,0 +1,8 @@ +#!/bin/sh + +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 + +apt-install software-properties-common +add-apt-repository $@ +apt-get purge -y -f software-properties-common diff --git a/docker/base-layout/latest/conf/usr/local/bin/apt-install b/docker/base-layout/latest/conf/usr/local/bin/apt-install new file mode 100755 index 000000000..31edff098 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/apt-install @@ -0,0 +1,24 @@ +#!/bin/bash + +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 + +export DEBIAN_FRONTEND=noninteractive + +if [[ -f "/tmp/.apt-update" ]]; then + echo "Detected prefetched 'apt-get update'" + # Install packages + RUNLEVEL=1 apt-get install -y -f --no-install-recommends $* +else + # Update apt cache + apt-get update + + # Install packages + RUNLEVEL=1 apt-get install -y -f --no-install-recommends $* + + # Clear files (reduce snapshot size) + rm -rf /var/lib/apt/lists/* + apt-get clean -y +fi diff --git a/docker/base-layout/latest/conf/usr/local/bin/apt-update b/docker/base-layout/latest/conf/usr/local/bin/apt-update new file mode 100755 index 000000000..d3019cc0c --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/apt-update @@ -0,0 +1,9 @@ +#!/bin/bash + +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 + +apt-get update +touch /tmp/.apt-update diff --git a/docker/base-layout/latest/conf/usr/local/bin/apt-upgrade b/docker/base-layout/latest/conf/usr/local/bin/apt-upgrade new file mode 100755 index 000000000..31ab612b8 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/apt-upgrade @@ -0,0 +1,24 @@ +#!/bin/bash + +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 + +export DEBIAN_FRONTEND=noninteractive + +if [[ -f "/tmp/.apt-update" ]]; then + echo "Detected prefetched 'apt-get update'" + # Update packages + RUNLEVEL=1 apt-get dist-upgrade -y -f +else + # Update apt cache + apt-get update + + # Update packages + RUNLEVEL=1 apt-get dist-upgrade -y -f + + # Clear files (reduce snapshot size) + rm -rf /var/lib/apt/lists/* + apt-get clean -y +fi diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup new file mode 100755 index 000000000..e63d1b3c4 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup @@ -0,0 +1,36 @@ +#!/bin/sh + +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 + +LSB_FAMILY=$(docker-image-info family) + +case "$LSB_FAMILY" in + Debian) + rm -f /tmp/.apt-update + apt-get autoremove -y -f + apt-get clean -y + rm -rf /var/lib/apt/lists/* + ;; + + RedHat) + yum autoremove --assumeyes + yum clean all + ;; + + Alpine) + find /var/lib/apk/ -mindepth 1 -delete + ;; + + Arch) + pacman -Sc + ;; + + *) + echo "ERROR: Distribution $LSB_FAMILY not supported" + exit 1 + ;; +esac + +find /tmp/ /var/log/ -mindepth 1 -delete +rm -rf /root/.cache diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-image-info b/docker/base-layout/latest/conf/usr/local/bin/docker-image-info new file mode 100755 index 000000000..fb9248fc2 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-image-info @@ -0,0 +1,87 @@ +#!/bin/sh + +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 + +help() { + if [ -n "$1" ]; then + echo "$1" + echo "" + fi + + echo "Usage: $0 " + echo "" + echo " Application arguments:" + echo " family Get distribution family" + echo " dist Get distribution name" + echo " dist-version Get distribution version" + echo " dist-release Get distribution release" + echo " dist-codename Get distribution codename" + echo " lsb Get lsb informations (if available)" + echo " lsb-desc Get lsb description (if available)" + echo " buildtime Get buildtime of docker image" + echo "" + + exit $2 + +} + +if [ "$#" -ne 1 ]; then + help "[ERROR] Invalid argument" 1 +fi + +INFO_FILE="" + +case "$1" in + dist-family|distribution-family|family) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution_family + ;; + + dist|distribution) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution + ;; + + dist-version|distribution-version) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution_version + ;; + + dist-release|distribution-release) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_release + ;; + + dist-codename|distribution-codename) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_codename + ;; + + lsb) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb + ;; + + lsb-desc|lsb-description) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_description + ;; + + buildtime) + INFO_FILE=/opt/docker/etc/.registry/image_info_buildtime + ;; + + help) + help "" 0 + ;; + + *) + help "[ERROR] Invalid argument" 1 + ;; +esac + +if [ -n "$INFO_FILE" ]; then + if [ -f "$INFO_FILE" ]; then + cat -- "$INFO_FILE" + else + echo "[ERROR] Infomation file $INFO_FILE not found!" + echo " Please run generate-dockerimage-info on docker image creation!" + exit 2 + fi +else + help "" 1 +fi diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-run-bootstrap b/docker/base-layout/latest/conf/usr/local/bin/docker-run-bootstrap new file mode 100755 index 000000000..b22f41b7f --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-run-bootstrap @@ -0,0 +1,51 @@ +#!/bin/sh + +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 + +## execute with bash if possible +if [ ! -n "${BASH+x}" ]; then + if [ -f /bin/bash ]; then + exec /bin/bash "$0" "$@" + fi +fi + +# Make all scripts executable +if [ -d /opt/docker/bin/ ]; then + find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +fi + +# Enable usr-bin executables +if [ -d /opt/docker/bin/usr-bin ]; then + find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" + done +fi + + +globexists() { + test -e "$1" -o -L "$1" +} + +execScriptsInPath() { + SCRIPT_DIRECTORY="$1" + if [ -d "$SCRIPT_DIRECTORY" ]; then + if globexists "${SCRIPT_DIRECTORY}/"*.sh; then + echo ":: Running scripts in ${SCRIPT_DIRECTORY}" + for FILE in "${SCRIPT_DIRECTORY}/"*.sh; do + echo "-> Executing ${FILE}" + + # run custom scripts, only once + . "$FILE" + rm -f -- "$FILE" + done + fi + fi +} + +# Bootstrap +execScriptsInPath "/opt/docker/provision/bootstrap.d" +execScriptsInPath "/opt/docker/provision/build.d" +execScriptsInPath "/bootstrap.d" +execScriptsInPath "/build.d" diff --git a/docker/base-layout/latest/conf/usr/local/bin/generate-dockerimage-info b/docker/base-layout/latest/conf/usr/local/bin/generate-dockerimage-info new file mode 100755 index 000000000..25417e0a4 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/generate-dockerimage-info @@ -0,0 +1,96 @@ +#!/bin/sh + +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 + +LSB_FAMILY="" + +############################# +# Distribution detection +############################# + +if [ -x "/usr/bin/apt-get" ]; then + # Debian family + LSB_FAMILY="Debian" + +elif [ -x "/bin/yum" ]; then + # RedHat family + LSB_FAMILY="RedHat" + +elif [ -x "/sbin/apk" ]; then + # Alpine family + LSB_FAMILY="Alpine" + +elif [ -f "/etc/arch-release" ]; then + # Alpine family + LSB_FAMILY="Arch" + +else + # Unknown + echo "ERROR: Distribution detection failed" + exit 1 +fi + +############################# +# Install +############################# + +case "$LSB_FAMILY" in + Debian) + apt-install lsb-release + ;; + + RedHat) + yum-install redhat-lsb-core + ;; +esac + +############################# +# Set distribution information +############################# + +echo "Detected $LSB_FAMILY" + +mkdir -p /opt/docker/etc/.registry/ +echo "$LSB_FAMILY" > /opt/docker/etc/.registry/image_info_distribution_family +echo "$LSB_FAMILY" > /opt/docker/etc/.registry/image_info_distribution +date +%s >/opt/docker/etc/.registry/image_info_buildtime + +# Create all files +touch /opt/docker/etc/.registry/image_info_distribution_version +touch /opt/docker/etc/.registry/image_info_lsb +touch /opt/docker/etc/.registry/image_info_lsb_description +touch /opt/docker/etc/.registry/image_info_lsb_release +touch /opt/docker/etc/.registry/image_info_lsb_codename + +# Collect distribution specific informations +case "$LSB_FAMILY" in + Debian|RedHat) + lsb_release -i -s > /opt/docker/etc/.registry/image_info_distribution + lsb_release -r -s > /opt/docker/etc/.registry/image_info_distribution_version + lsb_release -a > /opt/docker/etc/.registry/image_info_lsb + lsb_release -d -s > /opt/docker/etc/.registry/image_info_lsb_description + lsb_release -r -s > /opt/docker/etc/.registry/image_info_lsb_release + lsb_release -c -s > /opt/docker/etc/.registry/image_info_lsb_codename + ;; + + Alpine) + cat /etc/alpine-release > /opt/docker/etc/.registry/image_info_distribution_version + ;; +esac + + +############################# +# Uninstall +############################# + +case "$LSB_FAMILY" in + Debian) + apt-get purge -y -f lsb-release + ;; + + RedHat) + yum erase --assumeyes redhat-lsb-core + yum autoremove --assumeyes + ;; +esac diff --git a/docker/base-layout/latest/conf/usr/local/bin/generate-locales b/docker/base-layout/latest/conf/usr/local/bin/generate-locales new file mode 100755 index 000000000..505bf0786 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/generate-locales @@ -0,0 +1,510 @@ +#!/bin/bash + +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 + +IMAGE_DISTRIBUTION_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info distribution) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info distribution-version) + +####################################### +## Debian +####################################### + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]]; then + /usr/local/bin/apt-install locales-all +fi + +####################################### +## Ubuntu +####################################### + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]]; then + if [[ "$(echo $IMAGE_DISTRIBUTION_VERSION| cut -f 1 -d .)" -ge "16" ]]; then + # Ubuntu 16.04 or later + /usr/local/bin/apt-install locales-all + else + # Ubuntu pre 16.04 versions + ln -s /usr/share/i18n/SUPPORTED /var/lib/locales/supported.d/all + locale-gen + fi +fi + +####################################### +## RedHat family +####################################### + +if [[ "$IMAGE_DISTRIBUTION_FAMILY" == "RedHat" ]]; then + + function localedefdebug() { + echo $* + localedef "$@" + } + + # Failing locales + ## && localedefdebug -c -i bo_CN -f UTF-8 bo_CN.utf8 \ + ## && localedefdebug -c -i bo_IN -f UTF-8 bo_IN.utf8 \ + ## && localedefdebug -c -i ca_ES -f ISO-8859-15@valencia ca_ES.iso885915@valencia \ + ## && localedefdebug -c -i ca_ES@valencia -f UTF-8 ca_ES.utf8@valencia \ + ## && localedefdebug -c -i ce_RU -f UTF-8 ce_RU.utf8 \ + ## && localedefdebug -c -i ckb_IQ -f UTF-8 ckb_IQ.utf8 \ + ## && localedefdebug -c -i de_LI -f UTF-8 de_LI.utf8 \ + ## && localedefdebug -c -i ug_CN@latin -f UTF-8 ug_CN.utf8@latin \ + ## && localedefdebug -c -i en_DK -f ISO-8859-1 en_DK.iso88591 \ + ## && localedefdebug -c -i en_DK -f ISO-8859-15 en_DK.iso885915 \ + ## && localedefdebug -c -i en_DK -f UTF-8 en_DK.utf8 \ + ## && localedefdebug -c -i eo -f ISO-8859-3 eo.iso88593 \ + ## && localedefdebug -c -i eo_US -f UTF-8 eo_US.utf8 \ + ## && localedefdebug -c -i eo -f UTF-8 eo.utf8 \ + ## && localedefdebug -c -i eu_FR -f ISO-8859-1 eu_FR.iso88591 \ + ## && localedefdebug -c -i eu_FR@euro -f ISO-8859-15 eu_FR.iso885915@euro \ + ## && localedefdebug -c -i eu_FR -f UTF-8 eu_FR.utf8 \ + ## && localedefdebug -c -i ia -f UTF-8 ia.utf8 \ + ## && localedefdebug -c -i ln_CD -f UTF-8 ln_CD.utf8 \ + ## && localedefdebug -c -i sd_PK -f UTF-8 sd_PK.utf8 \ + ## && localedefdebug -c -i zh_HK -f BIG5HKSCS zh_HK.big5hkscs \ + + # Generate localeslocale -a|grep '\.'| while read LOCALE; do LOCALE_LANG=$(echo $LOCALE|cut -d '.' -f 1); LOCALE_CHARSET=$(echo $LOCALE|cut -d '.' -f 2); echo "&& localedefdebug -c -i $LOCALE_LANG -f $LOCALE_CHARSET $LOCALE_LANG.$LOCALE_CHARSET ; \$(exit 0) \\"; done; + # -> + /bin/true \ + && localedefdebug -c -i aa_DJ -f ISO-8859-1 aa_DJ.iso88591 \ + && localedefdebug -c -i aa_DJ -f UTF-8 aa_DJ.utf8 \ + && localedefdebug -c -i aa_ER -f UTF-8 aa_ER.utf8 \ + && localedefdebug -c -i aa_ER@saaho -f UTF-8 aa_ER.utf8@saaho \ + && localedefdebug -c -i aa_ET -f UTF-8 aa_ET.utf8 \ + && localedefdebug -c -i af_ZA -f ISO-8859-1 af_ZA.iso88591 \ + && localedefdebug -c -i af_ZA -f UTF-8 af_ZA.utf8 \ + && localedefdebug -c -i am_ET -f UTF-8 am_ET.utf8 \ + && localedefdebug -c -i an_ES -f ISO-8859-15 an_ES.iso885915 \ + && localedefdebug -c -i an_ES -f UTF-8 an_ES.utf8 \ + && localedefdebug -c -i ar_AE -f ISO-8859-6 ar_AE.iso88596 \ + && localedefdebug -c -i ar_AE -f UTF-8 ar_AE.utf8 \ + && localedefdebug -c -i ar_BH -f ISO-8859-6 ar_BH.iso88596 \ + && localedefdebug -c -i ar_BH -f UTF-8 ar_BH.utf8 \ + && localedefdebug -c -i ar_DZ -f ISO-8859-6 ar_DZ.iso88596 \ + && localedefdebug -c -i ar_DZ -f UTF-8 ar_DZ.utf8 \ + && localedefdebug -c -i ar_EG -f ISO-8859-6 ar_EG.iso88596 \ + && localedefdebug -c -i ar_EG -f UTF-8 ar_EG.utf8 \ + && localedefdebug -c -i ar_IN -f UTF-8 ar_IN.utf8 \ + && localedefdebug -c -i ar_IQ -f ISO-8859-6 ar_IQ.iso88596 \ + && localedefdebug -c -i ar_IQ -f UTF-8 ar_IQ.utf8 \ + && localedefdebug -c -i ar_JO -f ISO-8859-6 ar_JO.iso88596 \ + && localedefdebug -c -i ar_JO -f UTF-8 ar_JO.utf8 \ + && localedefdebug -c -i ar_KW -f ISO-8859-6 ar_KW.iso88596 \ + && localedefdebug -c -i ar_KW -f UTF-8 ar_KW.utf8 \ + && localedefdebug -c -i ar_LB -f ISO-8859-6 ar_LB.iso88596 \ + && localedefdebug -c -i ar_LB -f UTF-8 ar_LB.utf8 \ + && localedefdebug -c -i ar_LY -f ISO-8859-6 ar_LY.iso88596 \ + && localedefdebug -c -i ar_LY -f UTF-8 ar_LY.utf8 \ + && localedefdebug -c -i ar_MA -f ISO-8859-6 ar_MA.iso88596 \ + && localedefdebug -c -i ar_MA -f UTF-8 ar_MA.utf8 \ + && localedefdebug -c -i ar_OM -f ISO-8859-6 ar_OM.iso88596 \ + && localedefdebug -c -i ar_OM -f UTF-8 ar_OM.utf8 \ + && localedefdebug -c -i ar_QA -f ISO-8859-6 ar_QA.iso88596 \ + && localedefdebug -c -i ar_QA -f UTF-8 ar_QA.utf8 \ + && localedefdebug -c -i ar_SA -f ISO-8859-6 ar_SA.iso88596 \ + && localedefdebug -c -i ar_SA -f UTF-8 ar_SA.utf8 \ + && localedefdebug -c -i ar_SD -f ISO-8859-6 ar_SD.iso88596 \ + && localedefdebug -c -i ar_SD -f UTF-8 ar_SD.utf8 \ + && localedefdebug -c -i ar_SY -f ISO-8859-6 ar_SY.iso88596 \ + && localedefdebug -c -i ar_SY -f UTF-8 ar_SY.utf8 \ + && localedefdebug -c -i ar_TN -f ISO-8859-6 ar_TN.iso88596 \ + && localedefdebug -c -i ar_TN -f UTF-8 ar_TN.utf8 \ + && localedefdebug -c -i ar_YE -f ISO-8859-6 ar_YE.iso88596 \ + && localedefdebug -c -i ar_YE -f UTF-8 ar_YE.utf8 \ + && localedefdebug -c -i as_IN -f UTF-8 as_IN.utf8 \ + && localedefdebug -c -i ast_ES -f ISO-8859-15 ast_ES.iso885915 \ + && localedefdebug -c -i ast_ES -f UTF-8 ast_ES.utf8 \ + && localedefdebug -c -i az_AZ -f UTF-8 az_AZ.utf8 \ + && localedefdebug -c -i be_BY -f CP1251 be_BY.cp1251 \ + && localedefdebug -c -i be_BY -f UTF-8 be_BY.utf8 \ + && localedefdebug -c -i be_BY@latin -f UTF-8 be_BY.utf8@latin \ + && localedefdebug -c -i bem_ZM -f UTF-8 bem_ZM.utf8 \ + && localedefdebug -c -i ber_DZ -f UTF-8 ber_DZ.utf8 \ + && localedefdebug -c -i ber_MA -f UTF-8 ber_MA.utf8 \ + && localedefdebug -c -i bg_BG -f CP1251 bg_BG.cp1251 \ + && localedefdebug -c -i bg_BG -f UTF-8 bg_BG.utf8 \ + && localedefdebug -c -i bho_IN -f UTF-8 bho_IN.utf8 \ + && localedefdebug -c -i bn_BD -f UTF-8 bn_BD.utf8 \ + && localedefdebug -c -i bn_IN -f UTF-8 bn_IN.utf8 \ + && localedefdebug -c -i br_FR -f ISO-8859-1 br_FR.iso88591 \ + && localedefdebug -c -i br_FR@euro -f ISO-8859-15 br_FR.iso885915@euro \ + && localedefdebug -c -i br_FR -f UTF-8 br_FR.utf8 \ + && localedefdebug -c -i brx_IN -f UTF-8 brx_IN.utf8 \ + && localedefdebug -c -i bs_BA -f ISO-8859-2 bs_BA.iso88592 \ + && localedefdebug -c -i bs_BA -f UTF-8 bs_BA.utf8 \ + && localedefdebug -c -i byn_ER -f UTF-8 byn_ER.utf8 \ + && localedefdebug -c -i ca_AD -f ISO-8859-15 ca_AD.iso885915 \ + && localedefdebug -c -i ca_AD -f UTF-8 ca_AD.utf8 \ + && localedefdebug -c -i ca_ES -f ISO-8859-1 ca_ES.iso88591 \ + && localedefdebug -c -i ca_ES@euro -f ISO-8859-15 ca_ES.iso885915@euro \ + && localedefdebug -c -i ca_ES -f UTF-8 ca_ES.utf8 \ + && localedefdebug -c -i ca_FR -f ISO-8859-15 ca_FR.iso885915 \ + && localedefdebug -c -i ca_FR -f UTF-8 ca_FR.utf8 \ + && localedefdebug -c -i ca_IT -f ISO-8859-15 ca_IT.iso885915 \ + && localedefdebug -c -i ca_IT -f UTF-8 ca_IT.utf8 \ + && localedefdebug -c -i crh_UA -f UTF-8 crh_UA.utf8 \ + && localedefdebug -c -i csb_PL -f UTF-8 csb_PL.utf8 \ + && localedefdebug -c -i cs_CZ -f ISO-8859-2 cs_CZ.iso88592 \ + && localedefdebug -c -i cs_CZ -f UTF-8 cs_CZ.utf8 \ + && localedefdebug -c -i cv_RU -f UTF-8 cv_RU.utf8 \ + && localedefdebug -c -i cy_GB -f ISO-8859-14 cy_GB.iso885914 \ + && localedefdebug -c -i cy_GB -f UTF-8 cy_GB.utf8 \ + && localedefdebug -c -i da_DK -f ISO-8859-1 da_DK.iso88591 \ + && localedefdebug -c -i da_DK -f UTF-8 da_DK.utf8 \ + && localedefdebug -c -i de_AT -f ISO-8859-1 de_AT.iso88591 \ + && localedefdebug -c -i de_AT@euro -f ISO-8859-15 de_AT.iso885915@euro \ + && localedefdebug -c -i de_AT -f UTF-8 de_AT.utf8 \ + && localedefdebug -c -i de_BE -f ISO-8859-1 de_BE.iso88591 \ + && localedefdebug -c -i de_BE@euro -f ISO-8859-15 de_BE.iso885915@euro \ + && localedefdebug -c -i de_BE -f UTF-8 de_BE.utf8 \ + && localedefdebug -c -i de_CH -f ISO-8859-1 de_CH.iso88591 \ + && localedefdebug -c -i de_CH -f UTF-8 de_CH.utf8 \ + && localedefdebug -c -i de_DE -f ISO-8859-1 de_DE.iso88591 \ + && localedefdebug -c -i de_DE@euro -f ISO-8859-15 de_DE.iso885915@euro \ + && localedefdebug -c -i de_DE -f UTF-8 de_DE.utf8 \ + && localedefdebug -c -i de_LU -f ISO-8859-1 de_LU.iso88591 \ + && localedefdebug -c -i de_LU@euro -f ISO-8859-15 de_LU.iso885915@euro \ + && localedefdebug -c -i de_LU -f UTF-8 de_LU.utf8 \ + && localedefdebug -c -i dv_MV -f UTF-8 dv_MV.utf8 \ + && localedefdebug -c -i dz_BT -f UTF-8 dz_BT.utf8 \ + && localedefdebug -c -i el_CY -f ISO-8859-7 el_CY.iso88597 \ + && localedefdebug -c -i el_CY -f UTF-8 el_CY.utf8 \ + && localedefdebug -c -i el_GR -f ISO-8859-7 el_GR.iso88597 \ + && localedefdebug -c -i el_GR -f UTF-8 el_GR.utf8 \ + && localedefdebug -c -i en_AG -f UTF-8 en_AG.utf8 \ + && localedefdebug -c -i en_AU -f ISO-8859-1 en_AU.iso88591 \ + && localedefdebug -c -i en_AU -f UTF-8 en_AU.utf8 \ + && localedefdebug -c -i en_BW -f ISO-8859-1 en_BW.iso88591 \ + && localedefdebug -c -i en_BW -f UTF-8 en_BW.utf8 \ + && localedefdebug -c -i en_CA -f ISO-8859-1 en_CA.iso88591 \ + && localedefdebug -c -i en_CA -f UTF-8 en_CA.utf8 \ + && localedefdebug -c -i en_GB -f ISO-8859-1 en_GB.iso88591 \ + && localedefdebug -c -i en_GB -f ISO-8859-15 en_GB.iso885915 \ + && localedefdebug -c -i en_GB -f UTF-8 en_GB.utf8 \ + && localedefdebug -c -i en_HK -f ISO-8859-1 en_HK.iso88591 \ + && localedefdebug -c -i en_HK -f UTF-8 en_HK.utf8 \ + && localedefdebug -c -i en_IE -f ISO-8859-1 en_IE.iso88591 \ + && localedefdebug -c -i en_IE@euro -f ISO-8859-15 en_IE.iso885915@euro \ + && localedefdebug -c -i en_IE -f UTF-8 en_IE.utf8 \ + && localedefdebug -c -i en_IN -f UTF-8 en_IN.utf8 \ + && localedefdebug -c -i en_NG -f UTF-8 en_NG.utf8 \ + && localedefdebug -c -i en_NZ -f ISO-8859-1 en_NZ.iso88591 \ + && localedefdebug -c -i en_NZ -f UTF-8 en_NZ.utf8 \ + && localedefdebug -c -i en_PH -f ISO-8859-1 en_PH.iso88591 \ + && localedefdebug -c -i en_PH -f UTF-8 en_PH.utf8 \ + && localedefdebug -c -i en_SG -f ISO-8859-1 en_SG.iso88591 \ + && localedefdebug -c -i en_SG -f UTF-8 en_SG.utf8 \ + && localedefdebug -c -i en_US -f ISO-8859-1 en_US.iso88591 \ + && localedefdebug -c -i en_US -f ISO-8859-15 en_US.iso885915 \ + && localedefdebug -c -i en_US -f UTF-8 en_US.utf8 \ + && localedefdebug -c -i en_ZA -f ISO-8859-1 en_ZA.iso88591 \ + && localedefdebug -c -i en_ZA -f UTF-8 en_ZA.utf8 \ + && localedefdebug -c -i en_ZM -f UTF-8 en_ZM.utf8 \ + && localedefdebug -c -i en_ZW -f ISO-8859-1 en_ZW.iso88591 \ + && localedefdebug -c -i en_ZW -f UTF-8 en_ZW.utf8 \ + && localedefdebug -c -i es_AR -f ISO-8859-1 es_AR.iso88591 \ + && localedefdebug -c -i es_AR -f UTF-8 es_AR.utf8 \ + && localedefdebug -c -i es_BO -f ISO-8859-1 es_BO.iso88591 \ + && localedefdebug -c -i es_BO -f UTF-8 es_BO.utf8 \ + && localedefdebug -c -i es_CL -f ISO-8859-1 es_CL.iso88591 \ + && localedefdebug -c -i es_CL -f UTF-8 es_CL.utf8 \ + && localedefdebug -c -i es_CO -f ISO-8859-1 es_CO.iso88591 \ + && localedefdebug -c -i es_CO -f UTF-8 es_CO.utf8 \ + && localedefdebug -c -i es_CR -f ISO-8859-1 es_CR.iso88591 \ + && localedefdebug -c -i es_CR -f UTF-8 es_CR.utf8 \ + && localedefdebug -c -i es_CU -f UTF-8 es_CU.utf8 \ + && localedefdebug -c -i es_DO -f ISO-8859-1 es_DO.iso88591 \ + && localedefdebug -c -i es_DO -f UTF-8 es_DO.utf8 \ + && localedefdebug -c -i es_EC -f ISO-8859-1 es_EC.iso88591 \ + && localedefdebug -c -i es_EC -f UTF-8 es_EC.utf8 \ + && localedefdebug -c -i es_ES -f ISO-8859-1 es_ES.iso88591 \ + && localedefdebug -c -i es_ES@euro -f ISO-8859-15 es_ES.iso885915@euro \ + && localedefdebug -c -i es_ES -f UTF-8 es_ES.utf8 \ + && localedefdebug -c -i es_GT -f ISO-8859-1 es_GT.iso88591 \ + && localedefdebug -c -i es_GT -f UTF-8 es_GT.utf8 \ + && localedefdebug -c -i es_HN -f ISO-8859-1 es_HN.iso88591 \ + && localedefdebug -c -i es_HN -f UTF-8 es_HN.utf8 \ + && localedefdebug -c -i es_MX -f ISO-8859-1 es_MX.iso88591 \ + && localedefdebug -c -i es_MX -f UTF-8 es_MX.utf8 \ + && localedefdebug -c -i es_NI -f ISO-8859-1 es_NI.iso88591 \ + && localedefdebug -c -i es_NI -f UTF-8 es_NI.utf8 \ + && localedefdebug -c -i es_PA -f ISO-8859-1 es_PA.iso88591 \ + && localedefdebug -c -i es_PA -f UTF-8 es_PA.utf8 \ + && localedefdebug -c -i es_PE -f ISO-8859-1 es_PE.iso88591 \ + && localedefdebug -c -i es_PE -f UTF-8 es_PE.utf8 \ + && localedefdebug -c -i es_PR -f ISO-8859-1 es_PR.iso88591 \ + && localedefdebug -c -i es_PR -f UTF-8 es_PR.utf8 \ + && localedefdebug -c -i es_PY -f ISO-8859-1 es_PY.iso88591 \ + && localedefdebug -c -i es_PY -f UTF-8 es_PY.utf8 \ + && localedefdebug -c -i es_SV -f ISO-8859-1 es_SV.iso88591 \ + && localedefdebug -c -i es_SV -f UTF-8 es_SV.utf8 \ + && localedefdebug -c -i es_US -f ISO-8859-1 es_US.iso88591 \ + && localedefdebug -c -i es_US -f UTF-8 es_US.utf8 \ + && localedefdebug -c -i es_UY -f ISO-8859-1 es_UY.iso88591 \ + && localedefdebug -c -i es_UY -f UTF-8 es_UY.utf8 \ + && localedefdebug -c -i es_VE -f ISO-8859-1 es_VE.iso88591 \ + && localedefdebug -c -i es_VE -f UTF-8 es_VE.utf8 \ + && localedefdebug -c -i et_EE -f ISO-8859-1 et_EE.iso88591 \ + && localedefdebug -c -i et_EE -f ISO-8859-15 et_EE.iso885915 \ + && localedefdebug -c -i et_EE -f UTF-8 et_EE.utf8 \ + && localedefdebug -c -i eu_ES -f ISO-8859-1 eu_ES.iso88591 \ + && localedefdebug -c -i eu_ES@euro -f ISO-8859-15 eu_ES.iso885915@euro \ + && localedefdebug -c -i eu_ES -f UTF-8 eu_ES.utf8 \ + && localedefdebug -c -i fa_IR -f UTF-8 fa_IR.utf8 \ + && localedefdebug -c -i ff_SN -f UTF-8 ff_SN.utf8 \ + && localedefdebug -c -i fi_FI -f ISO-8859-1 fi_FI.iso88591 \ + && localedefdebug -c -i fi_FI@euro -f ISO-8859-15 fi_FI.iso885915@euro \ + && localedefdebug -c -i fi_FI -f UTF-8 fi_FI.utf8 \ + && localedefdebug -c -i fil_PH -f UTF-8 fil_PH.utf8 \ + && localedefdebug -c -i fo_FO -f ISO-8859-1 fo_FO.iso88591 \ + && localedefdebug -c -i fo_FO -f UTF-8 fo_FO.utf8 \ + && localedefdebug -c -i fr_BE -f ISO-8859-1 fr_BE.iso88591 \ + && localedefdebug -c -i fr_BE@euro -f ISO-8859-15 fr_BE.iso885915@euro \ + && localedefdebug -c -i fr_BE -f UTF-8 fr_BE.utf8 \ + && localedefdebug -c -i fr_CA -f ISO-8859-1 fr_CA.iso88591 \ + && localedefdebug -c -i fr_CA -f UTF-8 fr_CA.utf8 \ + && localedefdebug -c -i fr_CH -f ISO-8859-1 fr_CH.iso88591 \ + && localedefdebug -c -i fr_CH -f UTF-8 fr_CH.utf8 \ + && localedefdebug -c -i fr_FR -f ISO-8859-1 fr_FR.iso88591 \ + && localedefdebug -c -i fr_FR@euro -f ISO-8859-15 fr_FR.iso885915@euro \ + && localedefdebug -c -i fr_FR -f UTF-8 fr_FR.utf8 \ + && localedefdebug -c -i fr_LU -f ISO-8859-1 fr_LU.iso88591 \ + && localedefdebug -c -i fr_LU@euro -f ISO-8859-15 fr_LU.iso885915@euro \ + && localedefdebug -c -i fr_LU -f UTF-8 fr_LU.utf8 \ + && localedefdebug -c -i fur_IT -f UTF-8 fur_IT.utf8 \ + && localedefdebug -c -i fy_DE -f UTF-8 fy_DE.utf8 \ + && localedefdebug -c -i fy_NL -f UTF-8 fy_NL.utf8 \ + && localedefdebug -c -i ga_IE -f ISO-8859-1 ga_IE.iso88591 \ + && localedefdebug -c -i ga_IE@euro -f ISO-8859-15 ga_IE.iso885915@euro \ + && localedefdebug -c -i ga_IE -f UTF-8 ga_IE.utf8 \ + && localedefdebug -c -i gd_GB -f ISO-8859-15 gd_GB.iso885915 \ + && localedefdebug -c -i gd_GB -f UTF-8 gd_GB.utf8 \ + && localedefdebug -c -i gez_ER -f UTF-8 gez_ER.utf8 \ + && localedefdebug -c -i gez_ER@abegede -f UTF-8 gez_ER.utf8@abegede \ + && localedefdebug -c -i gez_ET -f UTF-8 gez_ET.utf8 \ + && localedefdebug -c -i gez_ET@abegede -f UTF-8 gez_ET.utf8@abegede \ + && localedefdebug -c -i gl_ES -f ISO-8859-1 gl_ES.iso88591 \ + && localedefdebug -c -i gl_ES@euro -f ISO-8859-15 gl_ES.iso885915@euro \ + && localedefdebug -c -i gl_ES -f UTF-8 gl_ES.utf8 \ + && localedefdebug -c -i gu_IN -f UTF-8 gu_IN.utf8 \ + && localedefdebug -c -i gv_GB -f ISO-8859-1 gv_GB.iso88591 \ + && localedefdebug -c -i gv_GB -f UTF-8 gv_GB.utf8 \ + && localedefdebug -c -i ha_NG -f UTF-8 ha_NG.utf8 \ + && localedefdebug -c -i he_IL -f ISO-8859-8 he_IL.iso88598 \ + && localedefdebug -c -i he_IL -f UTF-8 he_IL.utf8 \ + && localedefdebug -c -i hi_IN -f UTF-8 hi_IN.utf8 \ + && localedefdebug -c -i hne_IN -f UTF-8 hne_IN.utf8 \ + && localedefdebug -c -i hr_HR -f ISO-8859-2 hr_HR.iso88592 \ + && localedefdebug -c -i hr_HR -f UTF-8 hr_HR.utf8 \ + && localedefdebug -c -i hsb_DE -f ISO-8859-2 hsb_DE.iso88592 \ + && localedefdebug -c -i hsb_DE -f UTF-8 hsb_DE.utf8 \ + && localedefdebug -c -i ht_HT -f UTF-8 ht_HT.utf8 \ + && localedefdebug -c -i hu_HU -f ISO-8859-2 hu_HU.iso88592 \ + && localedefdebug -c -i hu_HU -f UTF-8 hu_HU.utf8 \ + && localedefdebug -c -i hy_AM -f ARMSCII-8 hy_AM.armscii8 \ + && localedefdebug -c -i hy_AM -f UTF-8 hy_AM.utf8 \ + && localedefdebug -c -i id_ID -f ISO-8859-1 id_ID.iso88591 \ + && localedefdebug -c -i id_ID -f UTF-8 id_ID.utf8 \ + && localedefdebug -c -i ig_NG -f UTF-8 ig_NG.utf8 \ + && localedefdebug -c -i ik_CA -f UTF-8 ik_CA.utf8 \ + && localedefdebug -c -i is_IS -f ISO-8859-1 is_IS.iso88591 \ + && localedefdebug -c -i is_IS -f UTF-8 is_IS.utf8 \ + && localedefdebug -c -i it_CH -f ISO-8859-1 it_CH.iso88591 \ + && localedefdebug -c -i it_CH -f UTF-8 it_CH.utf8 \ + && localedefdebug -c -i it_IT -f ISO-8859-1 it_IT.iso88591 \ + && localedefdebug -c -i it_IT@euro -f ISO-8859-15 it_IT.iso885915@euro \ + && localedefdebug -c -i it_IT -f UTF-8 it_IT.utf8 \ + && localedefdebug -c -i iu_CA -f UTF-8 iu_CA.utf8 \ + && localedefdebug -c -i iw_IL -f ISO-8859-8 iw_IL.iso88598 \ + && localedefdebug -c -i iw_IL -f UTF-8 iw_IL.utf8 \ + && localedefdebug -c -i ja_JP -f EUC-JP ja_JP.eucjp \ + && localedefdebug -c -i ja_JP -f UTF-8 ja_JP.utf8 \ + && localedefdebug -c -i ka_GE -f GEORGIAN-PS ka_GE.georgianps \ + && localedefdebug -c -i ka_GE -f UTF-8 ka_GE.utf8 \ + && localedefdebug -c -i kk_KZ -f PT154 kk_KZ.pt154 \ + && localedefdebug -c -i kk_KZ -f RK1048 kk_KZ.rk1048 \ + && localedefdebug -c -i kk_KZ -f UTF-8 kk_KZ.utf8 \ + && localedefdebug -c -i kl_GL -f ISO-8859-1 kl_GL.iso88591 \ + && localedefdebug -c -i kl_GL -f UTF-8 kl_GL.utf8 \ + && localedefdebug -c -i km_KH -f UTF-8 km_KH.utf8 \ + && localedefdebug -c -i kn_IN -f UTF-8 kn_IN.utf8 \ + && localedefdebug -c -i kok_IN -f UTF-8 kok_IN.utf8 \ + && localedefdebug -c -i ko_KR -f EUC-KR ko_KR.euckr \ + && localedefdebug -c -i ko_KR -f UTF-8 ko_KR.utf8 \ + && localedefdebug -c -i ks_IN -f UTF-8 ks_IN.utf8 \ + && localedefdebug -c -i ks_IN@devanagari -f UTF-8 ks_IN.utf8@devanagari \ + && localedefdebug -c -i ku_TR -f ISO-8859-9 ku_TR.iso88599 \ + && localedefdebug -c -i ku_TR -f UTF-8 ku_TR.utf8 \ + && localedefdebug -c -i kw_GB -f ISO-8859-1 kw_GB.iso88591 \ + && localedefdebug -c -i kw_GB -f UTF-8 kw_GB.utf8 \ + && localedefdebug -c -i ky_KG -f UTF-8 ky_KG.utf8 \ + && localedefdebug -c -i lb_LU -f UTF-8 lb_LU.utf8 \ + && localedefdebug -c -i lg_UG -f ISO-8859-10 lg_UG.iso885910 \ + && localedefdebug -c -i lg_UG -f UTF-8 lg_UG.utf8 \ + && localedefdebug -c -i li_BE -f UTF-8 li_BE.utf8 \ + && localedefdebug -c -i lij_IT -f UTF-8 lij_IT.utf8 \ + && localedefdebug -c -i li_NL -f UTF-8 li_NL.utf8 \ + && localedefdebug -c -i lo_LA -f UTF-8 lo_LA.utf8 \ + && localedefdebug -c -i lt_LT -f ISO-8859-13 lt_LT.iso885913 \ + && localedefdebug -c -i lt_LT -f UTF-8 lt_LT.utf8 \ + && localedefdebug -c -i lv_LV -f ISO-8859-13 lv_LV.iso885913 \ + && localedefdebug -c -i lv_LV -f UTF-8 lv_LV.utf8 \ + && localedefdebug -c -i mai_IN -f UTF-8 mai_IN.utf8 \ + && localedefdebug -c -i mg_MG -f ISO-8859-15 mg_MG.iso885915 \ + && localedefdebug -c -i mg_MG -f UTF-8 mg_MG.utf8 \ + && localedefdebug -c -i mhr_RU -f UTF-8 mhr_RU.utf8 \ + && localedefdebug -c -i mi_NZ -f ISO-8859-13 mi_NZ.iso885913 \ + && localedefdebug -c -i mi_NZ -f UTF-8 mi_NZ.utf8 \ + && localedefdebug -c -i mk_MK -f ISO-8859-5 mk_MK.iso88595 \ + && localedefdebug -c -i mk_MK -f UTF-8 mk_MK.utf8 \ + && localedefdebug -c -i ml_IN -f UTF-8 ml_IN.utf8 \ + && localedefdebug -c -i mn_MN -f UTF-8 mn_MN.utf8 \ + && localedefdebug -c -i mr_IN -f UTF-8 mr_IN.utf8 \ + && localedefdebug -c -i ms_MY -f ISO-8859-1 ms_MY.iso88591 \ + && localedefdebug -c -i ms_MY -f UTF-8 ms_MY.utf8 \ + && localedefdebug -c -i mt_MT -f ISO-8859-3 mt_MT.iso88593 \ + && localedefdebug -c -i mt_MT -f UTF-8 mt_MT.utf8 \ + && localedefdebug -c -i my_MM -f UTF-8 my_MM.utf8 \ + && localedefdebug -c -i nan_TW@latin -f UTF-8 nan_TW.utf8@latin \ + && localedefdebug -c -i nb_NO -f ISO-8859-1 nb_NO.iso88591 \ + && localedefdebug -c -i nb_NO -f UTF-8 nb_NO.utf8 \ + && localedefdebug -c -i nds_DE -f UTF-8 nds_DE.utf8 \ + && localedefdebug -c -i nds_NL -f UTF-8 nds_NL.utf8 \ + && localedefdebug -c -i ne_NP -f UTF-8 ne_NP.utf8 \ + && localedefdebug -c -i nl_AW -f UTF-8 nl_AW.utf8 \ + && localedefdebug -c -i nl_BE -f ISO-8859-1 nl_BE.iso88591 \ + && localedefdebug -c -i nl_BE@euro -f ISO-8859-15 nl_BE.iso885915@euro \ + && localedefdebug -c -i nl_BE -f UTF-8 nl_BE.utf8 \ + && localedefdebug -c -i nl_NL -f ISO-8859-1 nl_NL.iso88591 \ + && localedefdebug -c -i nl_NL@euro -f ISO-8859-15 nl_NL.iso885915@euro \ + && localedefdebug -c -i nl_NL -f UTF-8 nl_NL.utf8 \ + && localedefdebug -c -i nn_NO -f ISO-8859-1 nn_NO.iso88591 \ + && localedefdebug -c -i nn_NO -f UTF-8 nn_NO.utf8 \ + && localedefdebug -c -i nr_ZA -f UTF-8 nr_ZA.utf8 \ + && localedefdebug -c -i nso_ZA -f UTF-8 nso_ZA.utf8 \ + && localedefdebug -c -i oc_FR -f ISO-8859-1 oc_FR.iso88591 \ + && localedefdebug -c -i oc_FR -f UTF-8 oc_FR.utf8 \ + && localedefdebug -c -i om_ET -f UTF-8 om_ET.utf8 \ + && localedefdebug -c -i om_KE -f ISO-8859-1 om_KE.iso88591 \ + && localedefdebug -c -i om_KE -f UTF-8 om_KE.utf8 \ + && localedefdebug -c -i or_IN -f UTF-8 or_IN.utf8 \ + && localedefdebug -c -i os_RU -f UTF-8 os_RU.utf8 \ + && localedefdebug -c -i pa_IN -f UTF-8 pa_IN.utf8 \ + && localedefdebug -c -i pap_AN -f UTF-8 pap_AN.utf8 \ + && localedefdebug -c -i pa_PK -f UTF-8 pa_PK.utf8 \ + && localedefdebug -c -i pl_PL -f ISO-8859-2 pl_PL.iso88592 \ + && localedefdebug -c -i pl_PL -f UTF-8 pl_PL.utf8 \ + && localedefdebug -c -i ps_AF -f UTF-8 ps_AF.utf8 \ + && localedefdebug -c -i pt_BR -f ISO-8859-1 pt_BR.iso88591 \ + && localedefdebug -c -i pt_BR -f UTF-8 pt_BR.utf8 \ + && localedefdebug -c -i pt_PT -f ISO-8859-1 pt_PT.iso88591 \ + && localedefdebug -c -i pt_PT@euro -f ISO-8859-15 pt_PT.iso885915@euro \ + && localedefdebug -c -i pt_PT -f UTF-8 pt_PT.utf8 \ + && localedefdebug -c -i ro_RO -f ISO-8859-2 ro_RO.iso88592 \ + && localedefdebug -c -i ro_RO -f UTF-8 ro_RO.utf8 \ + && localedefdebug -c -i ru_RU -f CP1251 ru_RU.cp1251 \ + && localedefdebug -c -i ru_RU -f ISO-8859-5 ru_RU.iso88595 \ + && localedefdebug -c -i ru_RU -f KOI8-R ru_RU.koi8r \ + && localedefdebug -c -i ru_RU -f UTF-8 ru_RU.utf8 \ + && localedefdebug -c -i ru_UA -f KOI8-U ru_UA.koi8u \ + && localedefdebug -c -i ru_UA -f UTF-8 ru_UA.utf8 \ + && localedefdebug -c -i rw_RW -f UTF-8 rw_RW.utf8 \ + && localedefdebug -c -i sa_IN -f UTF-8 sa_IN.utf8 \ + && localedefdebug -c -i sc_IT -f UTF-8 sc_IT.utf8 \ + && localedefdebug -c -i sd_IN -f UTF-8 sd_IN.utf8 \ + && localedefdebug -c -i sd_IN@devanagari -f UTF-8 sd_IN.utf8@devanagari \ + && localedefdebug -c -i se_NO -f UTF-8 se_NO.utf8 \ + && localedefdebug -c -i shs_CA -f UTF-8 shs_CA.utf8 \ + && localedefdebug -c -i sid_ET -f UTF-8 sid_ET.utf8 \ + && localedefdebug -c -i si_LK -f UTF-8 si_LK.utf8 \ + && localedefdebug -c -i sk_SK -f ISO-8859-2 sk_SK.iso88592 \ + && localedefdebug -c -i sk_SK -f UTF-8 sk_SK.utf8 \ + && localedefdebug -c -i sl_SI -f ISO-8859-2 sl_SI.iso88592 \ + && localedefdebug -c -i sl_SI -f UTF-8 sl_SI.utf8 \ + && localedefdebug -c -i so_DJ -f ISO-8859-1 so_DJ.iso88591 \ + && localedefdebug -c -i so_DJ -f UTF-8 so_DJ.utf8 \ + && localedefdebug -c -i so_ET -f UTF-8 so_ET.utf8 \ + && localedefdebug -c -i so_KE -f ISO-8859-1 so_KE.iso88591 \ + && localedefdebug -c -i so_KE -f UTF-8 so_KE.utf8 \ + && localedefdebug -c -i so_SO -f ISO-8859-1 so_SO.iso88591 \ + && localedefdebug -c -i so_SO -f UTF-8 so_SO.utf8 \ + && localedefdebug -c -i sq_AL -f ISO-8859-1 sq_AL.iso88591 \ + && localedefdebug -c -i sq_AL -f UTF-8 sq_AL.utf8 \ + && localedefdebug -c -i sq_MK -f UTF-8 sq_MK.utf8 \ + && localedefdebug -c -i sr_ME -f UTF-8 sr_ME.utf8 \ + && localedefdebug -c -i sr_RS -f UTF-8 sr_RS.utf8 \ + && localedefdebug -c -i sr_RS@latin -f UTF-8 sr_RS.utf8@latin \ + && localedefdebug -c -i ss_ZA -f UTF-8 ss_ZA.utf8 \ + && localedefdebug -c -i st_ZA -f ISO-8859-1 st_ZA.iso88591 \ + && localedefdebug -c -i st_ZA -f UTF-8 st_ZA.utf8 \ + && localedefdebug -c -i sv_FI -f ISO-8859-1 sv_FI.iso88591 \ + && localedefdebug -c -i sv_FI@euro -f ISO-8859-15 sv_FI.iso885915@euro \ + && localedefdebug -c -i sv_FI -f UTF-8 sv_FI.utf8 \ + && localedefdebug -c -i sv_SE -f ISO-8859-1 sv_SE.iso88591 \ + && localedefdebug -c -i sv_SE -f ISO-8859-15 sv_SE.iso885915 \ + && localedefdebug -c -i sv_SE -f UTF-8 sv_SE.utf8 \ + && localedefdebug -c -i sw_KE -f UTF-8 sw_KE.utf8 \ + && localedefdebug -c -i sw_TZ -f UTF-8 sw_TZ.utf8 \ + && localedefdebug -c -i ta_IN -f UTF-8 ta_IN.utf8 \ + && localedefdebug -c -i ta_LK -f UTF-8 ta_LK.utf8 \ + && localedefdebug -c -i te_IN -f UTF-8 te_IN.utf8 \ + && localedefdebug -c -i tg_TJ -f KOI8-T tg_TJ.koi8t \ + && localedefdebug -c -i tg_TJ -f UTF-8 tg_TJ.utf8 \ + && localedefdebug -c -i th_TH -f TIS-620 th_TH.tis620 \ + && localedefdebug -c -i th_TH -f UTF-8 th_TH.utf8 \ + && localedefdebug -c -i ti_ER -f UTF-8 ti_ER.utf8 \ + && localedefdebug -c -i ti_ET -f UTF-8 ti_ET.utf8 \ + && localedefdebug -c -i tig_ER -f UTF-8 tig_ER.utf8 \ + && localedefdebug -c -i tk_TM -f UTF-8 tk_TM.utf8 \ + && localedefdebug -c -i tl_PH -f ISO-8859-1 tl_PH.iso88591 \ + && localedefdebug -c -i tl_PH -f UTF-8 tl_PH.utf8 \ + && localedefdebug -c -i tn_ZA -f UTF-8 tn_ZA.utf8 \ + && localedefdebug -c -i tr_CY -f ISO-8859-9 tr_CY.iso88599 \ + && localedefdebug -c -i tr_CY -f UTF-8 tr_CY.utf8 \ + && localedefdebug -c -i tr_TR -f ISO-8859-9 tr_TR.iso88599 \ + && localedefdebug -c -i tr_TR -f UTF-8 tr_TR.utf8 \ + && localedefdebug -c -i ts_ZA -f UTF-8 ts_ZA.utf8 \ + && localedefdebug -c -i tt_RU -f UTF-8 tt_RU.utf8 \ + && localedefdebug -c -i tt_RU@iqtelif -f UTF-8 tt_RU.utf8@iqtelif \ + && localedefdebug -c -i ug_CN -f UTF-8 ug_CN.utf8 \ + && localedefdebug -c -i uk_UA -f KOI8-U uk_UA.koi8u \ + && localedefdebug -c -i uk_UA -f UTF-8 uk_UA.utf8 \ + && localedefdebug -c -i unm_US -f UTF-8 unm_US.utf8 \ + && localedefdebug -c -i ur_IN -f UTF-8 ur_IN.utf8 \ + && localedefdebug -c -i ur_PK -f UTF-8 ur_PK.utf8 \ + && localedefdebug -c -i uz_UZ -f ISO-8859-1 uz_UZ.iso88591 \ + && localedefdebug -c -i uz_UZ -f UTF-8 uz_UZ.utf8 \ + && localedefdebug -c -i uz_UZ@cyrillic -f UTF-8 uz_UZ.utf8@cyrillic \ + && localedefdebug -c -i ve_ZA -f UTF-8 ve_ZA.utf8 \ + && localedefdebug -c -i vi_VN -f TCVN5712-1 vi_VN.tcvn \ + && localedefdebug -c -i vi_VN -f UTF-8 vi_VN.utf8 \ + && localedefdebug -c -i wa_BE -f ISO-8859-1 wa_BE.iso88591 \ + && localedefdebug -c -i wa_BE@euro -f ISO-8859-15 wa_BE.iso885915@euro \ + && localedefdebug -c -i wa_BE -f UTF-8 wa_BE.utf8 \ + && localedefdebug -c -i wae_CH -f UTF-8 wae_CH.utf8 \ + && localedefdebug -c -i wal_ET -f UTF-8 wal_ET.utf8 \ + && localedefdebug -c -i wo_SN -f UTF-8 wo_SN.utf8 \ + && localedefdebug -c -i xh_ZA -f ISO-8859-1 xh_ZA.iso88591 \ + && localedefdebug -c -i xh_ZA -f UTF-8 xh_ZA.utf8 \ + && localedefdebug -c -i yi_US -f CP1255 yi_US.cp1255 \ + && localedefdebug -c -i yi_US -f UTF-8 yi_US.utf8 \ + && localedefdebug -c -i yo_NG -f UTF-8 yo_NG.utf8 \ + && localedefdebug -c -i yue_HK -f UTF-8 yue_HK.utf8 \ + && localedefdebug -c -i zh_CN -f GB18030 zh_CN.gb18030 \ + && localedefdebug -c -i zh_CN -f GB2312 zh_CN.gb2312 \ + && localedefdebug -c -i zh_CN -f GBK zh_CN.gbk \ + && localedefdebug -c -i zh_CN -f UTF-8 zh_CN.utf8 \ + && localedefdebug -c -i zh_HK -f UTF-8 zh_HK.utf8 \ + && localedefdebug -c -i zh_SG -f GB2312 zh_SG.gb2312 \ + && localedefdebug -c -i zh_SG -f GBK zh_SG.gbk \ + && localedefdebug -c -i zh_SG -f UTF-8 zh_SG.utf8 \ + && localedefdebug -c -i zh_TW -f BIG5 zh_TW.big5 \ + && localedefdebug -c -i zh_TW -f EUC-TW zh_TW.euctw \ + && localedefdebug -c -i zh_TW -f UTF-8 zh_TW.utf8 \ + && localedefdebug -c -i zu_ZA -f ISO-8859-1 zu_ZA.iso88591 \ + && localedefdebug -c -i zu_ZA -f UTF-8 zu_ZA.utf8 \ + && /bin/true +fi diff --git a/docker/base-layout/latest/conf/usr/local/bin/go-replace b/docker/base-layout/latest/conf/usr/local/bin/go-replace new file mode 100755 index 000000000..de5b26a98 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/go-replace @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +ARCH=$(dpkg --print-architecture | awk -F- '{ print $NF }') +VERSION="1.1.2" + +case "$ARCH" in \ + amd64) GR_ARCH='64';; \ + arm64) GR_ARCH='arm64';; \ + *) echo "unsupported architecture"; exit 1 ;; \ +esac + +downloadGoReplace() { + echo "downloading go-replace-$GR_ARCH" + wget -O "/usr/local/bin/go-replace-$ARCH" "https://github.com/webdevops/goreplace/releases/download/$VERSION/gr-$GR_ARCH-linux" + chmod +x "/usr/local/bin/go-replace-$ARCH" +} + +if [ ! -x "/usr/local/bin/go-replace-$ARCH" ]; then + downloadGoReplace +fi + +exec "/usr/local/bin/go-replace-$ARCH" $@ diff --git a/docker/base-layout/latest/conf/usr/local/bin/yum-install b/docker/base-layout/latest/conf/usr/local/bin/yum-install new file mode 100755 index 000000000..95a27aec9 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/yum-install @@ -0,0 +1,12 @@ +#!/bin/bash + +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 + +# Install packages +yum -y install $* + +# Clear files (reduce snapshot size) +yum clean all diff --git a/docker/base-layout/latest/conf/usr/local/bin/yum-upgrade b/docker/base-layout/latest/conf/usr/local/bin/yum-upgrade new file mode 100755 index 000000000..5f697f47e --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/yum-upgrade @@ -0,0 +1,12 @@ +#!/bin/bash + +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 + +# Install packages +yum upgrade -y + +# Clear files (reduce snapshot size) +yum clean all diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 9f4a8a342..5dc930cbf 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM alpine:3.11 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 4a511e4c3..c2adb1cd4 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM centos:7 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="en_US.utf8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 3b787fff6..1af66b150 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM debian:buster @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 6a22ce901..fde132c1c 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM debian:7 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 53636a27d..62c98e94e 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM debian:8 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 5c54d1077..9b0ba55d3 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM debian:stretch @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 0556d0592..b0a00c62f 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:12.04 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 2f0fe2dc0..c7fb0f34a 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:14.04 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index d81468384..43e3d1e28 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:15.04 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 2b0a03584..e1b680a50 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:15.10 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index b8177955c..6f8d4222c 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:16.04 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 8484b648f..6a402afc1 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:16.10 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 12ddaa629..1cf4e2b13 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:17.04 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index ada7ee785..015f15dfe 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:17.10 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 60ce94521..ad842b899 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM ubuntu:18.04 @@ -43,9 +39,8 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/go-replace-test/Dockerfile b/docker/go-replace-test/Dockerfile new file mode 100644 index 000000000..b03dc65e2 --- /dev/null +++ b/docker/go-replace-test/Dockerfile @@ -0,0 +1,7 @@ +FROM --platform=$BUILDPLATFORM tux:5000/cocoastorm/webdevops/toolbox:alpine AS base + +FROM alpine +ARG TARGETARCH +COPY --from=base /baselayout / +RUN apk add --no-cache dpkg; \ + go-replace --version && echo "$TARGETARCH" diff --git a/docker/go-replace-test/build.sh b/docker/go-replace-test/build.sh new file mode 100644 index 000000000..a98abde6b --- /dev/null +++ b/docker/go-replace-test/build.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -ex + +docker buildx build -t tux:5000/cocoastorm/webdevops/base-layout:latest ./docker/base-layout/latest --push + +docker buildx build --platform=linux/arm64,linux/amd64 -t tux:5000/cocoastorm/webdevops/toolbox:alpine ./docker/toolbox/alpine --push + +docker buildx build --progress plain --platform=linux/arm64,linux/amd64 -t tux:5000/cocoastorm/webdevops/go-replace-test ./docker/go-replace-test --push diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 7d9ec2197..3e60d083d 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:5.6-fpm-stretch @@ -53,9 +49,8 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index b633ec4d6..36634aa40 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.0-fpm-stretch @@ -53,9 +49,8 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 2dcf48a0d..b71891b43 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.1-fpm-alpine @@ -54,9 +50,8 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index aa2739a4f..e61adbb60 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.1-fpm-buster @@ -53,9 +49,8 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 8bf91b319..a65052674 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.2-fpm-alpine @@ -54,9 +50,8 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 8a076e3ed..f6615bc08 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.2-fpm-buster @@ -53,9 +49,8 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index eae103bca..891a89e72 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.3-fpm-alpine @@ -54,9 +50,8 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index accefc0d4..2148c3da4 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.3-fpm-buster @@ -53,9 +49,8 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index c8ae537bd..94e04b8ef 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.4-fpm-alpine @@ -54,9 +50,8 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 6bf906d27..6afc64af8 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:7.4-fpm-buster @@ -53,9 +49,8 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 274389572..d95c0e038 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:8.0-fpm-alpine @@ -54,9 +50,8 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 124aa71c8..b9bc79561 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM php:8.0-fpm-buster @@ -53,9 +49,8 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 306714e3c..841ee649d 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM zendesk/samson:latest @@ -50,9 +46,8 @@ ENV APPLICATION_USER=application \ ############################################################################### -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN set -x \ # Init bootstrap diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/alpine/Dockerfile similarity index 58% rename from docker/toolbox/latest/Dockerfile rename to docker/toolbox/alpine/Dockerfile index b15f9fb2d..8dc8b1fc2 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/toolbox:latest +# Dockerfile for webdevops/toolbox:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ @@ -7,7 +7,10 @@ FROM --platform=$BUILDPLATFORM alpine:latest ARG TARGETARCH -RUN apk add --no-cache \ +COPY --from=ghcr.io/cocoastorm/webdevops/base-layout:latest /baselayout /baselayout + +RUN set -eux; \ + apk add --no-cache \ ca-certificates \ dpkg \ openssl \ @@ -25,7 +28,4 @@ RUN apk add --no-cache \ rsync \ git \ gnupg \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/usr/local/bin/go-replace" + ; \ diff --git a/docker/toolbox/latest/Dockerfile.jinja2 b/docker/toolbox/alpine/Dockerfile.jinja2 similarity index 71% rename from docker/toolbox/latest/Dockerfile.jinja2 rename to docker/toolbox/alpine/Dockerfile.jinja2 index 61594aacb..9ed8942a6 100644 --- a/docker/toolbox/latest/Dockerfile.jinja2 +++ b/docker/toolbox/alpine/Dockerfile.jinja2 @@ -2,7 +2,10 @@ {{ docker.platformArgs() }} -RUN apk add --no-cache \ +{{ docker.copy("/baselayout", "/baselayout", docker.image("base-layout", user=user)) }} + +RUN set -eux; \ + apk add --no-cache \ ca-certificates \ dpkg \ openssl \ @@ -20,4 +23,4 @@ RUN apk add --no-cache \ rsync \ git \ gnupg \ - {{ tools.goreplace() }} + ; \ diff --git a/docker/toolbox/buster/Dockerfile b/docker/toolbox/buster/Dockerfile new file mode 100644 index 000000000..79e62ce17 --- /dev/null +++ b/docker/toolbox/buster/Dockerfile @@ -0,0 +1,32 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/toolbox:buster +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM --platform=$BUILDPLATFORM debian:buster-slim + +ARG TARGETARCH + +COPY --from=ghcr.io/cocoastorm/webdevops/base-layout:latest /baselayout /baselayout + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + dpkg \ + openssl \ + curl \ + sed \ + wget \ + zip \ + unzip \ + bzip2 \ + p7zip \ + ldnsutils \ + libldns2 \ + openssh-client \ + rsync \ + git \ + gnupg \ + ; \ + rm -rf /var/lib/apt/lists/* diff --git a/docker/toolbox/buster/Dockerfile.jinja2 b/docker/toolbox/buster/Dockerfile.jinja2 new file mode 100644 index 000000000..efb319a8a --- /dev/null +++ b/docker/toolbox/buster/Dockerfile.jinja2 @@ -0,0 +1,27 @@ +{{ docker.fromOfficial("debian", "buster-slim") }} + +{{ docker.platformArgs() }} + +{{ docker.copy("/baselayout", "/baselayout", docker.image("base-layout", user=user)) }} + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + dpkg \ + openssl \ + curl \ + sed \ + wget \ + zip \ + unzip \ + bzip2 \ + p7zip \ + ldnsutils \ + libldns2 \ + openssh-client \ + rsync \ + git \ + gnupg \ + ; \ + rm -rf /var/lib/apt/lists/* diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index fe7354537..2466cbf78 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 @@ -47,9 +43,8 @@ USER root COPY ./solr/ /tmp/solr -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && rm -rf /opt/solr/server \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index f176b7138..871532bb9 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 @@ -47,9 +43,8 @@ USER root COPY ./solr/ /tmp/solr -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / WORKDIR / diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index fc68afbf5..d7ddfc29b 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM solr:6.3.0 @@ -45,9 +41,8 @@ ENV TERM="xterm" \ USER root -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 1b1be2802..2b732b1fa 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM solr:6.3.0 @@ -45,9 +41,8 @@ ENV TERM="xterm" \ USER root -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 0bb26ea12..da79fc064 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM solr:6.6.2 @@ -45,9 +41,8 @@ ENV TERM="xterm" \ USER root -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 9c9598917..96a6e5f4b 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM solr:6.3.0 @@ -45,9 +41,8 @@ ENV TERM="xterm" \ USER root -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 96ff4913d..4f3e0b813 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM solr:6.6.2 @@ -45,9 +41,8 @@ ENV TERM="xterm" \ USER root -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 8926a36d7..261892c46 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM solr:6.6.2 @@ -45,9 +41,8 @@ ENV TERM="xterm" \ USER root -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 5f899347e..c1b451ed1 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -5,29 +5,25 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS baselayout +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base ARG TARGETARCH -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - # Install gosu - && wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \ - && wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "/baselayout/sbin/gosu" - +RUN set -eux \ + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; FROM --platform=$BUILDPLATFORM solr:6.6.3 @@ -45,9 +41,8 @@ ENV TERM="xterm" \ USER root -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / - +# base copy (from staged image) +COPY --from=base /baselayout / RUN apt-update \ && apt-install net-tools \ diff --git a/provisioning/base-layout/general/usr/local/bin/apk-install b/provisioning/base-layout/general/usr/local/bin/apk-install new file mode 100755 index 000000000..079d06782 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/apk-install @@ -0,0 +1,11 @@ +#!/bin/sh + +set -o pipefail # trace ERR through pipes +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 + +# Install packages +apk add --no-cache --upgrade $* + +# Clear files (reduce snapshot size) +rm -rf /var/cache/apk/* diff --git a/provisioning/base-layout/general/usr/local/bin/apk-upgrade b/provisioning/base-layout/general/usr/local/bin/apk-upgrade new file mode 100755 index 000000000..f4b4ff3c9 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/apk-upgrade @@ -0,0 +1,11 @@ +#!/bin/sh + +set -o pipefail # trace ERR through pipes +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 + +# Install packages +apk upgrade --no-cache --force + +# Clear files (reduce snapshot size) +rm -rf /var/cache/apk/* diff --git a/provisioning/base-layout/general/usr/local/bin/apt-add-repository b/provisioning/base-layout/general/usr/local/bin/apt-add-repository new file mode 100755 index 000000000..5e6ba6d2f --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/apt-add-repository @@ -0,0 +1,8 @@ +#!/bin/sh + +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 + +apt-install software-properties-common +add-apt-repository $@ +apt-get purge -y -f software-properties-common diff --git a/provisioning/base-layout/general/usr/local/bin/apt-install b/provisioning/base-layout/general/usr/local/bin/apt-install new file mode 100755 index 000000000..31edff098 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/apt-install @@ -0,0 +1,24 @@ +#!/bin/bash + +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 + +export DEBIAN_FRONTEND=noninteractive + +if [[ -f "/tmp/.apt-update" ]]; then + echo "Detected prefetched 'apt-get update'" + # Install packages + RUNLEVEL=1 apt-get install -y -f --no-install-recommends $* +else + # Update apt cache + apt-get update + + # Install packages + RUNLEVEL=1 apt-get install -y -f --no-install-recommends $* + + # Clear files (reduce snapshot size) + rm -rf /var/lib/apt/lists/* + apt-get clean -y +fi diff --git a/provisioning/base-layout/general/usr/local/bin/apt-update b/provisioning/base-layout/general/usr/local/bin/apt-update new file mode 100755 index 000000000..d3019cc0c --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/apt-update @@ -0,0 +1,9 @@ +#!/bin/bash + +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 + +apt-get update +touch /tmp/.apt-update diff --git a/provisioning/base-layout/general/usr/local/bin/apt-upgrade b/provisioning/base-layout/general/usr/local/bin/apt-upgrade new file mode 100755 index 000000000..31ab612b8 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/apt-upgrade @@ -0,0 +1,24 @@ +#!/bin/bash + +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 + +export DEBIAN_FRONTEND=noninteractive + +if [[ -f "/tmp/.apt-update" ]]; then + echo "Detected prefetched 'apt-get update'" + # Update packages + RUNLEVEL=1 apt-get dist-upgrade -y -f +else + # Update apt cache + apt-get update + + # Update packages + RUNLEVEL=1 apt-get dist-upgrade -y -f + + # Clear files (reduce snapshot size) + rm -rf /var/lib/apt/lists/* + apt-get clean -y +fi diff --git a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup new file mode 100755 index 000000000..e63d1b3c4 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup @@ -0,0 +1,36 @@ +#!/bin/sh + +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 + +LSB_FAMILY=$(docker-image-info family) + +case "$LSB_FAMILY" in + Debian) + rm -f /tmp/.apt-update + apt-get autoremove -y -f + apt-get clean -y + rm -rf /var/lib/apt/lists/* + ;; + + RedHat) + yum autoremove --assumeyes + yum clean all + ;; + + Alpine) + find /var/lib/apk/ -mindepth 1 -delete + ;; + + Arch) + pacman -Sc + ;; + + *) + echo "ERROR: Distribution $LSB_FAMILY not supported" + exit 1 + ;; +esac + +find /tmp/ /var/log/ -mindepth 1 -delete +rm -rf /root/.cache diff --git a/provisioning/base-layout/general/usr/local/bin/docker-image-info b/provisioning/base-layout/general/usr/local/bin/docker-image-info new file mode 100755 index 000000000..fb9248fc2 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/docker-image-info @@ -0,0 +1,87 @@ +#!/bin/sh + +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 + +help() { + if [ -n "$1" ]; then + echo "$1" + echo "" + fi + + echo "Usage: $0 " + echo "" + echo " Application arguments:" + echo " family Get distribution family" + echo " dist Get distribution name" + echo " dist-version Get distribution version" + echo " dist-release Get distribution release" + echo " dist-codename Get distribution codename" + echo " lsb Get lsb informations (if available)" + echo " lsb-desc Get lsb description (if available)" + echo " buildtime Get buildtime of docker image" + echo "" + + exit $2 + +} + +if [ "$#" -ne 1 ]; then + help "[ERROR] Invalid argument" 1 +fi + +INFO_FILE="" + +case "$1" in + dist-family|distribution-family|family) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution_family + ;; + + dist|distribution) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution + ;; + + dist-version|distribution-version) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution_version + ;; + + dist-release|distribution-release) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_release + ;; + + dist-codename|distribution-codename) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_codename + ;; + + lsb) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb + ;; + + lsb-desc|lsb-description) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_description + ;; + + buildtime) + INFO_FILE=/opt/docker/etc/.registry/image_info_buildtime + ;; + + help) + help "" 0 + ;; + + *) + help "[ERROR] Invalid argument" 1 + ;; +esac + +if [ -n "$INFO_FILE" ]; then + if [ -f "$INFO_FILE" ]; then + cat -- "$INFO_FILE" + else + echo "[ERROR] Infomation file $INFO_FILE not found!" + echo " Please run generate-dockerimage-info on docker image creation!" + exit 2 + fi +else + help "" 1 +fi diff --git a/provisioning/base-layout/general/usr/local/bin/docker-run-bootstrap b/provisioning/base-layout/general/usr/local/bin/docker-run-bootstrap new file mode 100755 index 000000000..b22f41b7f --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/docker-run-bootstrap @@ -0,0 +1,51 @@ +#!/bin/sh + +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 + +## execute with bash if possible +if [ ! -n "${BASH+x}" ]; then + if [ -f /bin/bash ]; then + exec /bin/bash "$0" "$@" + fi +fi + +# Make all scripts executable +if [ -d /opt/docker/bin/ ]; then + find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +fi + +# Enable usr-bin executables +if [ -d /opt/docker/bin/usr-bin ]; then + find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" + done +fi + + +globexists() { + test -e "$1" -o -L "$1" +} + +execScriptsInPath() { + SCRIPT_DIRECTORY="$1" + if [ -d "$SCRIPT_DIRECTORY" ]; then + if globexists "${SCRIPT_DIRECTORY}/"*.sh; then + echo ":: Running scripts in ${SCRIPT_DIRECTORY}" + for FILE in "${SCRIPT_DIRECTORY}/"*.sh; do + echo "-> Executing ${FILE}" + + # run custom scripts, only once + . "$FILE" + rm -f -- "$FILE" + done + fi + fi +} + +# Bootstrap +execScriptsInPath "/opt/docker/provision/bootstrap.d" +execScriptsInPath "/opt/docker/provision/build.d" +execScriptsInPath "/bootstrap.d" +execScriptsInPath "/build.d" diff --git a/provisioning/base-layout/general/usr/local/bin/generate-dockerimage-info b/provisioning/base-layout/general/usr/local/bin/generate-dockerimage-info new file mode 100755 index 000000000..25417e0a4 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/generate-dockerimage-info @@ -0,0 +1,96 @@ +#!/bin/sh + +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 + +LSB_FAMILY="" + +############################# +# Distribution detection +############################# + +if [ -x "/usr/bin/apt-get" ]; then + # Debian family + LSB_FAMILY="Debian" + +elif [ -x "/bin/yum" ]; then + # RedHat family + LSB_FAMILY="RedHat" + +elif [ -x "/sbin/apk" ]; then + # Alpine family + LSB_FAMILY="Alpine" + +elif [ -f "/etc/arch-release" ]; then + # Alpine family + LSB_FAMILY="Arch" + +else + # Unknown + echo "ERROR: Distribution detection failed" + exit 1 +fi + +############################# +# Install +############################# + +case "$LSB_FAMILY" in + Debian) + apt-install lsb-release + ;; + + RedHat) + yum-install redhat-lsb-core + ;; +esac + +############################# +# Set distribution information +############################# + +echo "Detected $LSB_FAMILY" + +mkdir -p /opt/docker/etc/.registry/ +echo "$LSB_FAMILY" > /opt/docker/etc/.registry/image_info_distribution_family +echo "$LSB_FAMILY" > /opt/docker/etc/.registry/image_info_distribution +date +%s >/opt/docker/etc/.registry/image_info_buildtime + +# Create all files +touch /opt/docker/etc/.registry/image_info_distribution_version +touch /opt/docker/etc/.registry/image_info_lsb +touch /opt/docker/etc/.registry/image_info_lsb_description +touch /opt/docker/etc/.registry/image_info_lsb_release +touch /opt/docker/etc/.registry/image_info_lsb_codename + +# Collect distribution specific informations +case "$LSB_FAMILY" in + Debian|RedHat) + lsb_release -i -s > /opt/docker/etc/.registry/image_info_distribution + lsb_release -r -s > /opt/docker/etc/.registry/image_info_distribution_version + lsb_release -a > /opt/docker/etc/.registry/image_info_lsb + lsb_release -d -s > /opt/docker/etc/.registry/image_info_lsb_description + lsb_release -r -s > /opt/docker/etc/.registry/image_info_lsb_release + lsb_release -c -s > /opt/docker/etc/.registry/image_info_lsb_codename + ;; + + Alpine) + cat /etc/alpine-release > /opt/docker/etc/.registry/image_info_distribution_version + ;; +esac + + +############################# +# Uninstall +############################# + +case "$LSB_FAMILY" in + Debian) + apt-get purge -y -f lsb-release + ;; + + RedHat) + yum erase --assumeyes redhat-lsb-core + yum autoremove --assumeyes + ;; +esac diff --git a/provisioning/base-layout/general/usr/local/bin/generate-locales b/provisioning/base-layout/general/usr/local/bin/generate-locales new file mode 100755 index 000000000..505bf0786 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/generate-locales @@ -0,0 +1,510 @@ +#!/bin/bash + +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 + +IMAGE_DISTRIBUTION_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info distribution) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info distribution-version) + +####################################### +## Debian +####################################### + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]]; then + /usr/local/bin/apt-install locales-all +fi + +####################################### +## Ubuntu +####################################### + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]]; then + if [[ "$(echo $IMAGE_DISTRIBUTION_VERSION| cut -f 1 -d .)" -ge "16" ]]; then + # Ubuntu 16.04 or later + /usr/local/bin/apt-install locales-all + else + # Ubuntu pre 16.04 versions + ln -s /usr/share/i18n/SUPPORTED /var/lib/locales/supported.d/all + locale-gen + fi +fi + +####################################### +## RedHat family +####################################### + +if [[ "$IMAGE_DISTRIBUTION_FAMILY" == "RedHat" ]]; then + + function localedefdebug() { + echo $* + localedef "$@" + } + + # Failing locales + ## && localedefdebug -c -i bo_CN -f UTF-8 bo_CN.utf8 \ + ## && localedefdebug -c -i bo_IN -f UTF-8 bo_IN.utf8 \ + ## && localedefdebug -c -i ca_ES -f ISO-8859-15@valencia ca_ES.iso885915@valencia \ + ## && localedefdebug -c -i ca_ES@valencia -f UTF-8 ca_ES.utf8@valencia \ + ## && localedefdebug -c -i ce_RU -f UTF-8 ce_RU.utf8 \ + ## && localedefdebug -c -i ckb_IQ -f UTF-8 ckb_IQ.utf8 \ + ## && localedefdebug -c -i de_LI -f UTF-8 de_LI.utf8 \ + ## && localedefdebug -c -i ug_CN@latin -f UTF-8 ug_CN.utf8@latin \ + ## && localedefdebug -c -i en_DK -f ISO-8859-1 en_DK.iso88591 \ + ## && localedefdebug -c -i en_DK -f ISO-8859-15 en_DK.iso885915 \ + ## && localedefdebug -c -i en_DK -f UTF-8 en_DK.utf8 \ + ## && localedefdebug -c -i eo -f ISO-8859-3 eo.iso88593 \ + ## && localedefdebug -c -i eo_US -f UTF-8 eo_US.utf8 \ + ## && localedefdebug -c -i eo -f UTF-8 eo.utf8 \ + ## && localedefdebug -c -i eu_FR -f ISO-8859-1 eu_FR.iso88591 \ + ## && localedefdebug -c -i eu_FR@euro -f ISO-8859-15 eu_FR.iso885915@euro \ + ## && localedefdebug -c -i eu_FR -f UTF-8 eu_FR.utf8 \ + ## && localedefdebug -c -i ia -f UTF-8 ia.utf8 \ + ## && localedefdebug -c -i ln_CD -f UTF-8 ln_CD.utf8 \ + ## && localedefdebug -c -i sd_PK -f UTF-8 sd_PK.utf8 \ + ## && localedefdebug -c -i zh_HK -f BIG5HKSCS zh_HK.big5hkscs \ + + # Generate localeslocale -a|grep '\.'| while read LOCALE; do LOCALE_LANG=$(echo $LOCALE|cut -d '.' -f 1); LOCALE_CHARSET=$(echo $LOCALE|cut -d '.' -f 2); echo "&& localedefdebug -c -i $LOCALE_LANG -f $LOCALE_CHARSET $LOCALE_LANG.$LOCALE_CHARSET ; \$(exit 0) \\"; done; + # -> + /bin/true \ + && localedefdebug -c -i aa_DJ -f ISO-8859-1 aa_DJ.iso88591 \ + && localedefdebug -c -i aa_DJ -f UTF-8 aa_DJ.utf8 \ + && localedefdebug -c -i aa_ER -f UTF-8 aa_ER.utf8 \ + && localedefdebug -c -i aa_ER@saaho -f UTF-8 aa_ER.utf8@saaho \ + && localedefdebug -c -i aa_ET -f UTF-8 aa_ET.utf8 \ + && localedefdebug -c -i af_ZA -f ISO-8859-1 af_ZA.iso88591 \ + && localedefdebug -c -i af_ZA -f UTF-8 af_ZA.utf8 \ + && localedefdebug -c -i am_ET -f UTF-8 am_ET.utf8 \ + && localedefdebug -c -i an_ES -f ISO-8859-15 an_ES.iso885915 \ + && localedefdebug -c -i an_ES -f UTF-8 an_ES.utf8 \ + && localedefdebug -c -i ar_AE -f ISO-8859-6 ar_AE.iso88596 \ + && localedefdebug -c -i ar_AE -f UTF-8 ar_AE.utf8 \ + && localedefdebug -c -i ar_BH -f ISO-8859-6 ar_BH.iso88596 \ + && localedefdebug -c -i ar_BH -f UTF-8 ar_BH.utf8 \ + && localedefdebug -c -i ar_DZ -f ISO-8859-6 ar_DZ.iso88596 \ + && localedefdebug -c -i ar_DZ -f UTF-8 ar_DZ.utf8 \ + && localedefdebug -c -i ar_EG -f ISO-8859-6 ar_EG.iso88596 \ + && localedefdebug -c -i ar_EG -f UTF-8 ar_EG.utf8 \ + && localedefdebug -c -i ar_IN -f UTF-8 ar_IN.utf8 \ + && localedefdebug -c -i ar_IQ -f ISO-8859-6 ar_IQ.iso88596 \ + && localedefdebug -c -i ar_IQ -f UTF-8 ar_IQ.utf8 \ + && localedefdebug -c -i ar_JO -f ISO-8859-6 ar_JO.iso88596 \ + && localedefdebug -c -i ar_JO -f UTF-8 ar_JO.utf8 \ + && localedefdebug -c -i ar_KW -f ISO-8859-6 ar_KW.iso88596 \ + && localedefdebug -c -i ar_KW -f UTF-8 ar_KW.utf8 \ + && localedefdebug -c -i ar_LB -f ISO-8859-6 ar_LB.iso88596 \ + && localedefdebug -c -i ar_LB -f UTF-8 ar_LB.utf8 \ + && localedefdebug -c -i ar_LY -f ISO-8859-6 ar_LY.iso88596 \ + && localedefdebug -c -i ar_LY -f UTF-8 ar_LY.utf8 \ + && localedefdebug -c -i ar_MA -f ISO-8859-6 ar_MA.iso88596 \ + && localedefdebug -c -i ar_MA -f UTF-8 ar_MA.utf8 \ + && localedefdebug -c -i ar_OM -f ISO-8859-6 ar_OM.iso88596 \ + && localedefdebug -c -i ar_OM -f UTF-8 ar_OM.utf8 \ + && localedefdebug -c -i ar_QA -f ISO-8859-6 ar_QA.iso88596 \ + && localedefdebug -c -i ar_QA -f UTF-8 ar_QA.utf8 \ + && localedefdebug -c -i ar_SA -f ISO-8859-6 ar_SA.iso88596 \ + && localedefdebug -c -i ar_SA -f UTF-8 ar_SA.utf8 \ + && localedefdebug -c -i ar_SD -f ISO-8859-6 ar_SD.iso88596 \ + && localedefdebug -c -i ar_SD -f UTF-8 ar_SD.utf8 \ + && localedefdebug -c -i ar_SY -f ISO-8859-6 ar_SY.iso88596 \ + && localedefdebug -c -i ar_SY -f UTF-8 ar_SY.utf8 \ + && localedefdebug -c -i ar_TN -f ISO-8859-6 ar_TN.iso88596 \ + && localedefdebug -c -i ar_TN -f UTF-8 ar_TN.utf8 \ + && localedefdebug -c -i ar_YE -f ISO-8859-6 ar_YE.iso88596 \ + && localedefdebug -c -i ar_YE -f UTF-8 ar_YE.utf8 \ + && localedefdebug -c -i as_IN -f UTF-8 as_IN.utf8 \ + && localedefdebug -c -i ast_ES -f ISO-8859-15 ast_ES.iso885915 \ + && localedefdebug -c -i ast_ES -f UTF-8 ast_ES.utf8 \ + && localedefdebug -c -i az_AZ -f UTF-8 az_AZ.utf8 \ + && localedefdebug -c -i be_BY -f CP1251 be_BY.cp1251 \ + && localedefdebug -c -i be_BY -f UTF-8 be_BY.utf8 \ + && localedefdebug -c -i be_BY@latin -f UTF-8 be_BY.utf8@latin \ + && localedefdebug -c -i bem_ZM -f UTF-8 bem_ZM.utf8 \ + && localedefdebug -c -i ber_DZ -f UTF-8 ber_DZ.utf8 \ + && localedefdebug -c -i ber_MA -f UTF-8 ber_MA.utf8 \ + && localedefdebug -c -i bg_BG -f CP1251 bg_BG.cp1251 \ + && localedefdebug -c -i bg_BG -f UTF-8 bg_BG.utf8 \ + && localedefdebug -c -i bho_IN -f UTF-8 bho_IN.utf8 \ + && localedefdebug -c -i bn_BD -f UTF-8 bn_BD.utf8 \ + && localedefdebug -c -i bn_IN -f UTF-8 bn_IN.utf8 \ + && localedefdebug -c -i br_FR -f ISO-8859-1 br_FR.iso88591 \ + && localedefdebug -c -i br_FR@euro -f ISO-8859-15 br_FR.iso885915@euro \ + && localedefdebug -c -i br_FR -f UTF-8 br_FR.utf8 \ + && localedefdebug -c -i brx_IN -f UTF-8 brx_IN.utf8 \ + && localedefdebug -c -i bs_BA -f ISO-8859-2 bs_BA.iso88592 \ + && localedefdebug -c -i bs_BA -f UTF-8 bs_BA.utf8 \ + && localedefdebug -c -i byn_ER -f UTF-8 byn_ER.utf8 \ + && localedefdebug -c -i ca_AD -f ISO-8859-15 ca_AD.iso885915 \ + && localedefdebug -c -i ca_AD -f UTF-8 ca_AD.utf8 \ + && localedefdebug -c -i ca_ES -f ISO-8859-1 ca_ES.iso88591 \ + && localedefdebug -c -i ca_ES@euro -f ISO-8859-15 ca_ES.iso885915@euro \ + && localedefdebug -c -i ca_ES -f UTF-8 ca_ES.utf8 \ + && localedefdebug -c -i ca_FR -f ISO-8859-15 ca_FR.iso885915 \ + && localedefdebug -c -i ca_FR -f UTF-8 ca_FR.utf8 \ + && localedefdebug -c -i ca_IT -f ISO-8859-15 ca_IT.iso885915 \ + && localedefdebug -c -i ca_IT -f UTF-8 ca_IT.utf8 \ + && localedefdebug -c -i crh_UA -f UTF-8 crh_UA.utf8 \ + && localedefdebug -c -i csb_PL -f UTF-8 csb_PL.utf8 \ + && localedefdebug -c -i cs_CZ -f ISO-8859-2 cs_CZ.iso88592 \ + && localedefdebug -c -i cs_CZ -f UTF-8 cs_CZ.utf8 \ + && localedefdebug -c -i cv_RU -f UTF-8 cv_RU.utf8 \ + && localedefdebug -c -i cy_GB -f ISO-8859-14 cy_GB.iso885914 \ + && localedefdebug -c -i cy_GB -f UTF-8 cy_GB.utf8 \ + && localedefdebug -c -i da_DK -f ISO-8859-1 da_DK.iso88591 \ + && localedefdebug -c -i da_DK -f UTF-8 da_DK.utf8 \ + && localedefdebug -c -i de_AT -f ISO-8859-1 de_AT.iso88591 \ + && localedefdebug -c -i de_AT@euro -f ISO-8859-15 de_AT.iso885915@euro \ + && localedefdebug -c -i de_AT -f UTF-8 de_AT.utf8 \ + && localedefdebug -c -i de_BE -f ISO-8859-1 de_BE.iso88591 \ + && localedefdebug -c -i de_BE@euro -f ISO-8859-15 de_BE.iso885915@euro \ + && localedefdebug -c -i de_BE -f UTF-8 de_BE.utf8 \ + && localedefdebug -c -i de_CH -f ISO-8859-1 de_CH.iso88591 \ + && localedefdebug -c -i de_CH -f UTF-8 de_CH.utf8 \ + && localedefdebug -c -i de_DE -f ISO-8859-1 de_DE.iso88591 \ + && localedefdebug -c -i de_DE@euro -f ISO-8859-15 de_DE.iso885915@euro \ + && localedefdebug -c -i de_DE -f UTF-8 de_DE.utf8 \ + && localedefdebug -c -i de_LU -f ISO-8859-1 de_LU.iso88591 \ + && localedefdebug -c -i de_LU@euro -f ISO-8859-15 de_LU.iso885915@euro \ + && localedefdebug -c -i de_LU -f UTF-8 de_LU.utf8 \ + && localedefdebug -c -i dv_MV -f UTF-8 dv_MV.utf8 \ + && localedefdebug -c -i dz_BT -f UTF-8 dz_BT.utf8 \ + && localedefdebug -c -i el_CY -f ISO-8859-7 el_CY.iso88597 \ + && localedefdebug -c -i el_CY -f UTF-8 el_CY.utf8 \ + && localedefdebug -c -i el_GR -f ISO-8859-7 el_GR.iso88597 \ + && localedefdebug -c -i el_GR -f UTF-8 el_GR.utf8 \ + && localedefdebug -c -i en_AG -f UTF-8 en_AG.utf8 \ + && localedefdebug -c -i en_AU -f ISO-8859-1 en_AU.iso88591 \ + && localedefdebug -c -i en_AU -f UTF-8 en_AU.utf8 \ + && localedefdebug -c -i en_BW -f ISO-8859-1 en_BW.iso88591 \ + && localedefdebug -c -i en_BW -f UTF-8 en_BW.utf8 \ + && localedefdebug -c -i en_CA -f ISO-8859-1 en_CA.iso88591 \ + && localedefdebug -c -i en_CA -f UTF-8 en_CA.utf8 \ + && localedefdebug -c -i en_GB -f ISO-8859-1 en_GB.iso88591 \ + && localedefdebug -c -i en_GB -f ISO-8859-15 en_GB.iso885915 \ + && localedefdebug -c -i en_GB -f UTF-8 en_GB.utf8 \ + && localedefdebug -c -i en_HK -f ISO-8859-1 en_HK.iso88591 \ + && localedefdebug -c -i en_HK -f UTF-8 en_HK.utf8 \ + && localedefdebug -c -i en_IE -f ISO-8859-1 en_IE.iso88591 \ + && localedefdebug -c -i en_IE@euro -f ISO-8859-15 en_IE.iso885915@euro \ + && localedefdebug -c -i en_IE -f UTF-8 en_IE.utf8 \ + && localedefdebug -c -i en_IN -f UTF-8 en_IN.utf8 \ + && localedefdebug -c -i en_NG -f UTF-8 en_NG.utf8 \ + && localedefdebug -c -i en_NZ -f ISO-8859-1 en_NZ.iso88591 \ + && localedefdebug -c -i en_NZ -f UTF-8 en_NZ.utf8 \ + && localedefdebug -c -i en_PH -f ISO-8859-1 en_PH.iso88591 \ + && localedefdebug -c -i en_PH -f UTF-8 en_PH.utf8 \ + && localedefdebug -c -i en_SG -f ISO-8859-1 en_SG.iso88591 \ + && localedefdebug -c -i en_SG -f UTF-8 en_SG.utf8 \ + && localedefdebug -c -i en_US -f ISO-8859-1 en_US.iso88591 \ + && localedefdebug -c -i en_US -f ISO-8859-15 en_US.iso885915 \ + && localedefdebug -c -i en_US -f UTF-8 en_US.utf8 \ + && localedefdebug -c -i en_ZA -f ISO-8859-1 en_ZA.iso88591 \ + && localedefdebug -c -i en_ZA -f UTF-8 en_ZA.utf8 \ + && localedefdebug -c -i en_ZM -f UTF-8 en_ZM.utf8 \ + && localedefdebug -c -i en_ZW -f ISO-8859-1 en_ZW.iso88591 \ + && localedefdebug -c -i en_ZW -f UTF-8 en_ZW.utf8 \ + && localedefdebug -c -i es_AR -f ISO-8859-1 es_AR.iso88591 \ + && localedefdebug -c -i es_AR -f UTF-8 es_AR.utf8 \ + && localedefdebug -c -i es_BO -f ISO-8859-1 es_BO.iso88591 \ + && localedefdebug -c -i es_BO -f UTF-8 es_BO.utf8 \ + && localedefdebug -c -i es_CL -f ISO-8859-1 es_CL.iso88591 \ + && localedefdebug -c -i es_CL -f UTF-8 es_CL.utf8 \ + && localedefdebug -c -i es_CO -f ISO-8859-1 es_CO.iso88591 \ + && localedefdebug -c -i es_CO -f UTF-8 es_CO.utf8 \ + && localedefdebug -c -i es_CR -f ISO-8859-1 es_CR.iso88591 \ + && localedefdebug -c -i es_CR -f UTF-8 es_CR.utf8 \ + && localedefdebug -c -i es_CU -f UTF-8 es_CU.utf8 \ + && localedefdebug -c -i es_DO -f ISO-8859-1 es_DO.iso88591 \ + && localedefdebug -c -i es_DO -f UTF-8 es_DO.utf8 \ + && localedefdebug -c -i es_EC -f ISO-8859-1 es_EC.iso88591 \ + && localedefdebug -c -i es_EC -f UTF-8 es_EC.utf8 \ + && localedefdebug -c -i es_ES -f ISO-8859-1 es_ES.iso88591 \ + && localedefdebug -c -i es_ES@euro -f ISO-8859-15 es_ES.iso885915@euro \ + && localedefdebug -c -i es_ES -f UTF-8 es_ES.utf8 \ + && localedefdebug -c -i es_GT -f ISO-8859-1 es_GT.iso88591 \ + && localedefdebug -c -i es_GT -f UTF-8 es_GT.utf8 \ + && localedefdebug -c -i es_HN -f ISO-8859-1 es_HN.iso88591 \ + && localedefdebug -c -i es_HN -f UTF-8 es_HN.utf8 \ + && localedefdebug -c -i es_MX -f ISO-8859-1 es_MX.iso88591 \ + && localedefdebug -c -i es_MX -f UTF-8 es_MX.utf8 \ + && localedefdebug -c -i es_NI -f ISO-8859-1 es_NI.iso88591 \ + && localedefdebug -c -i es_NI -f UTF-8 es_NI.utf8 \ + && localedefdebug -c -i es_PA -f ISO-8859-1 es_PA.iso88591 \ + && localedefdebug -c -i es_PA -f UTF-8 es_PA.utf8 \ + && localedefdebug -c -i es_PE -f ISO-8859-1 es_PE.iso88591 \ + && localedefdebug -c -i es_PE -f UTF-8 es_PE.utf8 \ + && localedefdebug -c -i es_PR -f ISO-8859-1 es_PR.iso88591 \ + && localedefdebug -c -i es_PR -f UTF-8 es_PR.utf8 \ + && localedefdebug -c -i es_PY -f ISO-8859-1 es_PY.iso88591 \ + && localedefdebug -c -i es_PY -f UTF-8 es_PY.utf8 \ + && localedefdebug -c -i es_SV -f ISO-8859-1 es_SV.iso88591 \ + && localedefdebug -c -i es_SV -f UTF-8 es_SV.utf8 \ + && localedefdebug -c -i es_US -f ISO-8859-1 es_US.iso88591 \ + && localedefdebug -c -i es_US -f UTF-8 es_US.utf8 \ + && localedefdebug -c -i es_UY -f ISO-8859-1 es_UY.iso88591 \ + && localedefdebug -c -i es_UY -f UTF-8 es_UY.utf8 \ + && localedefdebug -c -i es_VE -f ISO-8859-1 es_VE.iso88591 \ + && localedefdebug -c -i es_VE -f UTF-8 es_VE.utf8 \ + && localedefdebug -c -i et_EE -f ISO-8859-1 et_EE.iso88591 \ + && localedefdebug -c -i et_EE -f ISO-8859-15 et_EE.iso885915 \ + && localedefdebug -c -i et_EE -f UTF-8 et_EE.utf8 \ + && localedefdebug -c -i eu_ES -f ISO-8859-1 eu_ES.iso88591 \ + && localedefdebug -c -i eu_ES@euro -f ISO-8859-15 eu_ES.iso885915@euro \ + && localedefdebug -c -i eu_ES -f UTF-8 eu_ES.utf8 \ + && localedefdebug -c -i fa_IR -f UTF-8 fa_IR.utf8 \ + && localedefdebug -c -i ff_SN -f UTF-8 ff_SN.utf8 \ + && localedefdebug -c -i fi_FI -f ISO-8859-1 fi_FI.iso88591 \ + && localedefdebug -c -i fi_FI@euro -f ISO-8859-15 fi_FI.iso885915@euro \ + && localedefdebug -c -i fi_FI -f UTF-8 fi_FI.utf8 \ + && localedefdebug -c -i fil_PH -f UTF-8 fil_PH.utf8 \ + && localedefdebug -c -i fo_FO -f ISO-8859-1 fo_FO.iso88591 \ + && localedefdebug -c -i fo_FO -f UTF-8 fo_FO.utf8 \ + && localedefdebug -c -i fr_BE -f ISO-8859-1 fr_BE.iso88591 \ + && localedefdebug -c -i fr_BE@euro -f ISO-8859-15 fr_BE.iso885915@euro \ + && localedefdebug -c -i fr_BE -f UTF-8 fr_BE.utf8 \ + && localedefdebug -c -i fr_CA -f ISO-8859-1 fr_CA.iso88591 \ + && localedefdebug -c -i fr_CA -f UTF-8 fr_CA.utf8 \ + && localedefdebug -c -i fr_CH -f ISO-8859-1 fr_CH.iso88591 \ + && localedefdebug -c -i fr_CH -f UTF-8 fr_CH.utf8 \ + && localedefdebug -c -i fr_FR -f ISO-8859-1 fr_FR.iso88591 \ + && localedefdebug -c -i fr_FR@euro -f ISO-8859-15 fr_FR.iso885915@euro \ + && localedefdebug -c -i fr_FR -f UTF-8 fr_FR.utf8 \ + && localedefdebug -c -i fr_LU -f ISO-8859-1 fr_LU.iso88591 \ + && localedefdebug -c -i fr_LU@euro -f ISO-8859-15 fr_LU.iso885915@euro \ + && localedefdebug -c -i fr_LU -f UTF-8 fr_LU.utf8 \ + && localedefdebug -c -i fur_IT -f UTF-8 fur_IT.utf8 \ + && localedefdebug -c -i fy_DE -f UTF-8 fy_DE.utf8 \ + && localedefdebug -c -i fy_NL -f UTF-8 fy_NL.utf8 \ + && localedefdebug -c -i ga_IE -f ISO-8859-1 ga_IE.iso88591 \ + && localedefdebug -c -i ga_IE@euro -f ISO-8859-15 ga_IE.iso885915@euro \ + && localedefdebug -c -i ga_IE -f UTF-8 ga_IE.utf8 \ + && localedefdebug -c -i gd_GB -f ISO-8859-15 gd_GB.iso885915 \ + && localedefdebug -c -i gd_GB -f UTF-8 gd_GB.utf8 \ + && localedefdebug -c -i gez_ER -f UTF-8 gez_ER.utf8 \ + && localedefdebug -c -i gez_ER@abegede -f UTF-8 gez_ER.utf8@abegede \ + && localedefdebug -c -i gez_ET -f UTF-8 gez_ET.utf8 \ + && localedefdebug -c -i gez_ET@abegede -f UTF-8 gez_ET.utf8@abegede \ + && localedefdebug -c -i gl_ES -f ISO-8859-1 gl_ES.iso88591 \ + && localedefdebug -c -i gl_ES@euro -f ISO-8859-15 gl_ES.iso885915@euro \ + && localedefdebug -c -i gl_ES -f UTF-8 gl_ES.utf8 \ + && localedefdebug -c -i gu_IN -f UTF-8 gu_IN.utf8 \ + && localedefdebug -c -i gv_GB -f ISO-8859-1 gv_GB.iso88591 \ + && localedefdebug -c -i gv_GB -f UTF-8 gv_GB.utf8 \ + && localedefdebug -c -i ha_NG -f UTF-8 ha_NG.utf8 \ + && localedefdebug -c -i he_IL -f ISO-8859-8 he_IL.iso88598 \ + && localedefdebug -c -i he_IL -f UTF-8 he_IL.utf8 \ + && localedefdebug -c -i hi_IN -f UTF-8 hi_IN.utf8 \ + && localedefdebug -c -i hne_IN -f UTF-8 hne_IN.utf8 \ + && localedefdebug -c -i hr_HR -f ISO-8859-2 hr_HR.iso88592 \ + && localedefdebug -c -i hr_HR -f UTF-8 hr_HR.utf8 \ + && localedefdebug -c -i hsb_DE -f ISO-8859-2 hsb_DE.iso88592 \ + && localedefdebug -c -i hsb_DE -f UTF-8 hsb_DE.utf8 \ + && localedefdebug -c -i ht_HT -f UTF-8 ht_HT.utf8 \ + && localedefdebug -c -i hu_HU -f ISO-8859-2 hu_HU.iso88592 \ + && localedefdebug -c -i hu_HU -f UTF-8 hu_HU.utf8 \ + && localedefdebug -c -i hy_AM -f ARMSCII-8 hy_AM.armscii8 \ + && localedefdebug -c -i hy_AM -f UTF-8 hy_AM.utf8 \ + && localedefdebug -c -i id_ID -f ISO-8859-1 id_ID.iso88591 \ + && localedefdebug -c -i id_ID -f UTF-8 id_ID.utf8 \ + && localedefdebug -c -i ig_NG -f UTF-8 ig_NG.utf8 \ + && localedefdebug -c -i ik_CA -f UTF-8 ik_CA.utf8 \ + && localedefdebug -c -i is_IS -f ISO-8859-1 is_IS.iso88591 \ + && localedefdebug -c -i is_IS -f UTF-8 is_IS.utf8 \ + && localedefdebug -c -i it_CH -f ISO-8859-1 it_CH.iso88591 \ + && localedefdebug -c -i it_CH -f UTF-8 it_CH.utf8 \ + && localedefdebug -c -i it_IT -f ISO-8859-1 it_IT.iso88591 \ + && localedefdebug -c -i it_IT@euro -f ISO-8859-15 it_IT.iso885915@euro \ + && localedefdebug -c -i it_IT -f UTF-8 it_IT.utf8 \ + && localedefdebug -c -i iu_CA -f UTF-8 iu_CA.utf8 \ + && localedefdebug -c -i iw_IL -f ISO-8859-8 iw_IL.iso88598 \ + && localedefdebug -c -i iw_IL -f UTF-8 iw_IL.utf8 \ + && localedefdebug -c -i ja_JP -f EUC-JP ja_JP.eucjp \ + && localedefdebug -c -i ja_JP -f UTF-8 ja_JP.utf8 \ + && localedefdebug -c -i ka_GE -f GEORGIAN-PS ka_GE.georgianps \ + && localedefdebug -c -i ka_GE -f UTF-8 ka_GE.utf8 \ + && localedefdebug -c -i kk_KZ -f PT154 kk_KZ.pt154 \ + && localedefdebug -c -i kk_KZ -f RK1048 kk_KZ.rk1048 \ + && localedefdebug -c -i kk_KZ -f UTF-8 kk_KZ.utf8 \ + && localedefdebug -c -i kl_GL -f ISO-8859-1 kl_GL.iso88591 \ + && localedefdebug -c -i kl_GL -f UTF-8 kl_GL.utf8 \ + && localedefdebug -c -i km_KH -f UTF-8 km_KH.utf8 \ + && localedefdebug -c -i kn_IN -f UTF-8 kn_IN.utf8 \ + && localedefdebug -c -i kok_IN -f UTF-8 kok_IN.utf8 \ + && localedefdebug -c -i ko_KR -f EUC-KR ko_KR.euckr \ + && localedefdebug -c -i ko_KR -f UTF-8 ko_KR.utf8 \ + && localedefdebug -c -i ks_IN -f UTF-8 ks_IN.utf8 \ + && localedefdebug -c -i ks_IN@devanagari -f UTF-8 ks_IN.utf8@devanagari \ + && localedefdebug -c -i ku_TR -f ISO-8859-9 ku_TR.iso88599 \ + && localedefdebug -c -i ku_TR -f UTF-8 ku_TR.utf8 \ + && localedefdebug -c -i kw_GB -f ISO-8859-1 kw_GB.iso88591 \ + && localedefdebug -c -i kw_GB -f UTF-8 kw_GB.utf8 \ + && localedefdebug -c -i ky_KG -f UTF-8 ky_KG.utf8 \ + && localedefdebug -c -i lb_LU -f UTF-8 lb_LU.utf8 \ + && localedefdebug -c -i lg_UG -f ISO-8859-10 lg_UG.iso885910 \ + && localedefdebug -c -i lg_UG -f UTF-8 lg_UG.utf8 \ + && localedefdebug -c -i li_BE -f UTF-8 li_BE.utf8 \ + && localedefdebug -c -i lij_IT -f UTF-8 lij_IT.utf8 \ + && localedefdebug -c -i li_NL -f UTF-8 li_NL.utf8 \ + && localedefdebug -c -i lo_LA -f UTF-8 lo_LA.utf8 \ + && localedefdebug -c -i lt_LT -f ISO-8859-13 lt_LT.iso885913 \ + && localedefdebug -c -i lt_LT -f UTF-8 lt_LT.utf8 \ + && localedefdebug -c -i lv_LV -f ISO-8859-13 lv_LV.iso885913 \ + && localedefdebug -c -i lv_LV -f UTF-8 lv_LV.utf8 \ + && localedefdebug -c -i mai_IN -f UTF-8 mai_IN.utf8 \ + && localedefdebug -c -i mg_MG -f ISO-8859-15 mg_MG.iso885915 \ + && localedefdebug -c -i mg_MG -f UTF-8 mg_MG.utf8 \ + && localedefdebug -c -i mhr_RU -f UTF-8 mhr_RU.utf8 \ + && localedefdebug -c -i mi_NZ -f ISO-8859-13 mi_NZ.iso885913 \ + && localedefdebug -c -i mi_NZ -f UTF-8 mi_NZ.utf8 \ + && localedefdebug -c -i mk_MK -f ISO-8859-5 mk_MK.iso88595 \ + && localedefdebug -c -i mk_MK -f UTF-8 mk_MK.utf8 \ + && localedefdebug -c -i ml_IN -f UTF-8 ml_IN.utf8 \ + && localedefdebug -c -i mn_MN -f UTF-8 mn_MN.utf8 \ + && localedefdebug -c -i mr_IN -f UTF-8 mr_IN.utf8 \ + && localedefdebug -c -i ms_MY -f ISO-8859-1 ms_MY.iso88591 \ + && localedefdebug -c -i ms_MY -f UTF-8 ms_MY.utf8 \ + && localedefdebug -c -i mt_MT -f ISO-8859-3 mt_MT.iso88593 \ + && localedefdebug -c -i mt_MT -f UTF-8 mt_MT.utf8 \ + && localedefdebug -c -i my_MM -f UTF-8 my_MM.utf8 \ + && localedefdebug -c -i nan_TW@latin -f UTF-8 nan_TW.utf8@latin \ + && localedefdebug -c -i nb_NO -f ISO-8859-1 nb_NO.iso88591 \ + && localedefdebug -c -i nb_NO -f UTF-8 nb_NO.utf8 \ + && localedefdebug -c -i nds_DE -f UTF-8 nds_DE.utf8 \ + && localedefdebug -c -i nds_NL -f UTF-8 nds_NL.utf8 \ + && localedefdebug -c -i ne_NP -f UTF-8 ne_NP.utf8 \ + && localedefdebug -c -i nl_AW -f UTF-8 nl_AW.utf8 \ + && localedefdebug -c -i nl_BE -f ISO-8859-1 nl_BE.iso88591 \ + && localedefdebug -c -i nl_BE@euro -f ISO-8859-15 nl_BE.iso885915@euro \ + && localedefdebug -c -i nl_BE -f UTF-8 nl_BE.utf8 \ + && localedefdebug -c -i nl_NL -f ISO-8859-1 nl_NL.iso88591 \ + && localedefdebug -c -i nl_NL@euro -f ISO-8859-15 nl_NL.iso885915@euro \ + && localedefdebug -c -i nl_NL -f UTF-8 nl_NL.utf8 \ + && localedefdebug -c -i nn_NO -f ISO-8859-1 nn_NO.iso88591 \ + && localedefdebug -c -i nn_NO -f UTF-8 nn_NO.utf8 \ + && localedefdebug -c -i nr_ZA -f UTF-8 nr_ZA.utf8 \ + && localedefdebug -c -i nso_ZA -f UTF-8 nso_ZA.utf8 \ + && localedefdebug -c -i oc_FR -f ISO-8859-1 oc_FR.iso88591 \ + && localedefdebug -c -i oc_FR -f UTF-8 oc_FR.utf8 \ + && localedefdebug -c -i om_ET -f UTF-8 om_ET.utf8 \ + && localedefdebug -c -i om_KE -f ISO-8859-1 om_KE.iso88591 \ + && localedefdebug -c -i om_KE -f UTF-8 om_KE.utf8 \ + && localedefdebug -c -i or_IN -f UTF-8 or_IN.utf8 \ + && localedefdebug -c -i os_RU -f UTF-8 os_RU.utf8 \ + && localedefdebug -c -i pa_IN -f UTF-8 pa_IN.utf8 \ + && localedefdebug -c -i pap_AN -f UTF-8 pap_AN.utf8 \ + && localedefdebug -c -i pa_PK -f UTF-8 pa_PK.utf8 \ + && localedefdebug -c -i pl_PL -f ISO-8859-2 pl_PL.iso88592 \ + && localedefdebug -c -i pl_PL -f UTF-8 pl_PL.utf8 \ + && localedefdebug -c -i ps_AF -f UTF-8 ps_AF.utf8 \ + && localedefdebug -c -i pt_BR -f ISO-8859-1 pt_BR.iso88591 \ + && localedefdebug -c -i pt_BR -f UTF-8 pt_BR.utf8 \ + && localedefdebug -c -i pt_PT -f ISO-8859-1 pt_PT.iso88591 \ + && localedefdebug -c -i pt_PT@euro -f ISO-8859-15 pt_PT.iso885915@euro \ + && localedefdebug -c -i pt_PT -f UTF-8 pt_PT.utf8 \ + && localedefdebug -c -i ro_RO -f ISO-8859-2 ro_RO.iso88592 \ + && localedefdebug -c -i ro_RO -f UTF-8 ro_RO.utf8 \ + && localedefdebug -c -i ru_RU -f CP1251 ru_RU.cp1251 \ + && localedefdebug -c -i ru_RU -f ISO-8859-5 ru_RU.iso88595 \ + && localedefdebug -c -i ru_RU -f KOI8-R ru_RU.koi8r \ + && localedefdebug -c -i ru_RU -f UTF-8 ru_RU.utf8 \ + && localedefdebug -c -i ru_UA -f KOI8-U ru_UA.koi8u \ + && localedefdebug -c -i ru_UA -f UTF-8 ru_UA.utf8 \ + && localedefdebug -c -i rw_RW -f UTF-8 rw_RW.utf8 \ + && localedefdebug -c -i sa_IN -f UTF-8 sa_IN.utf8 \ + && localedefdebug -c -i sc_IT -f UTF-8 sc_IT.utf8 \ + && localedefdebug -c -i sd_IN -f UTF-8 sd_IN.utf8 \ + && localedefdebug -c -i sd_IN@devanagari -f UTF-8 sd_IN.utf8@devanagari \ + && localedefdebug -c -i se_NO -f UTF-8 se_NO.utf8 \ + && localedefdebug -c -i shs_CA -f UTF-8 shs_CA.utf8 \ + && localedefdebug -c -i sid_ET -f UTF-8 sid_ET.utf8 \ + && localedefdebug -c -i si_LK -f UTF-8 si_LK.utf8 \ + && localedefdebug -c -i sk_SK -f ISO-8859-2 sk_SK.iso88592 \ + && localedefdebug -c -i sk_SK -f UTF-8 sk_SK.utf8 \ + && localedefdebug -c -i sl_SI -f ISO-8859-2 sl_SI.iso88592 \ + && localedefdebug -c -i sl_SI -f UTF-8 sl_SI.utf8 \ + && localedefdebug -c -i so_DJ -f ISO-8859-1 so_DJ.iso88591 \ + && localedefdebug -c -i so_DJ -f UTF-8 so_DJ.utf8 \ + && localedefdebug -c -i so_ET -f UTF-8 so_ET.utf8 \ + && localedefdebug -c -i so_KE -f ISO-8859-1 so_KE.iso88591 \ + && localedefdebug -c -i so_KE -f UTF-8 so_KE.utf8 \ + && localedefdebug -c -i so_SO -f ISO-8859-1 so_SO.iso88591 \ + && localedefdebug -c -i so_SO -f UTF-8 so_SO.utf8 \ + && localedefdebug -c -i sq_AL -f ISO-8859-1 sq_AL.iso88591 \ + && localedefdebug -c -i sq_AL -f UTF-8 sq_AL.utf8 \ + && localedefdebug -c -i sq_MK -f UTF-8 sq_MK.utf8 \ + && localedefdebug -c -i sr_ME -f UTF-8 sr_ME.utf8 \ + && localedefdebug -c -i sr_RS -f UTF-8 sr_RS.utf8 \ + && localedefdebug -c -i sr_RS@latin -f UTF-8 sr_RS.utf8@latin \ + && localedefdebug -c -i ss_ZA -f UTF-8 ss_ZA.utf8 \ + && localedefdebug -c -i st_ZA -f ISO-8859-1 st_ZA.iso88591 \ + && localedefdebug -c -i st_ZA -f UTF-8 st_ZA.utf8 \ + && localedefdebug -c -i sv_FI -f ISO-8859-1 sv_FI.iso88591 \ + && localedefdebug -c -i sv_FI@euro -f ISO-8859-15 sv_FI.iso885915@euro \ + && localedefdebug -c -i sv_FI -f UTF-8 sv_FI.utf8 \ + && localedefdebug -c -i sv_SE -f ISO-8859-1 sv_SE.iso88591 \ + && localedefdebug -c -i sv_SE -f ISO-8859-15 sv_SE.iso885915 \ + && localedefdebug -c -i sv_SE -f UTF-8 sv_SE.utf8 \ + && localedefdebug -c -i sw_KE -f UTF-8 sw_KE.utf8 \ + && localedefdebug -c -i sw_TZ -f UTF-8 sw_TZ.utf8 \ + && localedefdebug -c -i ta_IN -f UTF-8 ta_IN.utf8 \ + && localedefdebug -c -i ta_LK -f UTF-8 ta_LK.utf8 \ + && localedefdebug -c -i te_IN -f UTF-8 te_IN.utf8 \ + && localedefdebug -c -i tg_TJ -f KOI8-T tg_TJ.koi8t \ + && localedefdebug -c -i tg_TJ -f UTF-8 tg_TJ.utf8 \ + && localedefdebug -c -i th_TH -f TIS-620 th_TH.tis620 \ + && localedefdebug -c -i th_TH -f UTF-8 th_TH.utf8 \ + && localedefdebug -c -i ti_ER -f UTF-8 ti_ER.utf8 \ + && localedefdebug -c -i ti_ET -f UTF-8 ti_ET.utf8 \ + && localedefdebug -c -i tig_ER -f UTF-8 tig_ER.utf8 \ + && localedefdebug -c -i tk_TM -f UTF-8 tk_TM.utf8 \ + && localedefdebug -c -i tl_PH -f ISO-8859-1 tl_PH.iso88591 \ + && localedefdebug -c -i tl_PH -f UTF-8 tl_PH.utf8 \ + && localedefdebug -c -i tn_ZA -f UTF-8 tn_ZA.utf8 \ + && localedefdebug -c -i tr_CY -f ISO-8859-9 tr_CY.iso88599 \ + && localedefdebug -c -i tr_CY -f UTF-8 tr_CY.utf8 \ + && localedefdebug -c -i tr_TR -f ISO-8859-9 tr_TR.iso88599 \ + && localedefdebug -c -i tr_TR -f UTF-8 tr_TR.utf8 \ + && localedefdebug -c -i ts_ZA -f UTF-8 ts_ZA.utf8 \ + && localedefdebug -c -i tt_RU -f UTF-8 tt_RU.utf8 \ + && localedefdebug -c -i tt_RU@iqtelif -f UTF-8 tt_RU.utf8@iqtelif \ + && localedefdebug -c -i ug_CN -f UTF-8 ug_CN.utf8 \ + && localedefdebug -c -i uk_UA -f KOI8-U uk_UA.koi8u \ + && localedefdebug -c -i uk_UA -f UTF-8 uk_UA.utf8 \ + && localedefdebug -c -i unm_US -f UTF-8 unm_US.utf8 \ + && localedefdebug -c -i ur_IN -f UTF-8 ur_IN.utf8 \ + && localedefdebug -c -i ur_PK -f UTF-8 ur_PK.utf8 \ + && localedefdebug -c -i uz_UZ -f ISO-8859-1 uz_UZ.iso88591 \ + && localedefdebug -c -i uz_UZ -f UTF-8 uz_UZ.utf8 \ + && localedefdebug -c -i uz_UZ@cyrillic -f UTF-8 uz_UZ.utf8@cyrillic \ + && localedefdebug -c -i ve_ZA -f UTF-8 ve_ZA.utf8 \ + && localedefdebug -c -i vi_VN -f TCVN5712-1 vi_VN.tcvn \ + && localedefdebug -c -i vi_VN -f UTF-8 vi_VN.utf8 \ + && localedefdebug -c -i wa_BE -f ISO-8859-1 wa_BE.iso88591 \ + && localedefdebug -c -i wa_BE@euro -f ISO-8859-15 wa_BE.iso885915@euro \ + && localedefdebug -c -i wa_BE -f UTF-8 wa_BE.utf8 \ + && localedefdebug -c -i wae_CH -f UTF-8 wae_CH.utf8 \ + && localedefdebug -c -i wal_ET -f UTF-8 wal_ET.utf8 \ + && localedefdebug -c -i wo_SN -f UTF-8 wo_SN.utf8 \ + && localedefdebug -c -i xh_ZA -f ISO-8859-1 xh_ZA.iso88591 \ + && localedefdebug -c -i xh_ZA -f UTF-8 xh_ZA.utf8 \ + && localedefdebug -c -i yi_US -f CP1255 yi_US.cp1255 \ + && localedefdebug -c -i yi_US -f UTF-8 yi_US.utf8 \ + && localedefdebug -c -i yo_NG -f UTF-8 yo_NG.utf8 \ + && localedefdebug -c -i yue_HK -f UTF-8 yue_HK.utf8 \ + && localedefdebug -c -i zh_CN -f GB18030 zh_CN.gb18030 \ + && localedefdebug -c -i zh_CN -f GB2312 zh_CN.gb2312 \ + && localedefdebug -c -i zh_CN -f GBK zh_CN.gbk \ + && localedefdebug -c -i zh_CN -f UTF-8 zh_CN.utf8 \ + && localedefdebug -c -i zh_HK -f UTF-8 zh_HK.utf8 \ + && localedefdebug -c -i zh_SG -f GB2312 zh_SG.gb2312 \ + && localedefdebug -c -i zh_SG -f GBK zh_SG.gbk \ + && localedefdebug -c -i zh_SG -f UTF-8 zh_SG.utf8 \ + && localedefdebug -c -i zh_TW -f BIG5 zh_TW.big5 \ + && localedefdebug -c -i zh_TW -f EUC-TW zh_TW.euctw \ + && localedefdebug -c -i zh_TW -f UTF-8 zh_TW.utf8 \ + && localedefdebug -c -i zu_ZA -f ISO-8859-1 zu_ZA.iso88591 \ + && localedefdebug -c -i zu_ZA -f UTF-8 zu_ZA.utf8 \ + && /bin/true +fi diff --git a/provisioning/base-layout/general/usr/local/bin/go-replace b/provisioning/base-layout/general/usr/local/bin/go-replace new file mode 100755 index 000000000..de5b26a98 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/go-replace @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +ARCH=$(dpkg --print-architecture | awk -F- '{ print $NF }') +VERSION="1.1.2" + +case "$ARCH" in \ + amd64) GR_ARCH='64';; \ + arm64) GR_ARCH='arm64';; \ + *) echo "unsupported architecture"; exit 1 ;; \ +esac + +downloadGoReplace() { + echo "downloading go-replace-$GR_ARCH" + wget -O "/usr/local/bin/go-replace-$ARCH" "https://github.com/webdevops/goreplace/releases/download/$VERSION/gr-$GR_ARCH-linux" + chmod +x "/usr/local/bin/go-replace-$ARCH" +} + +if [ ! -x "/usr/local/bin/go-replace-$ARCH" ]; then + downloadGoReplace +fi + +exec "/usr/local/bin/go-replace-$ARCH" $@ diff --git a/provisioning/base-layout/general/usr/local/bin/yum-install b/provisioning/base-layout/general/usr/local/bin/yum-install new file mode 100755 index 000000000..95a27aec9 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/yum-install @@ -0,0 +1,12 @@ +#!/bin/bash + +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 + +# Install packages +yum -y install $* + +# Clear files (reduce snapshot size) +yum clean all diff --git a/provisioning/base-layout/general/usr/local/bin/yum-upgrade b/provisioning/base-layout/general/usr/local/bin/yum-upgrade new file mode 100755 index 000000000..5f697f47e --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/yum-upgrade @@ -0,0 +1,12 @@ +#!/bin/bash + +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 + +# Install packages +yum upgrade -y + +# Clear files (reduce snapshot size) +yum clean all diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index e23b5691d..291c3dbc0 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -3,21 +3,16 @@ {% macro dockerStage() %} # staged baselayout builder -{{ docker.from("toolbox", "latest", user) }} AS baselayout +{{ docker.from("toolbox", "latest", user) }} AS base {{ docker.platformArgs() }} -RUN mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - # Baselayout scripts - && wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \ - && sh /tmp/baselayout-install.sh /baselayout \ +RUN set -eux \ {{ tools.goreplace(path="/baselayout/usr/local/bin") }} \ {{ tools.gosu(path="/baselayout/sbin") }} -{% endmacro %} +{%- endmacro %} {% macro copy() %} -# Baselayout copy (from staged image) -COPY --from=baselayout /baselayout / -{% endmacro %} +# base copy (from staged image) +COPY --from=base /baselayout / +{%- endmacro %} diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 5ee37a11d..8608aec7e 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -14,6 +14,10 @@ FROM {{ image }}:{{ tag }} {%- endif %} {%- endmacro %} +{% macro image(name, tag="latest", user="webdevops") -%} +{{ user }}/{{ name }}:{{ tag }} +{%- endmacro %} + {% macro platformArgs() -%} ARG TARGETARCH {%- endmacro %} @@ -29,8 +33,12 @@ LABEL maintainer=info@webdevops.io \ ADD {{ source }} {{ target }} {%- endmacro -%} -{%- macro copy(source, target) -%} +{%- macro copy(source, target, fromLayer='') -%} +{% if fromLayer -%} +COPY --from={{ fromLayer }} {{ source }} {{ target }} +{%- else -%} COPY {{ source }} {{ target }} +{%- endif %} {%- endmacro -%} {%- macro expose(port) -%} diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 4e4488271..94f520120 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,17 +1,19 @@ {% macro goreplace(path="/usr/local/bin", version="1.1.2") -%} - ## Install go-replace - && export grArch="$(echo $TARGETARCH | sed s/amd64/64/g)" \ - && wget -O "{{ path }}/go-replace" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-$grArch-linux" \ - && chmod +x "{{ path }}/go-replace" + ## install go-replace + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "{{ path }}/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-$grArch-linux" \ + && chmod +x "{{ path }}/go-replace-$dpkgArch" {%- endmacro %} {% macro gosu(path="/sbin", version="1.10") -%} - # Install gosu - && wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$TARGETARCH" \ - && wget -O "{{ path }}/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$TARGETARCH.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify {{ path }}/gosu.asc "{{ path }}/gosu" \ - && rm -rf "$GNUPGHOME" \ - && chmod +x "{{ path }}/gosu" + ## install gosu + dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch"; \ + wget -O "{{ path }}/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify {{ path }}/gosu.asc "{{ path }}/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "{{ path }}/gosu"; {%- endmacro %} From 28ebdf1e21496256f77d2e671a1f4db39afabb91 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 11:27:17 -0700 Subject: [PATCH 062/123] add some baselayout scripts to wrap go-replace so it doesn't die --- .../general/usr/local/bin/docker-arch-info | 38 ++++++++++++++ .../general/usr/local/bin/go-replace | 49 +++++++++++++++---- .../general/usr/local/bin/symlink-go-replace | 38 ++++++++++++++ 3 files changed, 115 insertions(+), 10 deletions(-) create mode 100755 provisioning/base-layout/general/usr/local/bin/docker-arch-info create mode 100755 provisioning/base-layout/general/usr/local/bin/symlink-go-replace diff --git a/provisioning/base-layout/general/usr/local/bin/docker-arch-info b/provisioning/base-layout/general/usr/local/bin/docker-arch-info new file mode 100755 index 000000000..234e235d3 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/docker-arch-info @@ -0,0 +1,38 @@ +#!/bin/sh + +set -e + +FILE="/opt/docker/ARCH_INFO.txt" + +printUsage() { + echo "Usage $0 " + echo "" + echo "BUILDARCH" "architecture of docker host/builder" + echo "TARGETARCH" "architecture of the final docker image" + echo "" + + exit 1 +} + +if [ $# -eq 0 ] || [ $# -gt 2 ]; then + printUsage + exit 2 +fi + +if [ $# -eq 1 ]; then + BUILDARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" + TARGETARCH="$2" +fi + +if [ $# -eq 2 ]; then + BUILDARCH="$1" + TARGETARCH="$2" +fi + +mkdir -p "$(dirname $FILE)" +echo "storing to $FILE" + +{ + echo "BUILDARCH=${BUILDARCH}"; \ + echo "TARGETARCH=${TARGETARCH}"; \ +} > $FILE diff --git a/provisioning/base-layout/general/usr/local/bin/go-replace b/provisioning/base-layout/general/usr/local/bin/go-replace index de5b26a98..1dbab145c 100755 --- a/provisioning/base-layout/general/usr/local/bin/go-replace +++ b/provisioning/base-layout/general/usr/local/bin/go-replace @@ -2,23 +2,52 @@ set -e -ARCH=$(dpkg --print-architecture | awk -F- '{ print $NF }') VERSION="1.1.2" -case "$ARCH" in \ - amd64) GR_ARCH='64';; \ - arm64) GR_ARCH='arm64';; \ - *) echo "unsupported architecture"; exit 1 ;; \ -esac +if command -v dpkg > /dev/null; then + ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" +fi + +download() { + case "$1" in \ + amd64) GR_ARCH='64';; \ + arm64) GR_ARCH='arm64';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac -downloadGoReplace() { + ARCH=$1 echo "downloading go-replace-$GR_ARCH" wget -O "/usr/local/bin/go-replace-$ARCH" "https://github.com/webdevops/goreplace/releases/download/$VERSION/gr-$GR_ARCH-linux" chmod +x "/usr/local/bin/go-replace-$ARCH" } -if [ ! -x "/usr/local/bin/go-replace-$ARCH" ]; then - downloadGoReplace +if [ -f "/opt/docker/ARCH_INFO.txt" ]; then + ARCH_FILE="/opt/docker/ARCH_INFO.txt" + while IFS="=" read -r key value; do + case "$key" in + "BUILDARCH") BUILDARCH="$value" ;; + "TARGETARCH") TARGETARCH="$value" ;; + esac + done < "$ARCH_FILE" fi -exec "/usr/local/bin/go-replace-$ARCH" $@ +if ! [ -n "$BUILDARCH" ]; then + if ! command -v dpkg > /dev/null; then + echo "dpkg not installed and BUILDARCH was not found" + exit 2 + fi + + BUILDARCH="$ARCH" +fi + +for TARGET in "$BUILDARCH" "$TARGETARCH"; do + if [ -n "$TARGET" ] && [ ! -x "/usr/local/bin/go-replace-$TARGET" ]; then + download "$TARGET" + fi +done + +if [ -n "$BUILDARCH" ]; then + exec "/usr/local/bin/go-replace-$BUILDARCH" "$@" +else + exec "/usr/local/bin/go-replace-$ARCH" "$@" +fi diff --git a/provisioning/base-layout/general/usr/local/bin/symlink-go-replace b/provisioning/base-layout/general/usr/local/bin/symlink-go-replace new file mode 100755 index 000000000..a7eebb305 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/symlink-go-replace @@ -0,0 +1,38 @@ +#!/bin/sh + +set -e + +ARCH_FILE="/opt/docker/ARCH_INFO.txt" +GO_REPLACE="/usr/local/bin/go-replace" + +if [ -f "$ARCH_FILE" ]; then + while IFS="=" read -r key value; do + case "$key" in + "BUILDARCH") BUILDARCH="$value" ;; + "TARGETARCH") TARGETARCH="$value" ;; + esac + done < "$ARCH_FILE" + + # remove arch info file + rm -f -- "$ARCH_FILE" +else + echo "WARNING: arch file not found, symlinking to amd64" +fi + +symlinkBinary() { + symlink_target="/usr/local/bin/go-replace-$1" + + if [ ! -f "$symlink_target" ]; then + echo "error: $symlink_target not found" + exit 2 + fi + + rm -f -- "$GO_REPLACE" + ln -sf "$GO_REPLACE" "/usr/local/bin/go-replace-$1" +} + +if [ -n "$TARGETARCH" ]; then + symlinkBinary "amd64" +else + symlinkBinary "$TARGETARCH" +fi From 1916cad99af6a7ff2c0739f7cdd555d10a2ddc47 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 11:32:07 -0700 Subject: [PATCH 063/123] expose BUILD/TARGET ARCH variables from buildx --- template/Dockerfile/docker.jinja2 | 1 + 1 file changed, 1 insertion(+) diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 8608aec7e..95b814927 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -19,6 +19,7 @@ FROM {{ image }}:{{ tag }} {%- endmacro %} {% macro platformArgs() -%} +ARG BUILDARCH ARG TARGETARCH {%- endmacro %} From 3c9ae21186a17bc2b5a9e41aeafc804e39c38945 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 11:33:18 -0700 Subject: [PATCH 064/123] use BUILDARCH and TARGETARCH to call go-replace so it doesn't crash --- template/Dockerfile/docker.jinja2 | 1 + template/Dockerfile/provision.jinja2 | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 95b814927..31106a489 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -64,5 +64,6 @@ CMD ["{{ command }}"] {%- endmacro -%} {%- macro cleanup() -%} + && symlink-go-replace \ && docker-image-cleanup {%- endmacro -%} diff --git a/template/Dockerfile/provision.jinja2 b/template/Dockerfile/provision.jinja2 index 36bce08cf..105422728 100644 --- a/template/Dockerfile/provision.jinja2 +++ b/template/Dockerfile/provision.jinja2 @@ -5,6 +5,9 @@ \{%- endif %} && /opt/docker/bin/bootstrap.sh{% endmacro %} -{% macro runBootstrap() %}&& docker-run-bootstrap{% endmacro %} +{% macro runBootstrap() -%} +&& docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap +{%- endmacro %} {% macro registerRole(role='',bootstrap=False,build=False,onbuild=False,entrypoint=False) %}&& /opt/docker/bin/provision add {%if bootstrap%}--tag bootstrap {% endif %}{%if build%}--tag build {% endif %}{%if onbuild%}--tag onbuild {% endif %}{%if entrypoint%}--tag entrypoint {% endif %} webdevops-{{ role }}{% endmacro %} From b35025a00ebc127833da70ecd82d76926c663443 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 11:33:57 -0700 Subject: [PATCH 065/123] update generated dockerfiles --- docker/ansible/alpine/Dockerfile | 5 ++++- docker/ansible/centos-7/Dockerfile | 5 ++++- docker/ansible/debian-7/Dockerfile | 5 ++++- docker/ansible/debian-8/Dockerfile | 5 ++++- docker/ansible/debian-9/Dockerfile | 5 ++++- docker/ansible/ubuntu-12.04/Dockerfile | 5 ++++- docker/ansible/ubuntu-14.04/Dockerfile | 5 ++++- docker/ansible/ubuntu-15.04/Dockerfile | 5 ++++- docker/ansible/ubuntu-15.10/Dockerfile | 5 ++++- docker/ansible/ubuntu-16.04/Dockerfile | 5 ++++- docker/ansible/ubuntu-17.04/Dockerfile | 5 ++++- docker/apache-dev/alpine/Dockerfile | 5 ++++- docker/apache-dev/centos-7/Dockerfile | 5 ++++- docker/apache-dev/debian-10/Dockerfile | 5 ++++- docker/apache-dev/debian-7/Dockerfile | 5 ++++- docker/apache-dev/debian-8/Dockerfile | 5 ++++- docker/apache-dev/debian-9/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-12.04/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-14.04/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-15.04/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-15.10/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-16.04/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-16.10/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-17.04/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-17.10/Dockerfile | 5 ++++- docker/apache-dev/ubuntu-18.04/Dockerfile | 5 ++++- docker/apache/alpine/Dockerfile | 5 ++++- docker/apache/centos-7/Dockerfile | 5 ++++- docker/apache/debian-10/Dockerfile | 5 ++++- docker/apache/debian-7/Dockerfile | 9 +++++++-- docker/apache/debian-8/Dockerfile | 9 +++++++-- docker/apache/debian-9/Dockerfile | 5 ++++- docker/apache/ubuntu-12.04/Dockerfile | 5 ++++- docker/apache/ubuntu-14.04/Dockerfile | 5 ++++- docker/apache/ubuntu-15.04/Dockerfile | 5 ++++- docker/apache/ubuntu-15.10/Dockerfile | 5 ++++- docker/apache/ubuntu-16.04/Dockerfile | 5 ++++- docker/apache/ubuntu-16.10/Dockerfile | 5 ++++- docker/apache/ubuntu-17.04/Dockerfile | 5 ++++- docker/apache/ubuntu-17.10/Dockerfile | 5 ++++- docker/apache/ubuntu-18.04/Dockerfile | 5 ++++- docker/base-app/alpine/Dockerfile | 5 ++++- docker/base-app/centos-7/Dockerfile | 5 ++++- docker/base-app/debian-10/Dockerfile | 5 ++++- docker/base-app/debian-7/Dockerfile | 5 ++++- docker/base-app/debian-8/Dockerfile | 5 ++++- docker/base-app/debian-9/Dockerfile | 5 ++++- docker/base-app/ubuntu-12.04/Dockerfile | 5 ++++- docker/base-app/ubuntu-14.04/Dockerfile | 5 ++++- docker/base-app/ubuntu-15.04/Dockerfile | 5 ++++- docker/base-app/ubuntu-15.10/Dockerfile | 5 ++++- docker/base-app/ubuntu-16.04/Dockerfile | 5 ++++- docker/base-app/ubuntu-16.10/Dockerfile | 5 ++++- docker/base-app/ubuntu-17.04/Dockerfile | 5 ++++- docker/base-app/ubuntu-17.10/Dockerfile | 5 ++++- docker/base-app/ubuntu-18.04/Dockerfile | 5 ++++- docker/base/alpine/Dockerfile | 5 ++++- docker/base/centos-7/Dockerfile | 5 ++++- docker/base/debian-10/Dockerfile | 5 ++++- docker/base/debian-7/Dockerfile | 5 ++++- docker/base/debian-8/Dockerfile | 5 ++++- docker/base/debian-9/Dockerfile | 5 ++++- docker/base/ubuntu-12.04/Dockerfile | 5 ++++- docker/base/ubuntu-14.04/Dockerfile | 5 ++++- docker/base/ubuntu-15.04/Dockerfile | 5 ++++- docker/base/ubuntu-15.10/Dockerfile | 5 ++++- docker/base/ubuntu-16.04/Dockerfile | 5 ++++- docker/base/ubuntu-16.10/Dockerfile | 5 ++++- docker/base/ubuntu-17.04/Dockerfile | 5 ++++- docker/base/ubuntu-17.10/Dockerfile | 5 ++++- docker/base/ubuntu-18.04/Dockerfile | 5 ++++- docker/bootstrap/alpine/Dockerfile | 6 +++++- docker/bootstrap/centos-7/Dockerfile | 6 +++++- docker/bootstrap/debian-10/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 | 6 +++++- docker/bootstrap/ubuntu-14.04/Dockerfile | 6 +++++- docker/bootstrap/ubuntu-15.04/Dockerfile | 6 +++++- docker/bootstrap/ubuntu-15.10/Dockerfile | 6 +++++- docker/bootstrap/ubuntu-16.04/Dockerfile | 6 +++++- docker/bootstrap/ubuntu-16.10/Dockerfile | 6 +++++- docker/bootstrap/ubuntu-17.04/Dockerfile | 6 +++++- docker/bootstrap/ubuntu-17.10/Dockerfile | 6 +++++- docker/bootstrap/ubuntu-18.04/Dockerfile | 6 +++++- docker/certbot/latest/Dockerfile | 5 ++++- docker/dockerfile-build-env/latest/Dockerfile | 2 ++ docker/liquibase/latest/Dockerfile | 1 + docker/liquibase/mysql/Dockerfile | 1 + docker/liquibase/postgres/Dockerfile | 1 + docker/liquidsoap/latest/Dockerfile | 5 ++++- docker/mail-sandbox/latest/Dockerfile | 5 ++++- docker/nginx-dev/alpine/Dockerfile | 1 + docker/nginx-dev/centos-7/Dockerfile | 1 + docker/nginx-dev/debian-10/Dockerfile | 1 + docker/nginx-dev/debian-7/Dockerfile | 1 + docker/nginx-dev/debian-8/Dockerfile | 1 + docker/nginx-dev/debian-9/Dockerfile | 1 + docker/nginx-dev/ubuntu-12.04/Dockerfile | 1 + docker/nginx-dev/ubuntu-14.04/Dockerfile | 1 + docker/nginx-dev/ubuntu-15.04/Dockerfile | 1 + docker/nginx-dev/ubuntu-15.10/Dockerfile | 1 + docker/nginx-dev/ubuntu-16.04/Dockerfile | 1 + docker/nginx-dev/ubuntu-16.10/Dockerfile | 1 + docker/nginx-dev/ubuntu-17.04/Dockerfile | 1 + docker/nginx-dev/ubuntu-17.10/Dockerfile | 1 + docker/nginx-dev/ubuntu-18.04/Dockerfile | 1 + docker/nginx/alpine/Dockerfile | 5 ++++- docker/nginx/centos-7/Dockerfile | 5 ++++- docker/nginx/debian-10/Dockerfile | 5 ++++- docker/nginx/debian-7/Dockerfile | 5 ++++- docker/nginx/debian-8/Dockerfile | 5 ++++- docker/nginx/debian-9/Dockerfile | 5 ++++- docker/nginx/ubuntu-12.04/Dockerfile | 5 ++++- docker/nginx/ubuntu-14.04/Dockerfile | 5 ++++- docker/nginx/ubuntu-15.04/Dockerfile | 5 ++++- docker/nginx/ubuntu-15.10/Dockerfile | 5 ++++- docker/nginx/ubuntu-16.04/Dockerfile | 5 ++++- docker/nginx/ubuntu-16.10/Dockerfile | 5 ++++- docker/nginx/ubuntu-17.04/Dockerfile | 5 ++++- docker/nginx/ubuntu-17.10/Dockerfile | 5 ++++- docker/nginx/ubuntu-18.04/Dockerfile | 5 ++++- docker/php-apache-dev/5.6/Dockerfile | 5 ++++- docker/php-apache-dev/7.0/Dockerfile | 5 ++++- docker/php-apache-dev/7.1-alpine/Dockerfile | 5 ++++- docker/php-apache-dev/7.1/Dockerfile | 5 ++++- docker/php-apache-dev/7.2-alpine/Dockerfile | 5 ++++- docker/php-apache-dev/7.2/Dockerfile | 5 ++++- docker/php-apache-dev/7.3-alpine/Dockerfile | 5 ++++- docker/php-apache-dev/7.3/Dockerfile | 5 ++++- docker/php-apache-dev/7.4-alpine/Dockerfile | 5 ++++- docker/php-apache-dev/7.4/Dockerfile | 5 ++++- docker/php-apache-dev/8.0-alpine/Dockerfile | 5 ++++- docker/php-apache-dev/8.0/Dockerfile | 5 ++++- .../php-apache-dev/centos-7-php56/Dockerfile | 5 ++++- .../php-apache-dev/centos-7-php7/Dockerfile | 5 ++++- docker/php-apache-dev/centos-7/Dockerfile | 5 ++++- docker/php-apache-dev/debian-10/Dockerfile | 5 ++++- docker/php-apache-dev/debian-7/Dockerfile | 5 ++++- .../php-apache-dev/debian-8-php7/Dockerfile | 5 ++++- docker/php-apache-dev/debian-8/Dockerfile | 5 ++++- docker/php-apache-dev/debian-9/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-12.04/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-14.04/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-15.04/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-15.10/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-16.04/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-16.10/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-17.04/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-17.10/Dockerfile | 5 ++++- docker/php-apache-dev/ubuntu-18.04/Dockerfile | 5 ++++- docker/php-apache/5.6/Dockerfile | 5 ++++- docker/php-apache/7.0/Dockerfile | 5 ++++- docker/php-apache/7.1-alpine/Dockerfile | 5 ++++- docker/php-apache/7.1/Dockerfile | 5 ++++- docker/php-apache/7.2-alpine/Dockerfile | 5 ++++- docker/php-apache/7.2/Dockerfile | 5 ++++- docker/php-apache/7.3-alpine/Dockerfile | 5 ++++- docker/php-apache/7.3/Dockerfile | 5 ++++- docker/php-apache/7.4-alpine/Dockerfile | 5 ++++- docker/php-apache/7.4/Dockerfile | 5 ++++- docker/php-apache/8.0-alpine/Dockerfile | 5 ++++- docker/php-apache/8.0/Dockerfile | 5 ++++- docker/php-apache/centos-7-php56/Dockerfile | 5 ++++- docker/php-apache/centos-7-php7/Dockerfile | 5 ++++- docker/php-apache/centos-7/Dockerfile | 5 ++++- docker/php-apache/debian-10/Dockerfile | 5 ++++- docker/php-apache/debian-7/Dockerfile | 9 +++++++-- docker/php-apache/debian-8-php7/Dockerfile | 9 +++++++-- docker/php-apache/debian-8/Dockerfile | 9 +++++++-- docker/php-apache/debian-9/Dockerfile | 5 ++++- docker/php-apache/ubuntu-12.04/Dockerfile | 5 ++++- docker/php-apache/ubuntu-14.04/Dockerfile | 5 ++++- docker/php-apache/ubuntu-15.04/Dockerfile | 5 ++++- docker/php-apache/ubuntu-15.10/Dockerfile | 5 ++++- docker/php-apache/ubuntu-16.04/Dockerfile | 5 ++++- docker/php-apache/ubuntu-16.10/Dockerfile | 5 ++++- docker/php-apache/ubuntu-17.04/Dockerfile | 5 ++++- docker/php-apache/ubuntu-17.10/Dockerfile | 5 ++++- docker/php-apache/ubuntu-18.04/Dockerfile | 5 ++++- docker/php-dev/5.6/Dockerfile | 5 ++++- docker/php-dev/7.0/Dockerfile | 5 ++++- docker/php-dev/7.1-alpine/Dockerfile | 5 ++++- docker/php-dev/7.1/Dockerfile | 5 ++++- docker/php-dev/7.2-alpine/Dockerfile | 5 ++++- docker/php-dev/7.2/Dockerfile | 5 ++++- docker/php-dev/7.3-alpine/Dockerfile | 5 ++++- docker/php-dev/7.3/Dockerfile | 5 ++++- docker/php-dev/7.4-alpine/Dockerfile | 5 ++++- docker/php-dev/7.4/Dockerfile | 5 ++++- docker/php-dev/8.0-alpine/Dockerfile | 5 ++++- docker/php-dev/8.0/Dockerfile | 5 ++++- docker/php-dev/centos-7-php56/Dockerfile | 5 ++++- docker/php-dev/centos-7-php7/Dockerfile | 5 ++++- docker/php-dev/centos-7/Dockerfile | 5 ++++- docker/php-dev/debian-10/Dockerfile | 5 ++++- docker/php-dev/debian-7/Dockerfile | 5 ++++- docker/php-dev/debian-8-php7/Dockerfile | 5 ++++- docker/php-dev/debian-8/Dockerfile | 5 ++++- docker/php-dev/debian-9/Dockerfile | 5 ++++- docker/php-dev/ubuntu-12.04/Dockerfile | 5 ++++- docker/php-dev/ubuntu-14.04/Dockerfile | 5 ++++- docker/php-dev/ubuntu-15.04/Dockerfile | 5 ++++- docker/php-dev/ubuntu-15.10/Dockerfile | 5 ++++- docker/php-dev/ubuntu-16.04/Dockerfile | 5 ++++- docker/php-dev/ubuntu-16.10/Dockerfile | 5 ++++- docker/php-dev/ubuntu-17.04/Dockerfile | 5 ++++- docker/php-dev/ubuntu-17.10/Dockerfile | 5 ++++- docker/php-dev/ubuntu-18.04/Dockerfile | 5 ++++- docker/php-nginx-dev/5.6/Dockerfile | 5 ++++- docker/php-nginx-dev/7.0/Dockerfile | 5 ++++- docker/php-nginx-dev/7.1-alpine/Dockerfile | 5 ++++- docker/php-nginx-dev/7.1/Dockerfile | 5 ++++- docker/php-nginx-dev/7.2-alpine/Dockerfile | 5 ++++- docker/php-nginx-dev/7.2/Dockerfile | 5 ++++- docker/php-nginx-dev/7.3-alpine/Dockerfile | 5 ++++- docker/php-nginx-dev/7.3/Dockerfile | 5 ++++- docker/php-nginx-dev/7.4-alpine/Dockerfile | 5 ++++- docker/php-nginx-dev/7.4/Dockerfile | 5 ++++- docker/php-nginx-dev/8.0-alpine/Dockerfile | 5 ++++- docker/php-nginx-dev/8.0/Dockerfile | 5 ++++- .../php-nginx-dev/centos-7-php56/Dockerfile | 5 ++++- docker/php-nginx-dev/centos-7-php7/Dockerfile | 5 ++++- docker/php-nginx-dev/centos-7/Dockerfile | 5 ++++- docker/php-nginx-dev/debian-10/Dockerfile | 5 ++++- docker/php-nginx-dev/debian-7/Dockerfile | 5 ++++- docker/php-nginx-dev/debian-8-php7/Dockerfile | 5 ++++- docker/php-nginx-dev/debian-8/Dockerfile | 5 ++++- docker/php-nginx-dev/debian-9/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 5 ++++- docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 5 ++++- docker/php-nginx/5.6/Dockerfile | 5 ++++- docker/php-nginx/7.0/Dockerfile | 5 ++++- docker/php-nginx/7.1-alpine/Dockerfile | 5 ++++- docker/php-nginx/7.1/Dockerfile | 5 ++++- docker/php-nginx/7.2-alpine/Dockerfile | 5 ++++- docker/php-nginx/7.2/Dockerfile | 5 ++++- docker/php-nginx/7.3-alpine/Dockerfile | 5 ++++- docker/php-nginx/7.3/Dockerfile | 5 ++++- docker/php-nginx/7.4-alpine/Dockerfile | 5 ++++- docker/php-nginx/7.4/Dockerfile | 5 ++++- docker/php-nginx/8.0-alpine/Dockerfile | 5 ++++- docker/php-nginx/8.0/Dockerfile | 5 ++++- docker/php-nginx/centos-7-php56/Dockerfile | 5 ++++- docker/php-nginx/centos-7-php7/Dockerfile | 5 ++++- docker/php-nginx/centos-7/Dockerfile | 5 ++++- docker/php-nginx/debian-10/Dockerfile | 5 ++++- docker/php-nginx/debian-7/Dockerfile | 5 ++++- docker/php-nginx/debian-8-php7/Dockerfile | 5 ++++- docker/php-nginx/debian-8/Dockerfile | 5 ++++- docker/php-nginx/debian-9/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-12.04/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-14.04/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-15.04/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-15.10/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-16.04/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-16.10/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-17.04/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-17.10/Dockerfile | 5 ++++- docker/php-nginx/ubuntu-18.04/Dockerfile | 5 ++++- docker/php-official/5.6/Dockerfile | 14 +++++++++++--- docker/php-official/7.0/Dockerfile | 14 +++++++++++--- docker/php-official/7.1-alpine/Dockerfile | 14 +++++++++++--- docker/php-official/7.1/Dockerfile | 14 +++++++++++--- docker/php-official/7.2-alpine/Dockerfile | 14 +++++++++++--- docker/php-official/7.2/Dockerfile | 14 +++++++++++--- docker/php-official/7.3-alpine/Dockerfile | 14 +++++++++++--- docker/php-official/7.3/Dockerfile | 14 +++++++++++--- docker/php-official/7.4-alpine/Dockerfile | 14 +++++++++++--- docker/php-official/7.4/Dockerfile | 14 +++++++++++--- docker/php-official/8.0-alpine/Dockerfile | 14 +++++++++++--- docker/php-official/8.0/Dockerfile | 14 +++++++++++--- docker/php/centos-7-php56/Dockerfile | 5 ++++- docker/php/centos-7-php7/Dockerfile | 5 ++++- docker/php/centos-7/Dockerfile | 5 ++++- docker/php/debian-10/Dockerfile | 5 ++++- docker/php/debian-7/Dockerfile | 5 ++++- docker/php/debian-8-php7/Dockerfile | 5 ++++- docker/php/debian-8/Dockerfile | 5 ++++- docker/php/debian-9/Dockerfile | 5 ++++- docker/php/ubuntu-12.04/Dockerfile | 5 ++++- docker/php/ubuntu-14.04/Dockerfile | 5 ++++- docker/php/ubuntu-15.04/Dockerfile | 5 ++++- docker/php/ubuntu-15.10/Dockerfile | 5 ++++- docker/php/ubuntu-16.04/Dockerfile | 5 ++++- docker/php/ubuntu-16.10/Dockerfile | 5 ++++- docker/php/ubuntu-17.04/Dockerfile | 5 ++++- docker/php/ubuntu-17.10/Dockerfile | 5 ++++- docker/php/ubuntu-18.04/Dockerfile | 5 ++++- docker/piwik/latest/Dockerfile | 5 ++++- docker/postfix/latest/Dockerfile | 5 ++++- docker/samson-deployment/latest/Dockerfile | 19 ++++++++++++++++--- docker/sphinx/latest/Dockerfile | 5 ++++- docker/ssh/latest/Dockerfile | 5 ++++- docker/storage/latest/Dockerfile | 1 + docker/toolbox/alpine/Dockerfile | 1 + docker/toolbox/buster/Dockerfile | 1 + docker/typo3-solr/3.1/Dockerfile | 2 ++ docker/typo3-solr/5.0/Dockerfile | 3 +++ docker/typo3-solr/6.0/Dockerfile | 3 +++ docker/typo3-solr/6.1/Dockerfile | 3 +++ docker/typo3-solr/6.5/Dockerfile | 3 +++ docker/typo3-solr/7.0/Dockerfile | 3 +++ docker/typo3-solr/7.5/Dockerfile | 3 +++ docker/typo3-solr/8.0/Dockerfile | 3 +++ docker/typo3-solr/8.1/Dockerfile | 3 +++ docker/varnish/latest/Dockerfile | 5 ++++- docker/vsftp/latest/Dockerfile | 5 ++++- 316 files changed, 1303 insertions(+), 312 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index 3fc0b15a0..690bac3e0 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -29,5 +30,7 @@ RUN set -x \ && chmod 750 /usr/bin/ansible* \ # Cleanup && apk del python-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 3d22b19a6..31080da2f 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -29,5 +30,7 @@ RUN set -x \ && chmod 750 /usr/bin/ansible* \ # Cleanup && yum erase -y python-devel \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 5c47c8b63..bbee6fc05 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -31,5 +32,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index f56aa8e16..e4bc5674c 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -31,5 +32,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index ad12fdc0a..ed45f3aa0 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -31,5 +32,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 9b55c13a8..ad2144414 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -30,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index dfea6f2c6..d4d5fb3ad 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -30,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 8fd984de7..d729c9c65 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -30,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 9c46035af..a7487bb37 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -30,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 6a44cb72d..98e692b7c 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -30,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index 33705aa39..9500402c0 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -30,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 04fcd594f..210484760 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index f3249e8df..1110f1182 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index b1206549a..23127be99 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index fdfa31969..9984b2af8 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 94fe63d4e..59183ace6 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 5510cc365..4e386dfe7 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index e05408760..1f976dc75 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 60ecba4f6..dbd53a002 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index e855ca243..55936e36c 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 9675977ac..41edf127d 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index bb8abc9b5..a8aea19d7 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index b21312e32..057148f35 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index f0bcf16e6..31c031826 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index a3a02a28c..bde6687c1 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index 017a0bb03..c5ef2b028 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -13,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index e966b2b04..c188c5108 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -29,7 +30,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 69a47e168..f416ac99d 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index 0cda0c858..fd6ad70cb 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -25,7 +26,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 843be55b6..6a391b1f8 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,9 +28,13 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 7c6dece3f..29ba67938 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,9 +27,13 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 688372925..57a3b2647 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -25,7 +26,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index a6a197f21..7195be9a9 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -28,7 +29,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 23fbd309f..6002db299 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -28,7 +29,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index c7be91ae1..a6ed391e3 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 7ab51c288..da291a133 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index f0c5783b4..878ed5a68 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index f6aa948df..6bd65a53c 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index 580a35ab4..e92d76d64 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index 4c153e225..0d718dc11 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index 25b293d1c..b0668c973 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index f8c1a46f4..ff4f3b7a4 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 9c67702e7..2ecde23b1 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index 711a4cc18..671fd2b50 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -29,5 +30,7 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index bfbe348eb..4d823d0a7 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -29,5 +30,7 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index c1be2e581..46e7d2cc7 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -29,5 +30,7 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 2e5ec540f..54112769a 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -29,5 +30,7 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index cf97e4d5d..91b8a062d 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index b0a7cdd58..da2d32ae5 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 85b833b6b..2b0611aad 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index f550622ad..5232ee124 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index e68f3dd67..3ca25a366 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 5d507d0a1..4eb1e89a6 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index f1f52b9ab..62149f48c 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index 63cc32a9e..dfd039217 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index 2c9ae8b08..51fc9074b 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV APPLICATION_USER=application \ @@ -30,5 +31,7 @@ RUN set -x \ patch \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 415e7f9b2..940a99f02 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -25,7 +26,9 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index e5c8e8462..f1ff58f10 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index 4cedcada7..d4b949a02 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 73d565765..78abaeb24 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index c01047f65..cf55c5b85 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 7d48879c9..bd3c3013b 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 1ff010e22..476634c0e 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 988cac374..7f1823f7f 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 9744276eb..53a39f22d 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 5d0bbd070..5cd532ab3 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index ca5ba4db7..6ac57ee96 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 060d74c64..009c6dbf2 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index fde4f03ce..3fc2a4f90 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index 0c7b37fd6..6ef6ebe7d 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index 9d90f5681..dbade6f59 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ @@ -24,7 +25,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 5dc930cbf..86de08420 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM alpine:3.11 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -58,5 +60,7 @@ RUN set -x \ ## Fix su execution (eg for tests) && mkdir -p /etc/pam.d/ \ && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index c2adb1cd4..7a358eb42 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM centos:7 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -49,5 +51,7 @@ RUN set -x \ && yum-install \ epel-release \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 1af66b150..d9bf5c9fb 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM debian:buster +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index fde132c1c..4547eb450 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM debian:7 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 62c98e94e..368d2934c 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM debian:8 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 9b0ba55d3..fe9b4df9d 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM debian:stretch +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index b0a00c62f..4af123e7b 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:12.04 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -59,5 +61,7 @@ RUN set -x \ && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index c7fb0f34a..f719c9c3c 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:14.04 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -54,5 +56,7 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 43e3d1e28..af12c4b5e 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:15.04 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -59,5 +61,7 @@ RUN set -x \ && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index e1b680a50..f9670a3eb 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:15.10 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -59,5 +61,7 @@ RUN set -x \ && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 6f8d4222c..a5fdfcae5 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:16.04 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -54,5 +56,7 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 6a402afc1..1c5c12f2c 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:16.10 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -59,5 +61,7 @@ RUN set -x \ && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 1cf4e2b13..e7b286e0f 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:17.04 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -59,5 +61,7 @@ RUN set -x \ && sed -i 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 015f15dfe..7a29f67ef 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:17.10 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -54,5 +56,7 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index ad842b899..b90d0eb60 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM ubuntu:18.04 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -54,5 +56,7 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index a85f5388c..e562c8071 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +ARG BUILDARCH ARG TARGETARCH VOLUME /etc/letsencrypt @@ -21,5 +22,7 @@ RUN set -x \ && pip install --upgrade pip \ && hash -r \ && pip install certbot \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 0f80d081e..5263d7ee5 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH RUN apt-install \ @@ -35,6 +36,7 @@ RUN apt-install \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ && cd /tmp/Dockerfile \ && make setup \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR /app diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index 645371ed3..319b23ab5 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM openjdk:8 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index a07313707..d26626ecb 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM openjdk:8 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index 327fe3b63..7923a2866 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM openjdk:8 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index 166f5480d..18853282b 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:latest +ARG BUILDARCH ARG TARGETARCH # Install services @@ -14,7 +15,9 @@ RUN /usr/local/bin/apt-install \ mplayer \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ENV LIQUIDSOAP_USER "liquidsoap" diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index c9ba2448a..76924cf55 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:latest +ARG BUILDARCH ARG TARGETARCH ENV MAILBOX_USERNAME="dev" \ @@ -19,7 +20,9 @@ RUN set -x \ dovecot-imapd \ && docker-service enable postfix \ && docker-service enable dovecot \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile index 6b2c98fe4..39e205d90 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 7484e3018..265bb473e 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-10/Dockerfile b/docker/nginx-dev/debian-10/Dockerfile index 31a51c30a..a35c950ac 100644 --- a/docker/nginx-dev/debian-10/Dockerfile +++ b/docker/nginx-dev/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 96d35688d..57509f4a9 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index d60bb4a49..b34c8ecc8 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 9df9a6228..ed6124e01 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 8cac4a312..e838440b8 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index ed10f5340..5c7fc773b 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 7cb9c399e..d56a6a817 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 261e7b22d..f0c3bff64 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index ca5e837e5..20bc51ede 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 2a69fc987..fdd57428c 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile b/docker/nginx-dev/ubuntu-17.04/Dockerfile index c79b02f3f..bda3eeb11 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile b/docker/nginx-dev/ubuntu-17.10/Dockerfile index 7149fa6a7..f2264adb8 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile b/docker/nginx-dev/ubuntu-18.04/Dockerfile index b2be85f20..8b959c272 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index 30ff0e731..c24b50394 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index f2afeb3cd..f8943407e 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install tools && yum-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index e0b2bf4ab..7a7db45da 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -23,7 +24,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index a2e8d8f39..6162675d4 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -23,7 +24,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 667bc31b7..1159ab0a0 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -23,7 +24,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index e02456111..6035b8525 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -23,7 +24,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 25a479b78..861c962b6 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 20bd9975d..221dc57f2 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index af895240d..1096645b9 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 7c90c7eeb..cd2f8f5c7 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 72b411779..fa50bf675 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 1ef814e28..fc0039d83 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index 335050c13..77d1130b5 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index 1d6532f64..9d7f45a85 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index 46a752301..a99645248 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -20,7 +21,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index b42886dc9..918d32244 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:5.6 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 51ae80813..392c2cad8 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.0 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index 8e53c406b..253768602 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.1-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -39,5 +40,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index 3c2c2996b..c3c8e95b0 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.1 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index 6bcebd315..90b03bc98 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.2-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -39,5 +40,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index 6e0333d22..47d899b08 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.2 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index 5f7d9653a..dbe2f4fdc 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.3-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -39,5 +40,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 4d56e9171..14c35d7ca 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.3 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index dfe6cab25..3b22d4981 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.4-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -39,5 +40,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index 119a86eef..79653a0d8 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.4 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 45c5f079b..7783fc9d9 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:8.0-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -33,5 +34,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index 716661ec5..01aebe2fe 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:8.0 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 9a8764a7c..11aa06d5c 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7-php56 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -33,5 +34,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index 73c75e59d..b83a4029f 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7-php7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -33,5 +34,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 7809777d8..31a2628a7 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -34,5 +35,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile index a48de4246..bb7ac1e9a 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 9ba6dc57b..ad0a99518 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 2ea0893b1..c3ae6fa35 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-8-php7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 4197c45a2..eb1a7d235 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 04716ecdf..29b4a49a1 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 6055d7d1e..da1730c24 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 5e7343f4d..0504dce51 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 823c2a92b..b898c1fb4 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index 51581739b..039a9e03a 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index c2c3ff9e8..b43cca039 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index 384e36f9d..bdb613ff4 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index 0c287e720..638db2295 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index 8df2a1a0a..e7880acff 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index b7914b966..c6f0b98e7 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index 27caadb64..a73262b82 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index 229debd75..e9beadfeb 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index 6ba8b4b08..b3d610b85 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,7 +31,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index 69cb13eb3..5f69313da 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index 89d54b043..1e42db17f 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,7 +31,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index e61502a11..3cfeff5de 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 2ab2fc3e2..01bb901e2 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,7 +31,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index 3eb5c4cb6..ea0712227 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index 3066004e6..2627365f7 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,7 +31,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index 07b2a261f..f74aed560 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index c8c82aad4..3e3897609 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,7 +31,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index 4550d69bd..5d8a6e88d 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 1dcec5ee2..c883db911 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -25,7 +26,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index ad3544c3a..f1ad4a8c9 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -25,7 +26,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 576269b8b..2f52cba64 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -25,7 +26,9 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index 2f97be691..ec7e3fb4c 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 608b4a67a..228eb4cf6 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -28,9 +29,13 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index c1718f05a..b12503fbb 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,9 +28,13 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 4201b3039..951276e75 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,9 +28,13 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 6b4b9409a..b9ad0057e 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -26,7 +27,9 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 71e63824f..1708b8624 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -29,7 +30,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 956f19cee..8bb62b631 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -29,7 +30,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 6ce5929f3..de0f9fb9d 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,7 +28,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 3bd4f60e4..5feb69bcd 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,7 +28,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 084458ca5..bf0ac2260 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,7 +28,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index 831fcf1e3..bdc066cb7 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,7 +28,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index a14e02992..558b8a385 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,7 +28,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index 3f419347e..588b562c7 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,7 +28,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index 4b06bcb8c..ad97d4ae9 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -27,7 +28,9 @@ RUN set -x \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index 1dd3414de..ce0bbb260 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -22,5 +23,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index eb1805974..76f36941f 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -22,5 +23,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index fb1371a95..5de3150f8 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -31,5 +32,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 397bdad1d..e1e4d1206 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -22,5 +23,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index 946ef3acc..3de00bd55 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -31,5 +32,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index e2733f9cd..f07593b6f 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -22,5 +23,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index 76a0d0540..795244fcd 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -31,5 +32,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 275a04a64..6605b4347 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -22,5 +23,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index fe311a40a..dd5aed129 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -31,5 +32,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 3c392e70c..549bfdb41 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -22,5 +23,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index c25fe23cd..3a4e31cae 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +26,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 1af35769c..ab209a4a2 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -22,5 +23,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index c01b17e9a..7d3e20c52 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +26,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index cdb6cee19..eea4574f7 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +26,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 0da28c05f..6c38d1337 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -26,5 +27,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index 09f439a87..76e38b42a 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 9deb2227c..338cafc38 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index a2058439d..c70a3dce8 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 507080ade..fd7538f7f 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 897ba9847..8ee9e03f6 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 6d83195ab..789c3bc3e 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 46ebf6334..9256003de 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index b4287e673..17aa6ac17 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index f7254c1e7..64047b046 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 5c91f22ec..3ea94930d 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 7be07d4c6..d082abd46 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index 90d1bbbf2..a379d1cb4 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index ab0ba6ad4..a2cf4cb45 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index f5a3c97e2..0708dc717 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -29,5 +30,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 4cdfb9e59..98d82170b 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:5.6 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index 1f9d4cff0..51de13238 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.0 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index 81f745ef7..22f895d78 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -39,5 +40,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index d34557d5a..73f5e5e1c 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index c41e2cc19..9fbcbddd0 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.2-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -39,5 +40,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index 978f4d3bf..ddd2b2ef4 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.2 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index 816981161..05e8547cd 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.3-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -39,5 +40,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index 8f99c6cb4..95155b3d1 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.3 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 92af63016..6cfd9b41b 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.4-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -39,5 +40,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index b39c408a3..528f67978 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.4 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 19aac5e6e..54a9ff7cf 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:8.0-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -33,5 +34,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index e92fa489a..8ef401040 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:8.0 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -30,5 +31,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index ab9a6252f..e777f985f 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7-php56 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -33,5 +34,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index b1c0bcdc7..b7a8cac40 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7-php7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -33,5 +34,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 02684cbef..6c0ccb9ea 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -34,5 +35,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile index c54578c55..a9b15971a 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 52b12ac92..c4980e2f0 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,6 +38,8 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 358a05548..76ed3c926 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-8-php7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index c1cf4867f..2aee3c6d0 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index 889807943..91402dc66 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index cfcbdef59..9e3b2cdaa 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,6 +38,8 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index b7184f0a7..e72103d2d 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index cc3d3e33d..65d06d540 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index fb9d8dc01..4a466ea03 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index e9158166d..32d9f6dfe 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 51406628c..c4e46c6c8 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index aa245e9cd..872cab99f 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index 1d28c8320..d249feed4 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index 6c8dca667..b22fadfb1 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -37,5 +38,7 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index 6471594fb..0f380893d 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index 3a0eb8cb7..9e4cd68b0 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index 9ab91392c..99ed97c80 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 193d5acef..64030af5a 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index c82691dc0..30c89e041 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index d15e6ff46..17dba1149 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index 296144198..ef5b19065 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index e8a0a8171..c82d5a345 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index 3fab30751..eaa964502 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index 0c73ffbb0..dcf66c66b 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index 23687c003..f4ad951d0 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index 476451899..017019778 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 9dc6ed8f9..d0ccb21af 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install tools && yum-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 99f9d7ef1..3930a7a02 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install tools && yum-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 531bdd631..481f9c73d 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install tools && yum-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index 1c23bdc51..32bda8260 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 8670af30f..6667e525c 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 65869a389..83f4ab394 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 4e9c30811..3f52cc7e3 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index af61c8f0f..48f72bcc7 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -24,7 +25,9 @@ RUN set -x \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index c82a128da..c702d0867 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index f0c4f6224..cf16419d1 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 3853f84d6..90ac8ee98 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index a4bc90f3d..70afd5756 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index a9b695bcf..5d4614a52 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 1f9bdacbe..7da53cd53 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index 390aa8d58..66d964b25 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index 1c03af37c..e22c6e753 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index 938c6c9d9..c003b05fc 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -21,7 +22,9 @@ RUN set -x \ # Install nginx && apt-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 3e60d083d..7b4bc8767 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:5.6-fpm-stretch +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -81,7 +83,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -98,7 +102,9 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -228,7 +234,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 36634aa40..9f9db4bbd 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.0-fpm-stretch +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -81,7 +83,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -98,7 +102,9 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -233,7 +239,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index b71891b43..9e09a633a 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.1-fpm-alpine +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -84,7 +86,9 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -102,7 +106,9 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -250,7 +256,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index e61adbb60..0e8ced44f 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.1-fpm-buster +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -81,7 +83,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -98,7 +102,9 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -233,7 +239,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index a65052674..7cff52bee 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.2-fpm-alpine +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -84,7 +86,9 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -102,7 +106,9 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -254,7 +260,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index f6615bc08..c853947b3 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.2-fpm-buster +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -81,7 +83,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -98,7 +102,9 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -232,7 +238,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 891a89e72..26a34a690 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.3-fpm-alpine +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -84,7 +86,9 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -102,7 +106,9 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -254,7 +260,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 2148c3da4..e04a49772 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.3-fpm-buster +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -81,7 +83,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -98,7 +102,9 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -232,7 +238,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 94e04b8ef..c177e59b7 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.4-fpm-alpine +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -84,7 +86,9 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -102,7 +106,9 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -254,7 +260,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 6afc64af8..0acf00445 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:7.4-fpm-buster +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -81,7 +83,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -98,7 +102,9 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -231,7 +237,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index d95c0e038..22466d7ac 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:8.0-fpm-alpine +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -84,7 +86,9 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -102,7 +106,9 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -252,7 +258,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index b9bc79561..d4b20a36a 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM php:8.0-fpm-buster +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -81,7 +83,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -98,7 +102,9 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -224,7 +230,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 8aa6e0b9c..d404dc6f7 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -63,7 +64,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index d4ac2b349..18172d5f6 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -67,7 +68,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index 56cbc1344..d7b11ced8 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -68,7 +69,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile index 5ef59a069..bafcd18a4 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -64,7 +65,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 06eeb4844..3bc55e23b 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-7 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -57,7 +58,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 9254cfe18..53b9f2905 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -75,7 +76,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index e772903a2..dab3c21f0 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-8 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -58,7 +59,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 1d2c70c36..5ca3b2250 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-9 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -66,7 +67,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index f211a9efc..4d841f1a3 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-12.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -58,7 +59,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 616b17f55..386f68fcd 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-14.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -59,7 +60,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 179386ff1..a939b7296 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-15.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -59,7 +60,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index b03296d08..5f906f26d 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-15.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -59,7 +60,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index d7581ee2d..eef25890e 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-16.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -66,7 +67,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 3affce675..a3e0110bd 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-16.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -66,7 +67,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile index b2968b03f..0a6735826 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-17.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -66,7 +67,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile index f5efc091a..59cc60da7 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-17.10 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -66,7 +67,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile index 0c1ca5a30..106e24c74 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-18.04 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ @@ -65,7 +66,9 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index 4d8bb0e0d..9c4f44b23 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1 +ARG BUILDARCH ARG TARGETARCH ENV WEB_DOCUMENT_ROOT /app/piwik/ @@ -20,7 +21,9 @@ RUN set -x \ && chown -R application /app \ && find /app/ -type d -exec chmod 0755 {} \; \ && find /app/ -type f -exec chmod 0644 {} \; \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup VOLUME /app diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 629edbb99..7bdbd1cd2 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:latest +ARG BUILDARCH ARG TARGETARCH COPY conf/ /opt/docker/ @@ -12,7 +13,9 @@ COPY conf/ /opt/docker/ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 25 465 587 diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 841ee649d..2acaf1b6c 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM zendesk/samson:latest +ARG BUILDARCH ARG TARGETARCH ENV TERM="xterm" \ @@ -64,6 +66,7 @@ RUN set -x \ ca-certificates \ locales \ gnupg \ + && symlink-go-replace \ && docker-image-cleanup ############################################################################### @@ -96,6 +99,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ + && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -109,7 +113,9 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ############################################################################### @@ -130,7 +136,9 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup ############################################################################### @@ -169,6 +177,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \ ## Enable ansible for deployment user && chmod 755 /usr/local/bin/ansible* \ + && symlink-go-replace \ && docker-image-cleanup # NPM stack @@ -178,6 +187,7 @@ RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \ && npm install -g grunt-cli \ && npm install -g bower \ && npm install -g npm-cache \ + && symlink-go-replace \ && docker-image-cleanup # Deployer stack @@ -194,6 +204,7 @@ RUN set -x \ && chmod +x /usr/local/bin/dep \ # Deployer: capistrano (http://capistranorb.com/) && gem install capistrano \ + && symlink-go-replace \ && docker-image-cleanup # Upload @@ -206,7 +217,9 @@ RUN rake assets:precompile \ && docker-service enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-samson-deployment \ && /opt/docker/bin/bootstrap.sh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 8524718d7..9af6ac796 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +ARG BUILDARCH ARG TARGETARCH RUN set -x \ @@ -34,5 +35,7 @@ RUN set -x \ && pip install t3fieldlisttable \ && pip install t3tablerows \ && pip install t3targets \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 1e7cc8c09..c3eced996 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -5,11 +5,14 @@ FROM --platform=$BUILDPLATFORM webdevops/base-app:latest +ARG BUILDARCH ARG TARGETARCH RUN set -x \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 22 diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index 1305ecfa0..817255a33 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -5,5 +5,6 @@ FROM --platform=$BUILDPLATFORM alpine:latest +ARG BUILDARCH ARG TARGETARCH diff --git a/docker/toolbox/alpine/Dockerfile b/docker/toolbox/alpine/Dockerfile index 8dc8b1fc2..7cec3cbb2 100644 --- a/docker/toolbox/alpine/Dockerfile +++ b/docker/toolbox/alpine/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM alpine:latest +ARG BUILDARCH ARG TARGETARCH COPY --from=ghcr.io/cocoastorm/webdevops/base-layout:latest /baselayout /baselayout diff --git a/docker/toolbox/buster/Dockerfile b/docker/toolbox/buster/Dockerfile index 79e62ce17..4bf435e64 100644 --- a/docker/toolbox/buster/Dockerfile +++ b/docker/toolbox/buster/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM debian:buster-slim +ARG BUILDARCH ARG TARGETARCH COPY --from=ghcr.io/cocoastorm/webdevops/base-layout:latest /baselayout /baselayout diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 2466cbf78..44a5c3553 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 871532bb9..e2d1d8f01 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -60,6 +62,7 @@ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && mkdir -p /opt/solr/server/solr/data \ && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ && chown -R solr:solr /opt/solr/server/solr/ \ + && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index d7ddfc29b..b239c7b63 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM solr:6.3.0 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -57,6 +59,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 2b732b1fa..a77199b77 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM solr:6.3.0 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -57,6 +59,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index da79fc064..f80cc55bb 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM solr:6.6.2 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -57,6 +59,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 96a6e5f4b..8e605cad3 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM solr:6.3.0 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -57,6 +59,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 4f3e0b813..b36a627f9 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM solr:6.6.2 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -57,6 +59,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 261892c46..8f782e518 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM solr:6.6.2 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -57,6 +59,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index c1b451ed1..9b2967a2a 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -7,6 +7,7 @@ # staged baselayout builder FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +ARG BUILDARCH ARG TARGETARCH RUN set -eux \ @@ -27,6 +28,7 @@ RUN set -eux \ FROM --platform=$BUILDPLATFORM solr:6.6.3 +ARG BUILDARCH ARG TARGETARCH LABEL maintainer=info@webdevops.io \ @@ -57,6 +59,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 189e884c0..5ddc8c586 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +ARG BUILDARCH ARG TARGETARCH ENV VARNISH_PORT 80 @@ -21,7 +22,9 @@ COPY conf/ /opt/docker/ RUN set -x \ && apk-install \ varnish \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup CMD ["varnishd"] diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index a12cb901c..1238cf7d2 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -5,6 +5,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:latest +ARG BUILDARCH ARG TARGETARCH ENV FTP_USER=application \ @@ -23,7 +24,9 @@ RUN set -x \ && mkdir -p \ /var/run/vsftpd/empty \ /var/log/supervisor \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && symlink-go-replace \ && docker-image-cleanup EXPOSE 20 21 12020 12021 12022 12023 12024 12025 From 3e2225fe2284ba59860e0205d553151593fea1b3 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 11:49:36 -0700 Subject: [PATCH 066/123] build baselayout and then toolbox image first --- .github/workflows/docker.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c4288f961..8643fa0ef 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,8 +10,26 @@ concurrency: group: "${{ github.ref }}" jobs: + build-baselayout-image: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: "Docker Build: base-layout" + uses: './.github/actions/composite-docker' + with: + registry-user: ${{ github.repository_owner }} + image-name: "webdevops/base-layout" + image-context: "docker/base-layout/latest" + image-tags: "ghcr.io/cocoastorm/webdevops/base-layout:latest" + build-toolbox-image: + needs: build-baselayout-image runs-on: ubuntu-latest + strategy: + matrix: + flavor: ["alpine", "buster"] steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -22,8 +40,8 @@ jobs: registry-user: ${{ github.repository_owner }} registry-secret: ${{ secrets.GITHUB_TOKEN }} image-name: "webdevops/toolbox" - image-context: "docker/toolbox/latest" - image-tags: "ghcr.io/cocoastorm/webdevops/toolbox:latest" + image-context: "docker/toolbox/${{ matrix.flavor }}" + image-tags: "ghcr.io/cocoastorm/webdevops/toolbox:${{ matrix.flavor }}" generate-matrix: runs-on: ubuntu-latest From 20de760505832007a12b1712d3d0b4580fcaadaf Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 11:53:08 -0700 Subject: [PATCH 067/123] baselayout image step requires registry secret --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8643fa0ef..9ebba653f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,6 +20,7 @@ jobs: uses: './.github/actions/composite-docker' with: registry-user: ${{ github.repository_owner }} + registry-secret: ${{ secrets.GITHUB_TOKEN }} image-name: "webdevops/base-layout" image-context: "docker/base-layout/latest" image-tags: "ghcr.io/cocoastorm/webdevops/base-layout:latest" From 5ef78f159b5de5d37b9a5075ecbfbc110080a6b8 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 12:09:28 -0700 Subject: [PATCH 068/123] revert changes to tools.jinja2 --- docker/bootstrap/alpine/Dockerfile | 6 +++--- docker/bootstrap/centos-7/Dockerfile | 6 +++--- docker/bootstrap/debian-10/Dockerfile | 6 +++--- docker/bootstrap/debian-7/Dockerfile | 6 +++--- docker/bootstrap/debian-8/Dockerfile | 6 +++--- docker/bootstrap/debian-9/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-12.04/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-14.04/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-15.04/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-15.10/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-16.04/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-16.10/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-17.04/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-17.10/Dockerfile | 6 +++--- docker/bootstrap/ubuntu-18.04/Dockerfile | 6 +++--- docker/php-official/5.6/Dockerfile | 6 +++--- docker/php-official/7.0/Dockerfile | 6 +++--- docker/php-official/7.1-alpine/Dockerfile | 6 +++--- docker/php-official/7.1/Dockerfile | 6 +++--- docker/php-official/7.2-alpine/Dockerfile | 6 +++--- docker/php-official/7.2/Dockerfile | 6 +++--- docker/php-official/7.3-alpine/Dockerfile | 6 +++--- docker/php-official/7.3/Dockerfile | 6 +++--- docker/php-official/7.4-alpine/Dockerfile | 6 +++--- docker/php-official/7.4/Dockerfile | 6 +++--- docker/php-official/8.0-alpine/Dockerfile | 6 +++--- docker/php-official/8.0/Dockerfile | 6 +++--- docker/samson-deployment/latest/Dockerfile | 6 +++--- docker/typo3-solr/3.1/Dockerfile | 6 +++--- docker/typo3-solr/5.0/Dockerfile | 6 +++--- docker/typo3-solr/6.0/Dockerfile | 6 +++--- docker/typo3-solr/6.1/Dockerfile | 6 +++--- docker/typo3-solr/6.5/Dockerfile | 6 +++--- docker/typo3-solr/7.0/Dockerfile | 6 +++--- docker/typo3-solr/7.5/Dockerfile | 6 +++--- docker/typo3-solr/8.0/Dockerfile | 6 +++--- docker/typo3-solr/8.1/Dockerfile | 6 +++--- template/Dockerfile/tools.jinja2 | 6 +++--- 38 files changed, 114 insertions(+), 114 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 86de08420..288fcfae1 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 7a358eb42..21017e6df 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index d9bf5c9fb..b6b84d997 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 4547eb450..bcb91e463 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 368d2934c..e6a13859e 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index fe9b4df9d..a7e471999 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 4af123e7b..6f8a361b5 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index f719c9c3c..a52cd91ec 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index af12c4b5e..ea2b4087d 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index f9670a3eb..2dbde83b2 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index a5fdfcae5..568d27443 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 1c5c12f2c..b85397c12 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index e7b286e0f..39b79a9a6 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 7a29f67ef..56f26d7d6 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index b90d0eb60..64b7500bf 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 7b4bc8767..a2683d0da 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 9f9db4bbd..67c91dfda 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 9e09a633a..312f37c07 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 0e8ced44f..a96bba4c4 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 7cff52bee..a255a2587 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index c853947b3..fbbf5d9de 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 26a34a690..40f28ebfb 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index e04a49772..e75e63561 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index c177e59b7..a90515b01 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 0acf00445..b5cb20f8f 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 22466d7ac..e5a693ea0 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index d4b20a36a..e4d627d6e 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 2acaf1b6c..2688aef9f 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 44a5c3553..7d0bd2fca 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index e2d1d8f01..08caaf03d 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index b239c7b63..83e143b6a 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index a77199b77..c6b176a2e 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index f80cc55bb..745c31607 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 8e605cad3..d345e7529 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index b36a627f9..a711c10f1 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 8f782e518..ae8048afd 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 9b2967a2a..d426f941f 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -12,12 +12,12 @@ ARG TARGETARCH RUN set -eux \ ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 94f520120..6d01a5dda 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,14 +1,14 @@ {% macro goreplace(path="/usr/local/bin", version="1.1.2") -%} ## install go-replace - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ - grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ && wget -O "{{ path }}/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/{{ version }}/gr-$grArch-linux" \ && chmod +x "{{ path }}/go-replace-$dpkgArch" {%- endmacro %} {% macro gosu(path="/sbin", version="1.10") -%} ## install gosu - dpkgArch=$([ "$TARGETARCH" != "" ] && echo "$TARGETARCH" || dpkg --print-architecture | awk -F- '{ print $NF }'); \ + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch"; \ wget -O "{{ path }}/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$dpkgArch.asc"; \ GNUPGHOME="$(mktemp -d)"; \ From 2b5d59f72f82bf4211413791f6f53955a610aca7 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 12:25:06 -0700 Subject: [PATCH 069/123] add back mkdir for baselayout builder --- docker/bootstrap/alpine/Dockerfile | 3 ++- docker/bootstrap/centos-7/Dockerfile | 3 ++- docker/bootstrap/debian-10/Dockerfile | 3 ++- docker/bootstrap/debian-7/Dockerfile | 3 ++- docker/bootstrap/debian-8/Dockerfile | 3 ++- docker/bootstrap/debian-9/Dockerfile | 3 ++- docker/bootstrap/ubuntu-12.04/Dockerfile | 3 ++- docker/bootstrap/ubuntu-14.04/Dockerfile | 3 ++- docker/bootstrap/ubuntu-15.04/Dockerfile | 3 ++- docker/bootstrap/ubuntu-15.10/Dockerfile | 3 ++- docker/bootstrap/ubuntu-16.04/Dockerfile | 3 ++- docker/bootstrap/ubuntu-16.10/Dockerfile | 3 ++- docker/bootstrap/ubuntu-17.04/Dockerfile | 3 ++- docker/bootstrap/ubuntu-17.10/Dockerfile | 3 ++- docker/bootstrap/ubuntu-18.04/Dockerfile | 3 ++- docker/php-official/5.6/Dockerfile | 3 ++- docker/php-official/7.0/Dockerfile | 3 ++- docker/php-official/7.1-alpine/Dockerfile | 3 ++- docker/php-official/7.1/Dockerfile | 3 ++- docker/php-official/7.2-alpine/Dockerfile | 3 ++- docker/php-official/7.2/Dockerfile | 3 ++- docker/php-official/7.3-alpine/Dockerfile | 3 ++- docker/php-official/7.3/Dockerfile | 3 ++- docker/php-official/7.4-alpine/Dockerfile | 3 ++- docker/php-official/7.4/Dockerfile | 3 ++- docker/php-official/8.0-alpine/Dockerfile | 3 ++- docker/php-official/8.0/Dockerfile | 3 ++- docker/samson-deployment/latest/Dockerfile | 3 ++- docker/typo3-solr/3.1/Dockerfile | 3 ++- docker/typo3-solr/5.0/Dockerfile | 3 ++- docker/typo3-solr/6.0/Dockerfile | 3 ++- docker/typo3-solr/6.1/Dockerfile | 3 ++- docker/typo3-solr/6.5/Dockerfile | 3 ++- docker/typo3-solr/7.0/Dockerfile | 3 ++- docker/typo3-solr/7.5/Dockerfile | 3 ++- docker/typo3-solr/8.0/Dockerfile | 3 ++- docker/typo3-solr/8.1/Dockerfile | 3 ++- template/Dockerfile/baselayout.jinja2 | 3 ++- 38 files changed, 76 insertions(+), 38 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 288fcfae1..e5083d680 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 21017e6df..a880e56a2 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index b6b84d997..eb305f0d9 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index bcb91e463..209fb2ce3 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index e6a13859e..caef708c6 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index a7e471999..efb1f7f82 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 6f8a361b5..49e155cc5 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index a52cd91ec..0d41e3cc9 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index ea2b4087d..e074f4138 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 2dbde83b2..8c8a7918a 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 568d27443..ef1a80390 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index b85397c12..ac8e7f942 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 39b79a9a6..aec8517dd 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 56f26d7d6..2c780578f 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 64b7500bf..8e28fecf0 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index a2683d0da..4018e310d 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 67c91dfda..5ec8046b6 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 312f37c07..bb2540c91 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index a96bba4c4..af84d71cc 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index a255a2587..ee889b798 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index fbbf5d9de..5ff9b1110 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 40f28ebfb..0a85470fa 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index e75e63561..62ed49495 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index a90515b01..f62c59f9b 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index b5cb20f8f..fd999fc17 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index e5a693ea0..674891d1b 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index e4d627d6e..69b283c72 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 2688aef9f..3e6a52130 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 7d0bd2fca..234f50eb4 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 08caaf03d..a3be5ff6a 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 83e143b6a..5aae810cb 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index c6b176a2e..49f5612de 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 745c31607..76483617b 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index d345e7529..f0ab57006 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index a711c10f1..18c6242e4 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index ae8048afd..8f08b60c0 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index d426f941f..4f104db70 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -5,12 +5,13 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:latest AS base +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index 291c3dbc0..59e73580c 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -3,11 +3,12 @@ {% macro dockerStage() %} # staged baselayout builder -{{ docker.from("toolbox", "latest", user) }} AS base +{{ docker.from("toolbox", "alpine", user) }} AS base {{ docker.platformArgs() }} RUN set -eux \ + mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ {{ tools.goreplace(path="/baselayout/usr/local/bin") }} \ {{ tools.gosu(path="/baselayout/sbin") }} {%- endmacro %} From 3ffda49695f056f3fc6e0f381d85a0e473bcce37 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 13:23:09 -0700 Subject: [PATCH 070/123] create dirs for /sbin, /usr/local/bin with /baselayout prefix --- docker/bootstrap/alpine/Dockerfile | 4 +++- docker/bootstrap/centos-7/Dockerfile | 4 +++- docker/bootstrap/debian-10/Dockerfile | 4 +++- docker/bootstrap/debian-7/Dockerfile | 4 +++- docker/bootstrap/debian-8/Dockerfile | 4 +++- docker/bootstrap/debian-9/Dockerfile | 4 +++- docker/bootstrap/ubuntu-12.04/Dockerfile | 4 +++- docker/bootstrap/ubuntu-14.04/Dockerfile | 4 +++- docker/bootstrap/ubuntu-15.04/Dockerfile | 4 +++- docker/bootstrap/ubuntu-15.10/Dockerfile | 4 +++- docker/bootstrap/ubuntu-16.04/Dockerfile | 4 +++- docker/bootstrap/ubuntu-16.10/Dockerfile | 4 +++- docker/bootstrap/ubuntu-17.04/Dockerfile | 4 +++- docker/bootstrap/ubuntu-17.10/Dockerfile | 4 +++- docker/bootstrap/ubuntu-18.04/Dockerfile | 4 +++- docker/php-official/5.6/Dockerfile | 4 +++- docker/php-official/7.0/Dockerfile | 4 +++- docker/php-official/7.1-alpine/Dockerfile | 4 +++- docker/php-official/7.1/Dockerfile | 4 +++- docker/php-official/7.2-alpine/Dockerfile | 4 +++- docker/php-official/7.2/Dockerfile | 4 +++- docker/php-official/7.3-alpine/Dockerfile | 4 +++- docker/php-official/7.3/Dockerfile | 4 +++- docker/php-official/7.4-alpine/Dockerfile | 4 +++- docker/php-official/7.4/Dockerfile | 4 +++- docker/php-official/8.0-alpine/Dockerfile | 4 +++- docker/php-official/8.0/Dockerfile | 4 +++- docker/samson-deployment/latest/Dockerfile | 4 +++- docker/toolbox/alpine/Dockerfile | 4 ++++ docker/toolbox/alpine/Dockerfile.jinja2 | 4 ++++ docker/toolbox/buster/Dockerfile | 4 ++++ docker/toolbox/buster/Dockerfile.jinja2 | 4 ++++ docker/typo3-solr/3.1/Dockerfile | 4 +++- docker/typo3-solr/5.0/Dockerfile | 4 +++- docker/typo3-solr/6.0/Dockerfile | 4 +++- docker/typo3-solr/6.1/Dockerfile | 4 +++- docker/typo3-solr/6.5/Dockerfile | 4 +++- docker/typo3-solr/7.0/Dockerfile | 4 +++- docker/typo3-solr/7.5/Dockerfile | 4 +++- docker/typo3-solr/8.0/Dockerfile | 4 +++- docker/typo3-solr/8.1/Dockerfile | 4 +++- template/Dockerfile/baselayout.jinja2 | 4 +++- 42 files changed, 130 insertions(+), 38 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index e5083d680..61343bb4f 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index a880e56a2..892bec157 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index eb305f0d9..24e7c522a 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 209fb2ce3..a84ec721f 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index caef708c6..11f772252 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index efb1f7f82..ca8816f3a 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 49e155cc5..915ca9eb4 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 0d41e3cc9..e224d311d 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index e074f4138..af61a704f 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 8c8a7918a..27182626a 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index ef1a80390..daf50a646 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index ac8e7f942..67f183548 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index aec8517dd..1a6815f19 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 2c780578f..0880a8eec 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 8e28fecf0..a282b4c70 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 4018e310d..e288ff049 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 5ec8046b6..20f0b7735 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index bb2540c91..541cdb789 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index af84d71cc..48f7fec0a 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index ee889b798..2c80a28d3 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 5ff9b1110..fa2c8a34d 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 0a85470fa..2ba610dd0 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 62ed49495..06f92e809 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index f62c59f9b..a3016fa2e 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index fd999fc17..847cddf0e 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 674891d1b..cc94a60e4 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 69b283c72..aca5235f5 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 3e6a52130..8c9130214 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/toolbox/alpine/Dockerfile b/docker/toolbox/alpine/Dockerfile index 7cec3cbb2..57ba2244f 100644 --- a/docker/toolbox/alpine/Dockerfile +++ b/docker/toolbox/alpine/Dockerfile @@ -8,6 +8,10 @@ FROM --platform=$BUILDPLATFORM alpine:latest ARG BUILDARCH ARG TARGETARCH +RUN mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin + COPY --from=ghcr.io/cocoastorm/webdevops/base-layout:latest /baselayout /baselayout RUN set -eux; \ diff --git a/docker/toolbox/alpine/Dockerfile.jinja2 b/docker/toolbox/alpine/Dockerfile.jinja2 index 9ed8942a6..d69ccf249 100644 --- a/docker/toolbox/alpine/Dockerfile.jinja2 +++ b/docker/toolbox/alpine/Dockerfile.jinja2 @@ -2,6 +2,10 @@ {{ docker.platformArgs() }} +RUN mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin + {{ docker.copy("/baselayout", "/baselayout", docker.image("base-layout", user=user)) }} RUN set -eux; \ diff --git a/docker/toolbox/buster/Dockerfile b/docker/toolbox/buster/Dockerfile index 4bf435e64..3e08871ec 100644 --- a/docker/toolbox/buster/Dockerfile +++ b/docker/toolbox/buster/Dockerfile @@ -8,6 +8,10 @@ FROM --platform=$BUILDPLATFORM debian:buster-slim ARG BUILDARCH ARG TARGETARCH +RUN mkdir -p \ + /baselayout/bin \ + /baselayout/usr/local/bin + COPY --from=ghcr.io/cocoastorm/webdevops/base-layout:latest /baselayout /baselayout RUN set -eux; \ diff --git a/docker/toolbox/buster/Dockerfile.jinja2 b/docker/toolbox/buster/Dockerfile.jinja2 index efb319a8a..a7ec23eaa 100644 --- a/docker/toolbox/buster/Dockerfile.jinja2 +++ b/docker/toolbox/buster/Dockerfile.jinja2 @@ -2,6 +2,10 @@ {{ docker.platformArgs() }} +RUN mkdir -p \ + /baselayout/bin \ + /baselayout/usr/local/bin + {{ docker.copy("/baselayout", "/baselayout", docker.image("base-layout", user=user)) }} RUN set -eux; \ diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 234f50eb4..0013d272a 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index a3be5ff6a..5b336dfb7 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 5aae810cb..fd9de3a61 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 49f5612de..6adba5f8f 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 76483617b..11da230da 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index f0ab57006..540747590 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 18c6242e4..2c6e74345 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 8f08b60c0..e55a2e588 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 4f104db70..3ff040043 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -11,7 +11,9 @@ ARG BUILDARCH ARG TARGETARCH RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ ## install go-replace && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index 59e73580c..86f67956d 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -8,7 +8,9 @@ {{ docker.platformArgs() }} RUN set -eux \ - mkdir -p /baselayout/sbin /baselayout/usr/local/bin \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ {{ tools.goreplace(path="/baselayout/usr/local/bin") }} \ {{ tools.gosu(path="/baselayout/sbin") }} {%- endmacro %} From a07d89b50855a4cc8c5b260edef6d95a80e10a67 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 13:35:02 -0700 Subject: [PATCH 071/123] base-layout has extra provisional files --- conf/provision.yml | 3 ++ .../conf/usr/local/bin/docker-arch-info | 38 ++++++++++++++ .../latest/conf/usr/local/bin/go-replace | 49 +++++++++++++++---- .../conf/usr/local/bin/symlink-go-replace | 38 ++++++++++++++ 4 files changed, 118 insertions(+), 10 deletions(-) create mode 100755 docker/base-layout/latest/conf/usr/local/bin/docker-arch-info create mode 100755 docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace diff --git a/conf/provision.yml b/conf/provision.yml index a5f37523f..a576f18f4 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -8,6 +8,9 @@ provision: base-app: configuration: base-app/general: '*' + base-layout: + configuration: + base-layout/general: '*' apache: configuration: apache/general : '*' diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info b/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info new file mode 100755 index 000000000..234e235d3 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info @@ -0,0 +1,38 @@ +#!/bin/sh + +set -e + +FILE="/opt/docker/ARCH_INFO.txt" + +printUsage() { + echo "Usage $0 " + echo "" + echo "BUILDARCH" "architecture of docker host/builder" + echo "TARGETARCH" "architecture of the final docker image" + echo "" + + exit 1 +} + +if [ $# -eq 0 ] || [ $# -gt 2 ]; then + printUsage + exit 2 +fi + +if [ $# -eq 1 ]; then + BUILDARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" + TARGETARCH="$2" +fi + +if [ $# -eq 2 ]; then + BUILDARCH="$1" + TARGETARCH="$2" +fi + +mkdir -p "$(dirname $FILE)" +echo "storing to $FILE" + +{ + echo "BUILDARCH=${BUILDARCH}"; \ + echo "TARGETARCH=${TARGETARCH}"; \ +} > $FILE diff --git a/docker/base-layout/latest/conf/usr/local/bin/go-replace b/docker/base-layout/latest/conf/usr/local/bin/go-replace index de5b26a98..1dbab145c 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/go-replace +++ b/docker/base-layout/latest/conf/usr/local/bin/go-replace @@ -2,23 +2,52 @@ set -e -ARCH=$(dpkg --print-architecture | awk -F- '{ print $NF }') VERSION="1.1.2" -case "$ARCH" in \ - amd64) GR_ARCH='64';; \ - arm64) GR_ARCH='arm64';; \ - *) echo "unsupported architecture"; exit 1 ;; \ -esac +if command -v dpkg > /dev/null; then + ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" +fi + +download() { + case "$1" in \ + amd64) GR_ARCH='64';; \ + arm64) GR_ARCH='arm64';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac -downloadGoReplace() { + ARCH=$1 echo "downloading go-replace-$GR_ARCH" wget -O "/usr/local/bin/go-replace-$ARCH" "https://github.com/webdevops/goreplace/releases/download/$VERSION/gr-$GR_ARCH-linux" chmod +x "/usr/local/bin/go-replace-$ARCH" } -if [ ! -x "/usr/local/bin/go-replace-$ARCH" ]; then - downloadGoReplace +if [ -f "/opt/docker/ARCH_INFO.txt" ]; then + ARCH_FILE="/opt/docker/ARCH_INFO.txt" + while IFS="=" read -r key value; do + case "$key" in + "BUILDARCH") BUILDARCH="$value" ;; + "TARGETARCH") TARGETARCH="$value" ;; + esac + done < "$ARCH_FILE" fi -exec "/usr/local/bin/go-replace-$ARCH" $@ +if ! [ -n "$BUILDARCH" ]; then + if ! command -v dpkg > /dev/null; then + echo "dpkg not installed and BUILDARCH was not found" + exit 2 + fi + + BUILDARCH="$ARCH" +fi + +for TARGET in "$BUILDARCH" "$TARGETARCH"; do + if [ -n "$TARGET" ] && [ ! -x "/usr/local/bin/go-replace-$TARGET" ]; then + download "$TARGET" + fi +done + +if [ -n "$BUILDARCH" ]; then + exec "/usr/local/bin/go-replace-$BUILDARCH" "$@" +else + exec "/usr/local/bin/go-replace-$ARCH" "$@" +fi diff --git a/docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace b/docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace new file mode 100755 index 000000000..a7eebb305 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace @@ -0,0 +1,38 @@ +#!/bin/sh + +set -e + +ARCH_FILE="/opt/docker/ARCH_INFO.txt" +GO_REPLACE="/usr/local/bin/go-replace" + +if [ -f "$ARCH_FILE" ]; then + while IFS="=" read -r key value; do + case "$key" in + "BUILDARCH") BUILDARCH="$value" ;; + "TARGETARCH") TARGETARCH="$value" ;; + esac + done < "$ARCH_FILE" + + # remove arch info file + rm -f -- "$ARCH_FILE" +else + echo "WARNING: arch file not found, symlinking to amd64" +fi + +symlinkBinary() { + symlink_target="/usr/local/bin/go-replace-$1" + + if [ ! -f "$symlink_target" ]; then + echo "error: $symlink_target not found" + exit 2 + fi + + rm -f -- "$GO_REPLACE" + ln -sf "$GO_REPLACE" "/usr/local/bin/go-replace-$1" +} + +if [ -n "$TARGETARCH" ]; then + symlinkBinary "amd64" +else + symlinkBinary "$TARGETARCH" +fi From f90cacaec03cef9d75d449cdd7606a1f4cb4e4cd Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 14:51:37 -0700 Subject: [PATCH 072/123] fix go-replace scripts --- docker/ansible/alpine/Dockerfile | 1 - docker/ansible/centos-7/Dockerfile | 1 - docker/ansible/debian-7/Dockerfile | 1 - docker/ansible/debian-8/Dockerfile | 1 - docker/ansible/debian-9/Dockerfile | 1 - docker/ansible/ubuntu-12.04/Dockerfile | 1 - docker/ansible/ubuntu-14.04/Dockerfile | 1 - docker/ansible/ubuntu-15.04/Dockerfile | 1 - docker/ansible/ubuntu-15.10/Dockerfile | 1 - docker/ansible/ubuntu-16.04/Dockerfile | 1 - docker/ansible/ubuntu-17.04/Dockerfile | 1 - docker/apache-dev/alpine/Dockerfile | 1 - docker/apache-dev/centos-7/Dockerfile | 1 - docker/apache-dev/debian-10/Dockerfile | 1 - docker/apache-dev/debian-7/Dockerfile | 1 - docker/apache-dev/debian-8/Dockerfile | 1 - docker/apache-dev/debian-9/Dockerfile | 1 - docker/apache-dev/ubuntu-12.04/Dockerfile | 1 - docker/apache-dev/ubuntu-14.04/Dockerfile | 1 - docker/apache-dev/ubuntu-15.04/Dockerfile | 1 - docker/apache-dev/ubuntu-15.10/Dockerfile | 1 - docker/apache-dev/ubuntu-16.04/Dockerfile | 1 - docker/apache-dev/ubuntu-16.10/Dockerfile | 1 - docker/apache-dev/ubuntu-17.04/Dockerfile | 1 - docker/apache-dev/ubuntu-17.10/Dockerfile | 1 - docker/apache-dev/ubuntu-18.04/Dockerfile | 1 - docker/apache/alpine/Dockerfile | 1 - docker/apache/centos-7/Dockerfile | 1 - docker/apache/debian-10/Dockerfile | 1 - docker/apache/debian-7/Dockerfile | 2 - docker/apache/debian-8/Dockerfile | 2 - docker/apache/debian-9/Dockerfile | 1 - docker/apache/ubuntu-12.04/Dockerfile | 1 - docker/apache/ubuntu-14.04/Dockerfile | 1 - docker/apache/ubuntu-15.04/Dockerfile | 1 - docker/apache/ubuntu-15.10/Dockerfile | 1 - docker/apache/ubuntu-16.04/Dockerfile | 1 - docker/apache/ubuntu-16.10/Dockerfile | 1 - docker/apache/ubuntu-17.04/Dockerfile | 1 - docker/apache/ubuntu-17.10/Dockerfile | 1 - docker/apache/ubuntu-18.04/Dockerfile | 1 - docker/base-app/alpine/Dockerfile | 1 - docker/base-app/centos-7/Dockerfile | 1 - docker/base-app/debian-10/Dockerfile | 1 - docker/base-app/debian-7/Dockerfile | 1 - docker/base-app/debian-8/Dockerfile | 1 - docker/base-app/debian-9/Dockerfile | 1 - docker/base-app/ubuntu-12.04/Dockerfile | 1 - docker/base-app/ubuntu-14.04/Dockerfile | 1 - docker/base-app/ubuntu-15.04/Dockerfile | 1 - docker/base-app/ubuntu-15.10/Dockerfile | 1 - docker/base-app/ubuntu-16.04/Dockerfile | 1 - docker/base-app/ubuntu-16.10/Dockerfile | 1 - docker/base-app/ubuntu-17.04/Dockerfile | 1 - docker/base-app/ubuntu-17.10/Dockerfile | 1 - docker/base-app/ubuntu-18.04/Dockerfile | 1 - .../latest/conf/usr/local/bin/go-replace | 13 +----- .../conf/usr/local/bin/install-go-replace | 44 +++++++++++++++++++ .../conf/usr/local/bin/symlink-go-replace | 11 +++-- docker/base/alpine/Dockerfile | 1 - docker/base/centos-7/Dockerfile | 1 - docker/base/debian-10/Dockerfile | 1 - docker/base/debian-7/Dockerfile | 1 - docker/base/debian-8/Dockerfile | 1 - docker/base/debian-9/Dockerfile | 1 - docker/base/ubuntu-12.04/Dockerfile | 1 - docker/base/ubuntu-14.04/Dockerfile | 1 - docker/base/ubuntu-15.04/Dockerfile | 1 - docker/base/ubuntu-15.10/Dockerfile | 1 - docker/base/ubuntu-16.04/Dockerfile | 1 - docker/base/ubuntu-16.10/Dockerfile | 1 - docker/base/ubuntu-17.04/Dockerfile | 1 - docker/base/ubuntu-17.10/Dockerfile | 1 - docker/base/ubuntu-18.04/Dockerfile | 1 - docker/bootstrap/alpine/Dockerfile | 1 - docker/bootstrap/centos-7/Dockerfile | 1 - docker/bootstrap/ubuntu-12.04/Dockerfile | 1 - docker/bootstrap/ubuntu-14.04/Dockerfile | 1 - docker/bootstrap/ubuntu-15.04/Dockerfile | 1 - docker/bootstrap/ubuntu-15.10/Dockerfile | 1 - docker/bootstrap/ubuntu-16.04/Dockerfile | 1 - docker/bootstrap/ubuntu-16.10/Dockerfile | 1 - docker/bootstrap/ubuntu-17.04/Dockerfile | 1 - docker/bootstrap/ubuntu-17.10/Dockerfile | 1 - docker/bootstrap/ubuntu-18.04/Dockerfile | 1 - docker/certbot/latest/Dockerfile | 1 - docker/dockerfile-build-env/latest/Dockerfile | 1 - docker/liquidsoap/latest/Dockerfile | 1 - docker/mail-sandbox/latest/Dockerfile | 1 - docker/nginx/alpine/Dockerfile | 1 - docker/nginx/centos-7/Dockerfile | 1 - docker/nginx/debian-10/Dockerfile | 1 - docker/nginx/debian-7/Dockerfile | 1 - docker/nginx/debian-8/Dockerfile | 1 - docker/nginx/debian-9/Dockerfile | 1 - docker/nginx/ubuntu-12.04/Dockerfile | 1 - docker/nginx/ubuntu-14.04/Dockerfile | 1 - docker/nginx/ubuntu-15.04/Dockerfile | 1 - docker/nginx/ubuntu-15.10/Dockerfile | 1 - docker/nginx/ubuntu-16.04/Dockerfile | 1 - docker/nginx/ubuntu-16.10/Dockerfile | 1 - docker/nginx/ubuntu-17.04/Dockerfile | 1 - docker/nginx/ubuntu-17.10/Dockerfile | 1 - docker/nginx/ubuntu-18.04/Dockerfile | 1 - docker/php-apache-dev/5.6/Dockerfile | 1 - docker/php-apache-dev/7.0/Dockerfile | 1 - docker/php-apache-dev/7.1-alpine/Dockerfile | 1 - docker/php-apache-dev/7.1/Dockerfile | 1 - docker/php-apache-dev/7.2-alpine/Dockerfile | 1 - docker/php-apache-dev/7.2/Dockerfile | 1 - docker/php-apache-dev/7.3-alpine/Dockerfile | 1 - docker/php-apache-dev/7.3/Dockerfile | 1 - docker/php-apache-dev/7.4-alpine/Dockerfile | 1 - docker/php-apache-dev/7.4/Dockerfile | 1 - docker/php-apache-dev/8.0-alpine/Dockerfile | 1 - docker/php-apache-dev/8.0/Dockerfile | 1 - .../php-apache-dev/centos-7-php56/Dockerfile | 1 - .../php-apache-dev/centos-7-php7/Dockerfile | 1 - docker/php-apache-dev/centos-7/Dockerfile | 1 - docker/php-apache-dev/debian-10/Dockerfile | 1 - docker/php-apache-dev/debian-7/Dockerfile | 1 - .../php-apache-dev/debian-8-php7/Dockerfile | 1 - docker/php-apache-dev/debian-8/Dockerfile | 1 - docker/php-apache-dev/debian-9/Dockerfile | 1 - docker/php-apache-dev/ubuntu-12.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-14.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-15.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-15.10/Dockerfile | 1 - docker/php-apache-dev/ubuntu-16.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-16.10/Dockerfile | 1 - docker/php-apache-dev/ubuntu-17.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-17.10/Dockerfile | 1 - docker/php-apache-dev/ubuntu-18.04/Dockerfile | 1 - docker/php-apache/5.6/Dockerfile | 1 - docker/php-apache/7.0/Dockerfile | 1 - docker/php-apache/7.1-alpine/Dockerfile | 1 - docker/php-apache/7.1/Dockerfile | 1 - docker/php-apache/7.2-alpine/Dockerfile | 1 - docker/php-apache/7.2/Dockerfile | 1 - docker/php-apache/7.3-alpine/Dockerfile | 1 - docker/php-apache/7.3/Dockerfile | 1 - docker/php-apache/7.4-alpine/Dockerfile | 1 - docker/php-apache/7.4/Dockerfile | 1 - docker/php-apache/8.0-alpine/Dockerfile | 1 - docker/php-apache/8.0/Dockerfile | 1 - docker/php-apache/centos-7-php56/Dockerfile | 1 - docker/php-apache/centos-7-php7/Dockerfile | 1 - docker/php-apache/centos-7/Dockerfile | 1 - docker/php-apache/debian-10/Dockerfile | 1 - 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 | 1 - docker/php-apache/ubuntu-12.04/Dockerfile | 1 - docker/php-apache/ubuntu-14.04/Dockerfile | 1 - docker/php-apache/ubuntu-15.04/Dockerfile | 1 - docker/php-apache/ubuntu-15.10/Dockerfile | 1 - docker/php-apache/ubuntu-16.04/Dockerfile | 1 - docker/php-apache/ubuntu-16.10/Dockerfile | 1 - docker/php-apache/ubuntu-17.04/Dockerfile | 1 - docker/php-apache/ubuntu-17.10/Dockerfile | 1 - docker/php-apache/ubuntu-18.04/Dockerfile | 1 - docker/php-dev/5.6/Dockerfile | 1 - docker/php-dev/7.0/Dockerfile | 1 - docker/php-dev/7.1-alpine/Dockerfile | 1 - docker/php-dev/7.1/Dockerfile | 1 - docker/php-dev/7.2-alpine/Dockerfile | 1 - docker/php-dev/7.2/Dockerfile | 1 - docker/php-dev/7.3-alpine/Dockerfile | 1 - docker/php-dev/7.3/Dockerfile | 1 - docker/php-dev/7.4-alpine/Dockerfile | 1 - docker/php-dev/7.4/Dockerfile | 1 - docker/php-dev/8.0-alpine/Dockerfile | 1 - docker/php-dev/8.0/Dockerfile | 1 - docker/php-dev/centos-7-php56/Dockerfile | 1 - docker/php-dev/centos-7-php7/Dockerfile | 1 - docker/php-dev/centos-7/Dockerfile | 1 - docker/php-dev/debian-10/Dockerfile | 1 - docker/php-dev/debian-7/Dockerfile | 1 - docker/php-dev/debian-8-php7/Dockerfile | 1 - docker/php-dev/debian-8/Dockerfile | 1 - docker/php-dev/debian-9/Dockerfile | 1 - docker/php-dev/ubuntu-12.04/Dockerfile | 1 - docker/php-dev/ubuntu-14.04/Dockerfile | 1 - docker/php-dev/ubuntu-15.04/Dockerfile | 1 - docker/php-dev/ubuntu-15.10/Dockerfile | 1 - docker/php-dev/ubuntu-16.04/Dockerfile | 1 - docker/php-dev/ubuntu-16.10/Dockerfile | 1 - docker/php-dev/ubuntu-17.04/Dockerfile | 1 - docker/php-dev/ubuntu-17.10/Dockerfile | 1 - docker/php-dev/ubuntu-18.04/Dockerfile | 1 - docker/php-nginx-dev/5.6/Dockerfile | 1 - docker/php-nginx-dev/7.0/Dockerfile | 1 - docker/php-nginx-dev/7.1-alpine/Dockerfile | 1 - docker/php-nginx-dev/7.1/Dockerfile | 1 - docker/php-nginx-dev/7.2-alpine/Dockerfile | 1 - docker/php-nginx-dev/7.2/Dockerfile | 1 - docker/php-nginx-dev/7.3-alpine/Dockerfile | 1 - docker/php-nginx-dev/7.3/Dockerfile | 1 - docker/php-nginx-dev/7.4-alpine/Dockerfile | 1 - docker/php-nginx-dev/7.4/Dockerfile | 1 - docker/php-nginx-dev/8.0-alpine/Dockerfile | 1 - docker/php-nginx-dev/8.0/Dockerfile | 1 - .../php-nginx-dev/centos-7-php56/Dockerfile | 1 - docker/php-nginx-dev/centos-7-php7/Dockerfile | 1 - docker/php-nginx-dev/centos-7/Dockerfile | 1 - docker/php-nginx-dev/debian-10/Dockerfile | 1 - docker/php-nginx-dev/debian-7/Dockerfile | 1 - docker/php-nginx-dev/debian-8-php7/Dockerfile | 1 - docker/php-nginx-dev/debian-8/Dockerfile | 1 - docker/php-nginx-dev/debian-9/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 1 - docker/php-nginx/5.6/Dockerfile | 1 - docker/php-nginx/7.0/Dockerfile | 1 - docker/php-nginx/7.1-alpine/Dockerfile | 1 - docker/php-nginx/7.1/Dockerfile | 1 - docker/php-nginx/7.2-alpine/Dockerfile | 1 - docker/php-nginx/7.2/Dockerfile | 1 - docker/php-nginx/7.3-alpine/Dockerfile | 1 - docker/php-nginx/7.3/Dockerfile | 1 - docker/php-nginx/7.4-alpine/Dockerfile | 1 - docker/php-nginx/7.4/Dockerfile | 1 - docker/php-nginx/8.0-alpine/Dockerfile | 1 - docker/php-nginx/8.0/Dockerfile | 1 - docker/php-nginx/centos-7-php56/Dockerfile | 1 - docker/php-nginx/centos-7-php7/Dockerfile | 1 - docker/php-nginx/centos-7/Dockerfile | 1 - docker/php-nginx/debian-10/Dockerfile | 1 - docker/php-nginx/debian-7/Dockerfile | 1 - docker/php-nginx/debian-8-php7/Dockerfile | 1 - docker/php-nginx/debian-8/Dockerfile | 1 - docker/php-nginx/debian-9/Dockerfile | 1 - docker/php-nginx/ubuntu-12.04/Dockerfile | 1 - docker/php-nginx/ubuntu-14.04/Dockerfile | 1 - docker/php-nginx/ubuntu-15.04/Dockerfile | 1 - docker/php-nginx/ubuntu-15.10/Dockerfile | 1 - docker/php-nginx/ubuntu-16.04/Dockerfile | 1 - docker/php-nginx/ubuntu-16.10/Dockerfile | 1 - docker/php-nginx/ubuntu-17.04/Dockerfile | 1 - docker/php-nginx/ubuntu-17.10/Dockerfile | 1 - docker/php-nginx/ubuntu-18.04/Dockerfile | 1 - docker/php-official/5.6/Dockerfile | 3 -- docker/php-official/7.0/Dockerfile | 3 -- docker/php-official/7.1-alpine/Dockerfile | 3 -- docker/php-official/7.1/Dockerfile | 3 -- docker/php-official/7.2-alpine/Dockerfile | 3 -- docker/php-official/7.2/Dockerfile | 3 -- docker/php-official/7.3-alpine/Dockerfile | 3 -- docker/php-official/7.3/Dockerfile | 3 -- docker/php-official/7.4-alpine/Dockerfile | 3 -- docker/php-official/7.4/Dockerfile | 3 -- docker/php-official/8.0-alpine/Dockerfile | 4 -- .../php-official/8.0-alpine/Dockerfile.jinja2 | 2 +- docker/php-official/8.0/Dockerfile | 3 -- docker/php/centos-7-php56/Dockerfile | 1 - docker/php/centos-7-php7/Dockerfile | 1 - docker/php/centos-7/Dockerfile | 1 - docker/php/debian-10/Dockerfile | 1 - docker/php/debian-7/Dockerfile | 1 - docker/php/debian-8-php7/Dockerfile | 1 - docker/php/debian-8/Dockerfile | 1 - docker/php/debian-9/Dockerfile | 1 - docker/php/ubuntu-12.04/Dockerfile | 1 - docker/php/ubuntu-14.04/Dockerfile | 1 - docker/php/ubuntu-15.04/Dockerfile | 1 - docker/php/ubuntu-15.10/Dockerfile | 1 - docker/php/ubuntu-16.04/Dockerfile | 1 - docker/php/ubuntu-16.10/Dockerfile | 1 - docker/php/ubuntu-17.04/Dockerfile | 1 - docker/php/ubuntu-17.10/Dockerfile | 1 - docker/php/ubuntu-18.04/Dockerfile | 1 - docker/piwik/latest/Dockerfile | 1 - docker/postfix/latest/Dockerfile | 1 - docker/samson-deployment/latest/Dockerfile | 8 ---- docker/sphinx/latest/Dockerfile | 1 - docker/ssh/latest/Dockerfile | 1 - docker/typo3-solr/5.0/Dockerfile | 1 - docker/typo3-solr/6.0/Dockerfile | 1 - docker/typo3-solr/6.1/Dockerfile | 1 - docker/typo3-solr/6.5/Dockerfile | 1 - docker/typo3-solr/7.0/Dockerfile | 1 - docker/typo3-solr/7.5/Dockerfile | 1 - docker/typo3-solr/8.0/Dockerfile | 1 - docker/typo3-solr/8.1/Dockerfile | 1 - docker/varnish/latest/Dockerfile | 1 - docker/vsftp/latest/Dockerfile | 1 - .../general/usr/local/bin/go-replace | 13 +----- .../general/usr/local/bin/install-go-replace | 44 +++++++++++++++++++ .../general/usr/local/bin/symlink-go-replace | 11 +++-- template/Dockerfile/docker.jinja2 | 1 - template/Dockerfile/provision.jinja2 | 4 ++ 299 files changed, 113 insertions(+), 357 deletions(-) create mode 100755 docker/base-layout/latest/conf/usr/local/bin/install-go-replace create mode 100755 provisioning/base-layout/general/usr/local/bin/install-go-replace diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index 690bac3e0..2814aaf25 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && apk del python-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 31080da2f..889932cc5 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && yum erase -y python-devel \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index bbee6fc05..720b393c7 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -34,5 +34,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index e4bc5674c..4b4de2906 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -34,5 +34,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index ed45f3aa0..cf672acee 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -34,5 +34,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index ad2144414..3d484edf1 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index d4d5fb3ad..642e0a00a 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index d729c9c65..6ecda5dc1 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index a7487bb37..0796fc143 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 98e692b7c..a635097ae 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index 9500402c0..9688e246a 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 210484760..ac909922a 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 1110f1182..8ffbd2121 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index 23127be99..b158b763d 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 9984b2af8..fce845007 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 59183ace6..cb2996400 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 4e386dfe7..ece01a650 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 1f976dc75..2c1242444 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index dbd53a002..31b6fcde9 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 55936e36c..7e9161eb4 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 41edf127d..007d87ba4 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index a8aea19d7..14aa86f45 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 057148f35..852deaedf 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index 31c031826..383b6c546 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index bde6687c1..323444832 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index c5ef2b028..95108be02 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index c188c5108..0ead92d46 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -32,7 +32,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index f416ac99d..761e38b47 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index fd6ad70cb..c506b3cac 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 6a391b1f8..c43a62fda 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -30,11 +30,9 @@ RUN set -x \ && a2enmod actions fastcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 29ba67938..ab45c0dca 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -29,11 +29,9 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 57a3b2647..1f2654d99 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 7195be9a9..a90e2d666 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -31,7 +31,6 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 6002db299..02805a705 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -31,7 +31,6 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index a6ed391e3..88b07ea26 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index da291a133..e13c629fe 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 878ed5a68..6e3dea19d 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index 6bd65a53c..73318f7e9 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index e92d76d64..21611abf7 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index 0d718dc11..f9b9cbf53 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index b0668c973..76c05d0d8 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index ff4f3b7a4..56332b50b 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 2ecde23b1..cc473de0a 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index 671fd2b50..eec4e7c53 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 4d823d0a7..af993153c 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 46e7d2cc7..4d30bf369 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 54112769a..ef401dcb8 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 91b8a062d..da856c726 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index da2d32ae5..57ccc7420 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 2b0611aad..d240523e5 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 5232ee124..9af28365b 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 3ca25a366..2dc7dcf33 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 4eb1e89a6..9b4e63982 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index 62149f48c..aaa43d972 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index dfd039217..c0bb15d05 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index 51fc9074b..d4cfa2b2c 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/base-layout/latest/conf/usr/local/bin/go-replace b/docker/base-layout/latest/conf/usr/local/bin/go-replace index 1dbab145c..27ba754da 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/go-replace +++ b/docker/base-layout/latest/conf/usr/local/bin/go-replace @@ -9,16 +9,7 @@ if command -v dpkg > /dev/null; then fi download() { - case "$1" in \ - amd64) GR_ARCH='64';; \ - arm64) GR_ARCH='arm64';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac - - ARCH=$1 - echo "downloading go-replace-$GR_ARCH" - wget -O "/usr/local/bin/go-replace-$ARCH" "https://github.com/webdevops/goreplace/releases/download/$VERSION/gr-$GR_ARCH-linux" - chmod +x "/usr/local/bin/go-replace-$ARCH" + /usr/local/bin/install-go-replace "$1" } if [ -f "/opt/docker/ARCH_INFO.txt" ]; then @@ -31,7 +22,7 @@ if [ -f "/opt/docker/ARCH_INFO.txt" ]; then done < "$ARCH_FILE" fi -if ! [ -n "$BUILDARCH" ]; then +if [ ! -n "$BUILDARCH" ]; then if ! command -v dpkg > /dev/null; then echo "dpkg not installed and BUILDARCH was not found" exit 2 diff --git a/docker/base-layout/latest/conf/usr/local/bin/install-go-replace b/docker/base-layout/latest/conf/usr/local/bin/install-go-replace new file mode 100755 index 000000000..bdf7d54a9 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/install-go-replace @@ -0,0 +1,44 @@ +#!/bin/sh + +set -e + +VERSION="1.1.2" +INSTALL_DIR="/usr/local/bin" + +install() { + ARCH="$1" + + case "$1" in \ + amd64) GR_ARCH='64';; \ + arm64) GR_ARCH='arm64';; \ + *) echo 'defaulting to amd64'; ARCH="amd64"; GR_ARCH='64' ;; \ + esac + + BIN_FMT="go-replace-$ARCH" + + if [ -f "$INSTALL_DIR/$BIN_FMT" ]; then + echo "go-replace-$ARCH exists" + return + fi + + echo "downloading go-replace-$GR_ARCH" + wget -O "$INSTALL_DIR/$BIN_FMT" "https://github.com/webdevops/goreplace/releases/download/$VERSION/gr-$GR_ARCH-linux" + chmod +x "$INSTALL_DIR/$BIN_FMT" +} + +if [ "$#" -eq 0 ]; then + echo "usage: $0 " + echo "" + echo "ARCH) either amd64 or arm64 or all" + exit 2 +fi + +if [ "$1" == "all" ]; then + for target in "amd64 arm64" + do + install "$target" + done +else + echo "$1" + install "$1" +fi diff --git a/docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace b/docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace index a7eebb305..2287ef1c0 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace +++ b/docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace @@ -19,19 +19,24 @@ else echo "WARNING: arch file not found, symlinking to amd64" fi +download() { + /usr/local/bin/install-go-replace "$1" +} + symlinkBinary() { symlink_target="/usr/local/bin/go-replace-$1" if [ ! -f "$symlink_target" ]; then - echo "error: $symlink_target not found" + echo "$symlink_target not found, attempting to install:" + download "$1" exit 2 fi rm -f -- "$GO_REPLACE" - ln -sf "$GO_REPLACE" "/usr/local/bin/go-replace-$1" + ln -sf "/usr/local/bin/go-replace-$1" "$GO_REPLACE" } -if [ -n "$TARGETARCH" ]; then +if [ ! -n "$TARGETARCH" ]; then symlinkBinary "amd64" else symlinkBinary "$TARGETARCH" diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 940a99f02..e1b691348 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index f1ff58f10..14d8aea9e 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index d4b949a02..88e83b672 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 78abaeb24..aa90f051d 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index cf55c5b85..9512914d4 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index bd3c3013b..68335a548 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 476634c0e..5cc1f13a2 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 7f1823f7f..3580ac5b8 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 53a39f22d..378793f50 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 5cd532ab3..cdf40ad69 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 6ac57ee96..ec08a16a4 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 009c6dbf2..f83f27bc8 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index 3fc2a4f90..8f5ac467a 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index 6ef6ebe7d..14d3c31bd 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index dbade6f59..278d54515 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 61343bb4f..4ce17bc6e 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -65,5 +65,4 @@ RUN set -x \ && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 892bec157..16a4619ac 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -56,5 +56,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 915ca9eb4..898daec25 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -66,5 +66,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index e224d311d..6d5c5e0e8 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -61,5 +61,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index af61a704f..1e5aa3538 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -66,5 +66,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 27182626a..62e124d01 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -66,5 +66,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index daf50a646..a4fd6864f 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -61,5 +61,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 67f183548..4148c9ff1 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -66,5 +66,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 1a6815f19..bd465411f 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -66,5 +66,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 0880a8eec..b8ae45d41 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -61,5 +61,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index a282b4c70..287acda0c 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -61,5 +61,4 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index e562c8071..5739a264d 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -24,5 +24,4 @@ RUN set -x \ && pip install certbot \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 5263d7ee5..08537550b 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -36,7 +36,6 @@ RUN apt-install \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ && cd /tmp/Dockerfile \ && make setup \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR /app diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index 18853282b..20aadf07b 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -17,7 +17,6 @@ RUN /usr/local/bin/apt-install \ gstreamer1.0-plugins-good \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ENV LIQUIDSOAP_USER "liquidsoap" diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 76924cf55..775e383b3 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -22,7 +22,6 @@ RUN set -x \ && docker-service enable dovecot \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index c24b50394..0c65dfa32 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index f8943407e..b8383871b 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index 7a7db45da..15948cef2 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -26,7 +26,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 6162675d4..0bcf5a283 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -26,7 +26,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 1159ab0a0..ea276e730 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -26,7 +26,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 6035b8525..83c0bb323 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -26,7 +26,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 861c962b6..b6ea813f4 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 221dc57f2..a4a13bbf8 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 1096645b9..eee197354 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index cd2f8f5c7..8c7001269 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index fa50bf675..64f0937a9 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index fc0039d83..0c786907d 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index 77d1130b5..1f27b99ed 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index 9d7f45a85..68b584659 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index a99645248..dc213b0db 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index 918d32244..da9ced1d3 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 392c2cad8..5e033f83c 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index 253768602..a06489655 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -42,5 +42,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index c3c8e95b0..8952ef8c6 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index 90b03bc98..c11f36227 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -42,5 +42,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index 47d899b08..e87a929bf 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index dbe2f4fdc..465e57318 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -42,5 +42,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 14c35d7ca..46bea5a9a 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index 3b22d4981..cd38d7bf7 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -42,5 +42,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index 79653a0d8..92f4ca29f 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 7783fc9d9..9389d8c21 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -36,5 +36,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index 01aebe2fe..0a11b0b93 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 11aa06d5c..cf57c70a1 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -36,5 +36,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index b83a4029f..f8a397490 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -36,5 +36,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 31a2628a7..ad1ad4cdb 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -37,5 +37,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile index bb7ac1e9a..db64d44b9 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index ad0a99518..9c3d61489 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index c3ae6fa35..af66a9c38 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index eb1a7d235..920a4cd44 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 29b4a49a1..4c90de54c 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index da1730c24..920a463c7 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 0504dce51..647bf8e94 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index b898c1fb4..2eed98a54 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index 039a9e03a..d0ea9503e 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index b43cca039..5069fde33 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index bdb613ff4..b347d2e4d 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index 638db2295..ac2ee2b28 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index e7880acff..7653210cf 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index c6f0b98e7..22cf7b100 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index a73262b82..c05af80a4 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index e9beadfeb..000b39a2e 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index b3d610b85..bd86e3cd1 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index 5f69313da..fcc494bea 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index 1e42db17f..30de3cf62 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index 3cfeff5de..658fb450d 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 01bb901e2..88d2177f1 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index ea0712227..bdd7205d0 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index 2627365f7..881b39de4 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index f74aed560..10ed9213a 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 3e3897609..97c0ff50d 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index 5d8a6e88d..b9769e639 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index c883db911..46bcfe33b 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index f1ad4a8c9..0ee2ba13b 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 2f52cba64..fa50a9f1b 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index ec7e3fb4c..0100d31df 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 228eb4cf6..1a1a331e2 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -31,11 +31,9 @@ RUN set -x \ && a2enmod actions fastcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index b12503fbb..95ce89bf9 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -30,11 +30,9 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 951276e75..a3ccde03b 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -30,11 +30,9 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index b9ad0057e..7b32d1c27 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 1708b8624..ceb284240 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -32,7 +32,6 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 8bb62b631..f6f3be7d9 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -32,7 +32,6 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index de0f9fb9d..11bfc0404 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 5feb69bcd..b04356ac3 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index bf0ac2260..c916a7eb2 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index bdc066cb7..674878762 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index 558b8a385..b75a7ece7 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index 588b562c7..efc9ff0f4 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index ad97d4ae9..a26c3f192 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index ce0bbb260..ccd27eba2 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -25,5 +25,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 76f36941f..8ebfe42cd 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -25,5 +25,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index 5de3150f8..7a4a3a5ed 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -34,5 +34,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index e1e4d1206..3e632dc57 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -25,5 +25,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index 3de00bd55..94396e98e 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -34,5 +34,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index f07593b6f..2426f451f 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -25,5 +25,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index 795244fcd..795273fc0 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -34,5 +34,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 6605b4347..942741263 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -25,5 +25,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index dd5aed129..56dd8edbb 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -34,5 +34,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 549bfdb41..010cd3cb9 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -25,5 +25,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 3a4e31cae..88b101a3a 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -28,5 +28,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index ab209a4a2..04e0427b7 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -25,5 +25,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 7d3e20c52..143e15ff2 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -28,5 +28,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index eea4574f7..4fa89b138 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -28,5 +28,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 6c38d1337..af4e43c7e 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -29,5 +29,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index 76e38b42a..fc54a9ce6 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 338cafc38..5acceae0a 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index c70a3dce8..c804f8833 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index fd7538f7f..b227785a3 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 8ee9e03f6..0d693ed66 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 789c3bc3e..4fcb2f0a2 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 9256003de..033a610cf 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 17aa6ac17..3209026ba 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 64047b046..8e71bb94a 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 3ea94930d..9d7f9b90a 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index d082abd46..8b47d25e0 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index a379d1cb4..01f490162 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index a2cf4cb45..69d87b49c 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index 0708dc717..28795de0c 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -32,5 +32,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 98d82170b..0c763df9e 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index 51de13238..c5a8b5dfe 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index 22f895d78..7031be41c 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -42,5 +42,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 73f5e5e1c..05b59639e 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index 9fbcbddd0..ff9c7308c 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -42,5 +42,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index ddd2b2ef4..da66aaad9 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index 05e8547cd..a6b74a4d7 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -42,5 +42,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index 95155b3d1..6ad186f94 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 6cfd9b41b..9683fef49 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -42,5 +42,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index 528f67978..2bea35f9e 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 54a9ff7cf..80c6546bb 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -36,5 +36,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index 8ef401040..661cc31b1 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -33,5 +33,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index e777f985f..86dcd8874 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -36,5 +36,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index b7a8cac40..63dccfcfb 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -36,5 +36,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 6c0ccb9ea..3682a9591 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -37,5 +37,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile index a9b15971a..8069a27d2 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index c4980e2f0..e4617a076 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 76ed3c926..040d7a705 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 2aee3c6d0..23e29b4d3 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index 91402dc66..b63c6a0e6 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 9e3b2cdaa..b499fbc8d 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index e72103d2d..4efa0b4f9 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 65d06d540..93629eef5 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 4a466ea03..c13cd4d5c 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 32d9f6dfe..c263a3126 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index c4e46c6c8..24fc0c1e7 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index 872cab99f..bf7675ae3 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index d249feed4..0e8d20564 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index b22fadfb1..5c7c3a586 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -40,5 +40,4 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index 0f380893d..ce19d1263 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index 9e4cd68b0..ed3633660 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index 99ed97c80..a5d47ced9 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 64030af5a..26ef4942d 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index 30c89e041..a498f8587 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index 17dba1149..094c94054 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index ef5b19065..d5609d688 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index c82d5a345..5d4194834 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index eaa964502..bf5f4842a 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index dcf66c66b..6fb8958a4 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index f4ad951d0..14a33c365 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index 017019778..2804986d1 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index d0ccb21af..5f89e5768 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 3930a7a02..1589c134c 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 481f9c73d..6ad7bc28b 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index 32bda8260..726427ef0 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 6667e525c..500be9252 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 83f4ab394..d4c8fa65c 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 3f52cc7e3..127c4c440 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 48f72bcc7..9b4615e4b 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index c702d0867..302122bd4 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index cf16419d1..23f615d8d 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 90ac8ee98..21df51cb9 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 70afd5756..ff39b7c5a 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 5d4614a52..b51272eb0 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 7da53cd53..302693854 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index 66d964b25..f43567ce9 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index e22c6e753..b126598a6 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index c003b05fc..7f0d9f328 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index e288ff049..80fb60827 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -88,7 +88,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -107,7 +106,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -239,7 +237,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 20f0b7735..8c11bdd13 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -88,7 +88,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -107,7 +106,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -244,7 +242,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 541cdb789..ed8aa1284 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -91,7 +91,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -111,7 +110,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -261,7 +259,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 48f7fec0a..ac196443f 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -88,7 +88,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -107,7 +106,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -244,7 +242,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 2c80a28d3..9da29e3ec 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -91,7 +91,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -111,7 +110,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -265,7 +263,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index fa2c8a34d..e34b50e25 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -88,7 +88,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -107,7 +106,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -243,7 +241,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 2ba610dd0..ff1ab16b6 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -91,7 +91,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -111,7 +110,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -265,7 +263,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 06f92e809..1b44f1ef1 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -88,7 +88,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -107,7 +106,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -243,7 +241,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index a3016fa2e..41039ca0f 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -91,7 +91,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -111,7 +110,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -265,7 +263,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 847cddf0e..8dbe83656 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -88,7 +88,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -107,7 +106,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -242,7 +240,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index cc94a60e4..a5730e05f 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -91,7 +91,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -111,7 +110,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -261,8 +259,6 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-arch-info $BUILDARCH $TARGETARCH \ -&& docker-run-bootstrap \ && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/php-official/8.0-alpine/Dockerfile.jinja2 b/docker/php-official/8.0-alpine/Dockerfile.jinja2 index cba6c842e..12f1cca5a 100644 --- a/docker/php-official/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.0-alpine/Dockerfile.jinja2 @@ -32,7 +32,7 @@ RUN set -x \ RUN set -x \ {{ php.officialAlpine(version='8.0') }} \ - {{ provision.runBootstrap() }} \ + {{ provision.symlinkGoReplace() }} \ {{ docker.cleanup() }} {{ docker.workdir('/') }} diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index aca5235f5..0842d5d33 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -88,7 +88,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -107,7 +106,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -235,7 +233,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup WORKDIR / diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index d404dc6f7..03a71645c 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -66,7 +66,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index 18172d5f6..cc5ac6320 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -70,7 +70,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index d7b11ced8..384aed566 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -71,7 +71,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile index bafcd18a4..ccc9f11df 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -67,7 +67,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 3bc55e23b..881ebaa71 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -60,7 +60,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 53b9f2905..8977731de 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -78,7 +78,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index dab3c21f0..0bb618c53 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -61,7 +61,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 5ca3b2250..258d7345b 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 4d841f1a3..a5111aad7 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -61,7 +61,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 386f68fcd..6d74abbcf 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -62,7 +62,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index a939b7296..2746727ff 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -62,7 +62,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 5f906f26d..3f0a6db28 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -62,7 +62,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index eef25890e..bf226c64e 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index a3e0110bd..00a69fa38 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile index 0a6735826..dd384bd60 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile index 59cc60da7..438c989ad 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile index 106e24c74..f82587ebe 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -68,7 +68,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index 9c4f44b23..a1651aa49 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ && find /app/ -type f -exec chmod 0644 {} \; \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup VOLUME /app diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 7bdbd1cd2..3b7e3a2b9 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -15,7 +15,6 @@ RUN set -x \ && docker-service enable postfix \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 25 465 587 diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 8c9130214..43f9ac053 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ ca-certificates \ locales \ gnupg \ - && symlink-go-replace \ && docker-image-cleanup ############################################################################### @@ -102,7 +101,6 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && symlink-go-replace \ && docker-image-cleanup RUN set -x \ @@ -118,7 +116,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ############################################################################### @@ -141,7 +138,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup ############################################################################### @@ -180,7 +176,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \ ## Enable ansible for deployment user && chmod 755 /usr/local/bin/ansible* \ - && symlink-go-replace \ && docker-image-cleanup # NPM stack @@ -190,7 +185,6 @@ RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \ && npm install -g grunt-cli \ && npm install -g bower \ && npm install -g npm-cache \ - && symlink-go-replace \ && docker-image-cleanup # Deployer stack @@ -207,7 +201,6 @@ RUN set -x \ && chmod +x /usr/local/bin/dep \ # Deployer: capistrano (http://capistranorb.com/) && gem install capistrano \ - && symlink-go-replace \ && docker-image-cleanup # Upload @@ -222,7 +215,6 @@ RUN rake assets:precompile \ && /opt/docker/bin/bootstrap.sh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 80 diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 9af6ac796..acd273872 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -37,5 +37,4 @@ RUN set -x \ && pip install t3targets \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index c3eced996..064b83d71 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -12,7 +12,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 22 diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 5b336dfb7..bb6f588fa 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -65,7 +65,6 @@ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && mkdir -p /opt/solr/server/solr/data \ && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ && chown -R solr:solr /opt/solr/server/solr/ \ - && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index fd9de3a61..badbe3542 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -62,7 +62,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 6adba5f8f..afe7b8a54 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -62,7 +62,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 11da230da..8ef695094 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -62,7 +62,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 540747590..fc474a28d 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -62,7 +62,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 2c6e74345..302419c6d 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -62,7 +62,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index e55a2e588..7f4e7ada8 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -62,7 +62,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 3ff040043..95b609276 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -62,7 +62,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && symlink-go-replace \ && docker-image-cleanup USER solr diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 5ddc8c586..291568f21 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ varnish \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup CMD ["varnishd"] diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 1238cf7d2..d613d0c2c 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -26,7 +26,6 @@ RUN set -x \ /var/log/supervisor \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && symlink-go-replace \ && docker-image-cleanup EXPOSE 20 21 12020 12021 12022 12023 12024 12025 diff --git a/provisioning/base-layout/general/usr/local/bin/go-replace b/provisioning/base-layout/general/usr/local/bin/go-replace index 1dbab145c..27ba754da 100755 --- a/provisioning/base-layout/general/usr/local/bin/go-replace +++ b/provisioning/base-layout/general/usr/local/bin/go-replace @@ -9,16 +9,7 @@ if command -v dpkg > /dev/null; then fi download() { - case "$1" in \ - amd64) GR_ARCH='64';; \ - arm64) GR_ARCH='arm64';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac - - ARCH=$1 - echo "downloading go-replace-$GR_ARCH" - wget -O "/usr/local/bin/go-replace-$ARCH" "https://github.com/webdevops/goreplace/releases/download/$VERSION/gr-$GR_ARCH-linux" - chmod +x "/usr/local/bin/go-replace-$ARCH" + /usr/local/bin/install-go-replace "$1" } if [ -f "/opt/docker/ARCH_INFO.txt" ]; then @@ -31,7 +22,7 @@ if [ -f "/opt/docker/ARCH_INFO.txt" ]; then done < "$ARCH_FILE" fi -if ! [ -n "$BUILDARCH" ]; then +if [ ! -n "$BUILDARCH" ]; then if ! command -v dpkg > /dev/null; then echo "dpkg not installed and BUILDARCH was not found" exit 2 diff --git a/provisioning/base-layout/general/usr/local/bin/install-go-replace b/provisioning/base-layout/general/usr/local/bin/install-go-replace new file mode 100755 index 000000000..bdf7d54a9 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/install-go-replace @@ -0,0 +1,44 @@ +#!/bin/sh + +set -e + +VERSION="1.1.2" +INSTALL_DIR="/usr/local/bin" + +install() { + ARCH="$1" + + case "$1" in \ + amd64) GR_ARCH='64';; \ + arm64) GR_ARCH='arm64';; \ + *) echo 'defaulting to amd64'; ARCH="amd64"; GR_ARCH='64' ;; \ + esac + + BIN_FMT="go-replace-$ARCH" + + if [ -f "$INSTALL_DIR/$BIN_FMT" ]; then + echo "go-replace-$ARCH exists" + return + fi + + echo "downloading go-replace-$GR_ARCH" + wget -O "$INSTALL_DIR/$BIN_FMT" "https://github.com/webdevops/goreplace/releases/download/$VERSION/gr-$GR_ARCH-linux" + chmod +x "$INSTALL_DIR/$BIN_FMT" +} + +if [ "$#" -eq 0 ]; then + echo "usage: $0 " + echo "" + echo "ARCH) either amd64 or arm64 or all" + exit 2 +fi + +if [ "$1" == "all" ]; then + for target in "amd64 arm64" + do + install "$target" + done +else + echo "$1" + install "$1" +fi diff --git a/provisioning/base-layout/general/usr/local/bin/symlink-go-replace b/provisioning/base-layout/general/usr/local/bin/symlink-go-replace index a7eebb305..2287ef1c0 100755 --- a/provisioning/base-layout/general/usr/local/bin/symlink-go-replace +++ b/provisioning/base-layout/general/usr/local/bin/symlink-go-replace @@ -19,19 +19,24 @@ else echo "WARNING: arch file not found, symlinking to amd64" fi +download() { + /usr/local/bin/install-go-replace "$1" +} + symlinkBinary() { symlink_target="/usr/local/bin/go-replace-$1" if [ ! -f "$symlink_target" ]; then - echo "error: $symlink_target not found" + echo "$symlink_target not found, attempting to install:" + download "$1" exit 2 fi rm -f -- "$GO_REPLACE" - ln -sf "$GO_REPLACE" "/usr/local/bin/go-replace-$1" + ln -sf "/usr/local/bin/go-replace-$1" "$GO_REPLACE" } -if [ -n "$TARGETARCH" ]; then +if [ ! -n "$TARGETARCH" ]; then symlinkBinary "amd64" else symlinkBinary "$TARGETARCH" diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 31106a489..95b814927 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -64,6 +64,5 @@ CMD ["{{ command }}"] {%- endmacro -%} {%- macro cleanup() -%} - && symlink-go-replace \ && docker-image-cleanup {%- endmacro -%} diff --git a/template/Dockerfile/provision.jinja2 b/template/Dockerfile/provision.jinja2 index 105422728..a2603ab07 100644 --- a/template/Dockerfile/provision.jinja2 +++ b/template/Dockerfile/provision.jinja2 @@ -5,6 +5,10 @@ \{%- endif %} && /opt/docker/bin/bootstrap.sh{% endmacro %} +{% macro symlinkGoReplace() -%} +&& symlink-go-replace +{%- endmacro %} + {% macro runBootstrap() -%} && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap From 314ed442672973227729824e3184006e98fe50be Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 8 Aug 2022 15:23:03 -0700 Subject: [PATCH 073/123] php dev images are now prefixed --- docker/php-apache-dev/8.0-alpine/Dockerfile | 2 +- docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache-dev/8.0/Dockerfile | 2 +- docker/php-apache-dev/8.0/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/8.0-alpine/Dockerfile | 2 +- docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/8.0/Dockerfile | 2 +- docker/php-nginx-dev/8.0/Dockerfile.jinja2 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 9389d8c21..5b5424fd6 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:8.0-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php-apache:8.0-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 index 972d0237f..6df57fc97 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-apache", "8.0-alpine") }} +{{ docker.from("php-apache", "8.0-alpine", user) }} {{ docker.platformArgs() }} diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index 0a11b0b93..4ed2defb0 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:8.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php-apache:8.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/8.0/Dockerfile.jinja2 b/docker/php-apache-dev/8.0/Dockerfile.jinja2 index 73bede1fc..7b134a76e 100644 --- a/docker/php-apache-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.0/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-apache", "8.0") }} +{{ docker.from("php-apache", "8.0", user) }} {{ docker.platformArgs() }} diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 80c6546bb..1abc40e7f 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:8.0-alpine +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php-nginx:8.0-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 index 094ebac10..a12593ccd 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-nginx", "8.0-alpine") }} +{{ docker.from("php-nginx", "8.0-alpine", user) }} {{ docker.platformArgs() }} diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index 661cc31b1..6de119503 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:8.0 +FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php-nginx:8.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0/Dockerfile.jinja2 index 6d2f8d560..e9c86d0ee 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.0/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-nginx", "8.0") }} +{{ docker.from("php-nginx", "8.0", user) }} {{ docker.platformArgs() }} From 565c9d64d33f21a3bb8e69bdf58f24d259483bbc Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 9 Aug 2022 09:39:00 -0700 Subject: [PATCH 074/123] rm /opt/docker/ARCH_INFO.txt so go-replace wrapper script works in built image --- .../base-layout/latest/conf/usr/local/bin/docker-image-cleanup | 1 + .../base-layout/general/usr/local/bin/docker-image-cleanup | 1 + 2 files changed, 2 insertions(+) diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup index e63d1b3c4..05457492b 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup @@ -34,3 +34,4 @@ esac find /tmp/ /var/log/ -mindepth 1 -delete rm -rf /root/.cache +rm -rf /opt/docker diff --git a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup index e63d1b3c4..05457492b 100755 --- a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup +++ b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup @@ -34,3 +34,4 @@ esac find /tmp/ /var/log/ -mindepth 1 -delete rm -rf /root/.cache +rm -rf /opt/docker From af7da0b8a44d16f035f4c0e6b4e5dc8950bdccac Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 9 Aug 2022 09:55:48 -0700 Subject: [PATCH 075/123] only remove /opt/docker if applicable, avoid returning non-true value and failing the rest of docker-image-cleanup script --- .../latest/conf/usr/local/bin/docker-image-cleanup | 5 ++++- .../base-layout/general/usr/local/bin/docker-image-cleanup | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup index 05457492b..98910268c 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup @@ -34,4 +34,7 @@ esac find /tmp/ /var/log/ -mindepth 1 -delete rm -rf /root/.cache -rm -rf /opt/docker + +if [ -f "/opt/docker/ARCH_INFO.txt" ]; then + rm -rf /opt/docker +fi diff --git a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup index 05457492b..98910268c 100755 --- a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup +++ b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup @@ -34,4 +34,7 @@ esac find /tmp/ /var/log/ -mindepth 1 -delete rm -rf /root/.cache -rm -rf /opt/docker + +if [ -f "/opt/docker/ARCH_INFO.txt" ]; then + rm -rf /opt/docker +fi From 15a73e35083339602217437bdc07579ca7cb3527 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 9 Aug 2022 10:10:32 -0700 Subject: [PATCH 076/123] okay nuking /opt/docker is less than ideal --- .../base-layout/latest/conf/usr/local/bin/docker-image-cleanup | 3 ++- .../base-layout/general/usr/local/bin/docker-image-cleanup | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup index 98910268c..9950bcbd4 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup @@ -2,6 +2,7 @@ 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 +set -x LSB_FAMILY=$(docker-image-info family) @@ -36,5 +37,5 @@ find /tmp/ /var/log/ -mindepth 1 -delete rm -rf /root/.cache if [ -f "/opt/docker/ARCH_INFO.txt" ]; then - rm -rf /opt/docker + rm -f -- /opt/docker/ARCH_INFO.txt fi diff --git a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup index 98910268c..9950bcbd4 100755 --- a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup +++ b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup @@ -2,6 +2,7 @@ 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 +set -x LSB_FAMILY=$(docker-image-info family) @@ -36,5 +37,5 @@ find /tmp/ /var/log/ -mindepth 1 -delete rm -rf /root/.cache if [ -f "/opt/docker/ARCH_INFO.txt" ]; then - rm -rf /opt/docker + rm -f -- /opt/docker/ARCH_INFO.txt fi From 41840ec45f9930c6c78875557d0716593c4e23f1 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 9 Aug 2022 10:47:12 -0700 Subject: [PATCH 077/123] FROM --platform=$BUILDPLATFORM was a mistake --- docker/ansible/alpine/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/ansible/ubuntu-17.04/Dockerfile | 2 +- docker/apache-dev/alpine/Dockerfile | 2 +- docker/apache-dev/centos-7/Dockerfile | 2 +- docker/apache-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-17.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-17.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-18.04/Dockerfile | 2 +- docker/apache/alpine/Dockerfile | 2 +- docker/apache/centos-7/Dockerfile | 2 +- docker/apache/debian-10/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/apache/ubuntu-16.10/Dockerfile | 2 +- docker/apache/ubuntu-17.04/Dockerfile | 2 +- docker/apache/ubuntu-17.10/Dockerfile | 2 +- docker/apache/ubuntu-18.04/Dockerfile | 2 +- docker/base-app/alpine/Dockerfile | 2 +- docker/base-app/centos-7/Dockerfile | 2 +- docker/base-app/debian-10/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-app/ubuntu-16.10/Dockerfile | 2 +- docker/base-app/ubuntu-17.04/Dockerfile | 2 +- docker/base-app/ubuntu-17.10/Dockerfile | 2 +- docker/base-app/ubuntu-18.04/Dockerfile | 2 +- docker/base/alpine/Dockerfile | 2 +- docker/base/centos-7/Dockerfile | 2 +- docker/base/debian-10/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/base/ubuntu-16.10/Dockerfile | 2 +- docker/base/ubuntu-17.04/Dockerfile | 2 +- docker/base/ubuntu-17.10/Dockerfile | 2 +- docker/base/ubuntu-18.04/Dockerfile | 2 +- docker/bootstrap/alpine/Dockerfile | 4 ++-- docker/bootstrap/centos-7/Dockerfile | 4 ++-- docker/bootstrap/debian-10/Dockerfile | 4 ++-- docker/bootstrap/debian-7/Dockerfile | 4 ++-- docker/bootstrap/debian-8/Dockerfile | 4 ++-- docker/bootstrap/debian-9/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-12.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-14.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-15.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-15.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-16.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-16.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-17.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-17.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-18.04/Dockerfile | 4 ++-- docker/certbot/latest/Dockerfile | 2 +- docker/dockerfile-build-env/latest/Dockerfile | 2 +- docker/liquibase/latest/Dockerfile | 2 +- docker/liquibase/mysql/Dockerfile | 2 +- docker/liquibase/postgres/Dockerfile | 2 +- docker/liquidsoap/latest/Dockerfile | 2 +- docker/mail-sandbox/latest/Dockerfile | 2 +- docker/nginx-dev/alpine/Dockerfile | 2 +- docker/nginx-dev/centos-7/Dockerfile | 2 +- docker/nginx-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-17.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-17.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-18.04/Dockerfile | 2 +- docker/nginx/alpine/Dockerfile | 2 +- docker/nginx/centos-7/Dockerfile | 2 +- docker/nginx/debian-10/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/nginx/ubuntu-16.10/Dockerfile | 2 +- docker/nginx/ubuntu-17.04/Dockerfile | 2 +- docker/nginx/ubuntu-17.10/Dockerfile | 2 +- docker/nginx/ubuntu-18.04/Dockerfile | 2 +- docker/php-apache-dev/5.6/Dockerfile | 2 +- docker/php-apache-dev/7.0/Dockerfile | 2 +- docker/php-apache-dev/7.1-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.1/Dockerfile | 2 +- docker/php-apache-dev/7.2-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.2/Dockerfile | 2 +- docker/php-apache-dev/7.3-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.3/Dockerfile | 2 +- docker/php-apache-dev/7.4-alpine/Dockerfile | 2 +- docker/php-apache-dev/7.4/Dockerfile | 2 +- docker/php-apache-dev/8.0-alpine/Dockerfile | 2 +- docker/php-apache-dev/8.0/Dockerfile | 2 +- docker/php-apache-dev/centos-7-php56/Dockerfile | 2 +- docker/php-apache-dev/centos-7-php7/Dockerfile | 2 +- docker/php-apache-dev/centos-7/Dockerfile | 2 +- docker/php-apache-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-17.04/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-17.10/Dockerfile | 2 +- docker/php-apache-dev/ubuntu-18.04/Dockerfile | 2 +- docker/php-apache/5.6/Dockerfile | 2 +- docker/php-apache/7.0/Dockerfile | 2 +- docker/php-apache/7.1-alpine/Dockerfile | 2 +- docker/php-apache/7.1/Dockerfile | 2 +- docker/php-apache/7.2-alpine/Dockerfile | 2 +- docker/php-apache/7.2/Dockerfile | 2 +- docker/php-apache/7.3-alpine/Dockerfile | 2 +- docker/php-apache/7.3/Dockerfile | 2 +- docker/php-apache/7.4-alpine/Dockerfile | 2 +- docker/php-apache/7.4/Dockerfile | 2 +- docker/php-apache/8.0-alpine/Dockerfile | 2 +- docker/php-apache/8.0/Dockerfile | 2 +- docker/php-apache/centos-7-php56/Dockerfile | 2 +- docker/php-apache/centos-7-php7/Dockerfile | 2 +- docker/php-apache/centos-7/Dockerfile | 2 +- docker/php-apache/debian-10/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-apache/ubuntu-16.10/Dockerfile | 2 +- docker/php-apache/ubuntu-17.04/Dockerfile | 2 +- docker/php-apache/ubuntu-17.10/Dockerfile | 2 +- docker/php-apache/ubuntu-18.04/Dockerfile | 2 +- docker/php-dev/5.6/Dockerfile | 2 +- docker/php-dev/7.0/Dockerfile | 2 +- docker/php-dev/7.1-alpine/Dockerfile | 2 +- docker/php-dev/7.1/Dockerfile | 2 +- docker/php-dev/7.2-alpine/Dockerfile | 2 +- docker/php-dev/7.2/Dockerfile | 2 +- docker/php-dev/7.3-alpine/Dockerfile | 2 +- docker/php-dev/7.3/Dockerfile | 2 +- docker/php-dev/7.4-alpine/Dockerfile | 2 +- docker/php-dev/7.4/Dockerfile | 2 +- docker/php-dev/8.0-alpine/Dockerfile | 2 +- docker/php-dev/8.0/Dockerfile | 2 +- docker/php-dev/centos-7-php56/Dockerfile | 2 +- docker/php-dev/centos-7-php7/Dockerfile | 2 +- docker/php-dev/centos-7/Dockerfile | 2 +- docker/php-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/php-dev/ubuntu-17.04/Dockerfile | 2 +- docker/php-dev/ubuntu-17.10/Dockerfile | 2 +- docker/php-dev/ubuntu-18.04/Dockerfile | 2 +- docker/php-nginx-dev/5.6/Dockerfile | 2 +- docker/php-nginx-dev/7.0/Dockerfile | 2 +- docker/php-nginx-dev/7.1-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.1/Dockerfile | 2 +- docker/php-nginx-dev/7.2-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.2/Dockerfile | 2 +- docker/php-nginx-dev/7.3-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.3/Dockerfile | 2 +- docker/php-nginx-dev/7.4-alpine/Dockerfile | 2 +- docker/php-nginx-dev/7.4/Dockerfile | 2 +- docker/php-nginx-dev/8.0-alpine/Dockerfile | 2 +- docker/php-nginx-dev/8.0/Dockerfile | 2 +- docker/php-nginx-dev/centos-7-php56/Dockerfile | 2 +- docker/php-nginx-dev/centos-7-php7/Dockerfile | 2 +- docker/php-nginx-dev/centos-7/Dockerfile | 2 +- docker/php-nginx-dev/debian-10/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-dev/ubuntu-16.10/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 2 +- docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 2 +- docker/php-nginx/5.6/Dockerfile | 2 +- docker/php-nginx/7.0/Dockerfile | 2 +- docker/php-nginx/7.1-alpine/Dockerfile | 2 +- docker/php-nginx/7.1/Dockerfile | 2 +- docker/php-nginx/7.2-alpine/Dockerfile | 2 +- docker/php-nginx/7.2/Dockerfile | 2 +- docker/php-nginx/7.3-alpine/Dockerfile | 2 +- docker/php-nginx/7.3/Dockerfile | 2 +- docker/php-nginx/7.4-alpine/Dockerfile | 2 +- docker/php-nginx/7.4/Dockerfile | 2 +- docker/php-nginx/8.0-alpine/Dockerfile | 2 +- docker/php-nginx/8.0/Dockerfile | 2 +- docker/php-nginx/centos-7-php56/Dockerfile | 2 +- docker/php-nginx/centos-7-php7/Dockerfile | 2 +- docker/php-nginx/centos-7/Dockerfile | 2 +- docker/php-nginx/debian-10/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-nginx/ubuntu-16.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-17.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-17.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-18.04/Dockerfile | 2 +- docker/php-official/5.6/Dockerfile | 4 ++-- docker/php-official/7.0/Dockerfile | 4 ++-- docker/php-official/7.1-alpine/Dockerfile | 4 ++-- docker/php-official/7.1/Dockerfile | 4 ++-- docker/php-official/7.2-alpine/Dockerfile | 4 ++-- docker/php-official/7.2/Dockerfile | 4 ++-- docker/php-official/7.3-alpine/Dockerfile | 4 ++-- docker/php-official/7.3/Dockerfile | 4 ++-- docker/php-official/7.4-alpine/Dockerfile | 4 ++-- docker/php-official/7.4/Dockerfile | 4 ++-- docker/php-official/8.0-alpine/Dockerfile | 4 ++-- docker/php-official/8.0/Dockerfile | 4 ++-- docker/php/centos-7-php56/Dockerfile | 2 +- docker/php/centos-7-php7/Dockerfile | 2 +- docker/php/centos-7/Dockerfile | 2 +- docker/php/debian-10/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/php/ubuntu-16.10/Dockerfile | 2 +- docker/php/ubuntu-17.04/Dockerfile | 2 +- docker/php/ubuntu-17.10/Dockerfile | 2 +- docker/php/ubuntu-18.04/Dockerfile | 2 +- docker/piwik/latest/Dockerfile | 2 +- docker/postfix/latest/Dockerfile | 2 +- docker/samson-deployment/latest/Dockerfile | 4 ++-- docker/sphinx/latest/Dockerfile | 2 +- docker/ssh/latest/Dockerfile | 2 +- docker/storage/latest/Dockerfile | 2 +- docker/toolbox/alpine/Dockerfile | 2 +- docker/toolbox/buster/Dockerfile | 2 +- docker/typo3-solr/3.1/Dockerfile | 4 ++-- docker/typo3-solr/5.0/Dockerfile | 4 ++-- docker/typo3-solr/6.0/Dockerfile | 4 ++-- docker/typo3-solr/6.1/Dockerfile | 4 ++-- docker/typo3-solr/6.5/Dockerfile | 4 ++-- docker/typo3-solr/7.0/Dockerfile | 4 ++-- docker/typo3-solr/7.5/Dockerfile | 4 ++-- docker/typo3-solr/8.0/Dockerfile | 4 ++-- docker/typo3-solr/8.1/Dockerfile | 4 ++-- docker/varnish/latest/Dockerfile | 2 +- docker/vsftp/latest/Dockerfile | 2 +- template/Dockerfile/docker.jinja2 | 12 ++---------- 317 files changed, 355 insertions(+), 363 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index 2814aaf25..ab4817bc9 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 889932cc5..32b49e680 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 720b393c7..f61f51e37 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 4b4de2906..d1f6d009b 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index cf672acee..9c9c79cbe 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 3d484edf1..9c4cfef9a 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 642e0a00a..7398e6295 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 6ecda5dc1..b353d39ca 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 0796fc143..7c477eb59 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index a635097ae..cc0315d19 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index 9688e246a..f812bd3de 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index ac909922a..8fa268c02 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:alpine +FROM ghcr.io/cocoastorm/webdevops/apache:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 8ffbd2121..a05a9fd8e 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:centos-7 +FROM ghcr.io/cocoastorm/webdevops/apache:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index b158b763d..22d1a86a2 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-10 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index fce845007..e1d0792a2 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-7 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index cb2996400..b7f2a5a03 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-8 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index ece01a650..aea3d70e7 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:debian-9 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 2c1242444..681ad20a2 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 31b6fcde9..a9a5ef924 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 7e9161eb4..7e388258b 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 007d87ba4..53810d742 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 14aa86f45..324dc0b93 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 852deaedf..a63b2757a 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index 383b6c546..e00833883 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index 323444832..b55f69fc4 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index 95108be02..572cc5b98 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/apache:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/apache:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index 0ead92d46..d69e6d804 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 761e38b47..4d63f1a01 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index c506b3cac..e7c258880 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index c43a62fda..9f5a70567 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index ab45c0dca..3571fab43 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 1f2654d99..83f0507fa 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index a90e2d666..520563828 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 02805a705..78cb8849e 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 88b07ea26..7747aab45 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index e13c629fe..c0f5adecf 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 6e3dea19d..fef43d8be 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index 73318f7e9..be233557a 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index 21611abf7..fb53c5bc5 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index f9b9cbf53..b6a685d62 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index 76c05d0d8..166412251 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index 56332b50b..72d0bfda4 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index cc473de0a..d4299ddc5 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index eec4e7c53..5ff688667 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index af993153c..a05b8898d 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 4d30bf369..fad5f36b1 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index ef401dcb8..d38905569 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index da856c726..5f8cb9b46 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 57ccc7420..116ac7a24 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index d240523e5..81a569f6c 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 9af28365b..154bfbd07 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 2dc7dcf33..00f43b29c 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 9b4e63982..3026396d6 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index aaa43d972..991b231b8 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index c0bb15d05..d46f82dd4 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index d4cfa2b2c..b81ae66e8 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index e1b691348..1290807fe 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 14d8aea9e..a5d3528a1 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index 88e83b672..3d73acc16 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index aa90f051d..cacbf831b 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 9512914d4..329c46515 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 68335a548..bb267c6c0 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 5cc1f13a2..bafca8de2 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 3580ac5b8..3058e1653 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 378793f50..66d970cea 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index cdf40ad69..6d5f3fc96 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index ec08a16a4..704c91bdd 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index f83f27bc8..5b1d1212c 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index 8f5ac467a..1c3a5ee87 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index 14d3c31bd..1f6113935 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index 278d54515..df80a2c82 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 4ce17bc6e..1a79df1e0 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM alpine:3.11 +FROM alpine:3.11 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 16a4619ac..9a485d667 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM centos:7 +FROM centos:7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 24e7c522a..e8795cff9 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM debian:buster +FROM debian:buster ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index a84ec721f..098fe1b5c 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM debian:7 +FROM debian:7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 11f772252..487139002 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM debian:8 +FROM debian:8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index ca8816f3a..d6b1183ea 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM debian:stretch +FROM debian:stretch ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 898daec25..3da22523b 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:12.04 +FROM ubuntu:12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 6d5c5e0e8..ba6f2a7c2 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:14.04 +FROM ubuntu:14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 1e5aa3538..4a3659ae7 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:15.04 +FROM ubuntu:15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 62e124d01..60480ba4b 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:15.10 +FROM ubuntu:15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index a4fd6864f..ea55c60aa 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:16.04 +FROM ubuntu:16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 4148c9ff1..74d119b6a 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:16.10 +FROM ubuntu:16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index bd465411f..4a643410b 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:17.04 +FROM ubuntu:17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index b8ae45d41..0360adefc 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:17.10 +FROM ubuntu:17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 287acda0c..5fb617d34 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM ubuntu:18.04 +FROM ubuntu:18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 5739a264d..d2c36d74e 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 08537550b..e51008e6c 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-18.04 +FROM webdevops/base-app:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index 319b23ab5..34021c9e5 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM openjdk:8 +FROM openjdk:8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index d26626ecb..2b2b1e5df 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM openjdk:8 +FROM openjdk:8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index 7923a2866..3ff61f948 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM openjdk:8 +FROM openjdk:8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index 20aadf07b..ca27774ff 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:latest +FROM ghcr.io/cocoastorm/webdevops/base:latest ARG BUILDARCH ARG TARGETARCH diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 775e383b3..d13aebb53 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:latest +FROM webdevops/php-nginx:latest ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile index 39e205d90..1a5cb3ec3 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:alpine +FROM ghcr.io/cocoastorm/webdevops/nginx:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 265bb473e..b127ca4ff 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:centos-7 +FROM ghcr.io/cocoastorm/webdevops/nginx:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/debian-10/Dockerfile b/docker/nginx-dev/debian-10/Dockerfile index a35c950ac..aeb9ec33d 100644 --- a/docker/nginx-dev/debian-10/Dockerfile +++ b/docker/nginx-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-10 +FROM ghcr.io/cocoastorm/webdevops/nginx:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 57509f4a9..2a142d663 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-7 +FROM ghcr.io/cocoastorm/webdevops/nginx:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index b34c8ecc8..00e07f532 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-8 +FROM ghcr.io/cocoastorm/webdevops/nginx:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index ed6124e01..e14acf84e 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:debian-9 +FROM ghcr.io/cocoastorm/webdevops/nginx:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index e838440b8..ef6907501 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index 5c7fc773b..b057c5c8a 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index d56a6a817..863adef0e 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index f0c3bff64..5513bd168 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 20bc51ede..f8891b989 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index fdd57428c..666060dff 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile b/docker/nginx-dev/ubuntu-17.04/Dockerfile index bda3eeb11..9a9c32319 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile b/docker/nginx-dev/ubuntu-17.10/Dockerfile index f2264adb8..a803f1ec8 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile b/docker/nginx-dev/ubuntu-18.04/Dockerfile index 8b959c272..36a318ab0 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/nginx:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index 0c65dfa32..74e432257 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index b8383871b..194b0fbbe 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index 15948cef2..ed9fa51d4 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 0bcf5a283..b0a82a334 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index ea276e730..df2743b7f 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 83c0bb323..65eaf5db7 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index b6ea813f4..002f02f39 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index a4a13bbf8..a7c7ec521 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index eee197354..c10d80156 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 8c7001269..2cdcbee9f 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 64f0937a9..65cda28a6 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 0c786907d..7e2eb30cd 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index 1f27b99ed..f10b8ee1b 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index 68b584659..4787bc38e 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index dc213b0db..759c0cc19 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index da9ced1d3..b422c849c 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:5.6 +FROM webdevops/php-apache:5.6 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 5e033f83c..317aed878 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.0 +FROM webdevops/php-apache:7.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index a06489655..35419e9b5 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.1-alpine +FROM webdevops/php-apache:7.1-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index 8952ef8c6..e84528415 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.1 +FROM webdevops/php-apache:7.1 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index c11f36227..ed37277b8 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.2-alpine +FROM webdevops/php-apache:7.2-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index e87a929bf..f20bb86a8 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.2 +FROM webdevops/php-apache:7.2 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index 465e57318..d0ea00147 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.3-alpine +FROM webdevops/php-apache:7.3-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 46bea5a9a..6f6b84fa2 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.3 +FROM webdevops/php-apache:7.3 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index cd38d7bf7..e44c682e1 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.4-alpine +FROM webdevops/php-apache:7.4-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index 92f4ca29f..4e1bab9cf 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:7.4 +FROM webdevops/php-apache:7.4 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 5b5424fd6..e0bde0034 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php-apache:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.0-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index 4ed2defb0..e26ff98f4 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php-apache:8.0 +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index cf57c70a1..736da29c9 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7-php56 +FROM webdevops/php-apache:centos-7-php56 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index f8a397490..5f5cc74c5 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7-php7 +FROM webdevops/php-apache:centos-7-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index ad1ad4cdb..a5a19e585 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:centos-7 +FROM webdevops/php-apache:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile index db64d44b9..f1d3f607e 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-10 +FROM webdevops/php-apache:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 9c3d61489..796d922d3 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-7 +FROM webdevops/php-apache:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index af66a9c38..3ebbcfa52 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-8-php7 +FROM webdevops/php-apache:debian-8-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 920a4cd44..ee7b04215 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-8 +FROM webdevops/php-apache:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 4c90de54c..2b61fc9e6 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:debian-9 +FROM webdevops/php-apache:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 920a463c7..2d5973ac9 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-12.04 +FROM webdevops/php-apache:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 647bf8e94..831a8228f 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-14.04 +FROM webdevops/php-apache:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 2eed98a54..0605d73a0 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-15.04 +FROM webdevops/php-apache:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index d0ea9503e..3e0e61bcd 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-15.10 +FROM webdevops/php-apache:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 5069fde33..e862bc585 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-16.04 +FROM webdevops/php-apache:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index b347d2e4d..0a68391af 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-16.10 +FROM webdevops/php-apache:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index ac2ee2b28..bd4b8d629 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-17.04 +FROM webdevops/php-apache:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index 7653210cf..9952d625f 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-17.10 +FROM webdevops/php-apache:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index 22cf7b100..52b9e041e 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-apache:ubuntu-18.04 +FROM webdevops/php-apache:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index c05af80a4..5485f3aa0 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index 000b39a2e..1499f1e76 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index bd86e3cd1..8073cb88f 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index fcc494bea..1e47e2870 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index 30de3cf62..02799a52c 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index 658fb450d..e85eeed92 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 88d2177f1..22424fdd6 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index bdd7205d0..a1ba6514a 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index 881b39de4..8d7d3094d 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index 10ed9213a..c7073a994 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 97c0ff50d..81960adf1 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index b9769e639..178a0cf7d 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 46bcfe33b..e5aecf3f8 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 0ee2ba13b..1c79f88d5 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index fa50a9f1b..7bb89c9c2 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index 0100d31df..31b35436e 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 1a1a331e2..dc2980630 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 95ce89bf9..208557d1d 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index a3ccde03b..77079b3f6 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 7b32d1c27..49e5bd2d1 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index ceb284240..860253cf3 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index f6f3be7d9..fba1c23e7 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 11bfc0404..19039ae0e 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index b04356ac3..8ee27a2a9 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index c916a7eb2..ae3e5cbbb 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index 674878762..54bb5714a 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index b75a7ece7..5958a844c 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index efc9ff0f4..b247f7ee3 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index a26c3f192..f70e76a0e 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index ccd27eba2..363cffc88 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 8ebfe42cd..9c0c55c9c 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index 7a4a3a5ed..778d4956c 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 3e632dc57..82a653796 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index 94396e98e..f219110b7 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index 2426f451f..f091d8d13 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index 795273fc0..e7d463639 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 942741263..d7413ab4e 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index 56dd8edbb..b62896c8e 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 010cd3cb9..a9e7c2654 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 88b101a3a..5159c7a0e 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 04e0427b7..9dab85db2 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 143e15ff2..bea619461 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index 4fa89b138..3e4174f4b 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index af4e43c7e..6f8f2b316 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index fc54a9ce6..6e2ae8d88 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 5acceae0a..7713b0e37 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index c804f8833..993da482b 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index b227785a3..995e7c58c 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 0d693ed66..092cc5871 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 4fcb2f0a2..a9b2f82d4 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 033a610cf..3d4d12554 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 3209026ba..02f03ad50 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 8e71bb94a..fc610d184 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 9d7f9b90a..20f99b5c7 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 8b47d25e0..260b8fa8d 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index 01f490162..1aff963e1 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index 69d87b49c..5d26ce83c 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index 28795de0c..246faf984 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 0c763df9e..28e5eb616 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:5.6 +FROM webdevops/php-nginx:5.6 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index c5a8b5dfe..81902c326 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.0 +FROM webdevops/php-nginx:7.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index 7031be41c..787eaacbd 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1-alpine +FROM webdevops/php-nginx:7.1-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 05b59639e..ca0fedbcb 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1 +FROM webdevops/php-nginx:7.1 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index ff9c7308c..051b27a07 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.2-alpine +FROM webdevops/php-nginx:7.2-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index da66aaad9..9dbb5f7e2 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.2 +FROM webdevops/php-nginx:7.2 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index a6b74a4d7..5be7dc422 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.3-alpine +FROM webdevops/php-nginx:7.3-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index 6ad186f94..8fac6062a 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.3 +FROM webdevops/php-nginx:7.3 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 9683fef49..cfc3b9c4d 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.4-alpine +FROM webdevops/php-nginx:7.4-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index 2bea35f9e..61e24a103 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.4 +FROM webdevops/php-nginx:7.4 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 1abc40e7f..0cc4310aa 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php-nginx:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.0-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index 6de119503..492361d0d 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php-nginx:8.0 +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 86dcd8874..8ee48e4d1 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7-php56 +FROM webdevops/php-nginx:centos-7-php56 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index 63dccfcfb..73fb8b63a 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7-php7 +FROM webdevops/php-nginx:centos-7-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 3682a9591..babc55a31 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:centos-7 +FROM webdevops/php-nginx:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile index 8069a27d2..3746b1243 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-10 +FROM webdevops/php-nginx:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index e4617a076..9b561e654 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-7 +FROM webdevops/php-nginx:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 040d7a705..5de0f5234 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-8-php7 +FROM webdevops/php-nginx:debian-8-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 23e29b4d3..da687cc30 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-8 +FROM webdevops/php-nginx:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index b63c6a0e6..fb4c4adb9 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:debian-9 +FROM webdevops/php-nginx:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index b499fbc8d..8bcacfdc1 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-12.04 +FROM webdevops/php-nginx:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 4efa0b4f9..74b2a6938 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-14.04 +FROM webdevops/php-nginx:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 93629eef5..4e579a820 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-15.04 +FROM webdevops/php-nginx:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index c13cd4d5c..d088a00ac 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-15.10 +FROM webdevops/php-nginx:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index c263a3126..bb173b006 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-16.04 +FROM webdevops/php-nginx:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 24fc0c1e7..b95287a04 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-16.10 +FROM webdevops/php-nginx:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index bf7675ae3..a88fe443c 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-17.04 +FROM webdevops/php-nginx:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index 0e8d20564..26f0b1dd4 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-17.10 +FROM webdevops/php-nginx:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index 5c7c3a586..7ed050af0 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:ubuntu-18.04 +FROM webdevops/php-nginx:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index ce19d1263..a41e7b8f8 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index ed3633660..af3a9ecd2 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index a5d47ced9..74c8d3218 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 26ef4942d..fde7f205d 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index a498f8587..0be485955 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index 094c94054..cafb6cf48 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index d5609d688..4acea7739 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index 5d4194834..c071007ef 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index bf5f4842a..8950bfb99 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index 6fb8958a4..a80b5059d 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index 14a33c365..85440765f 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index 2804986d1..983ae9042 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 5f89e5768..aa554f8e9 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 1589c134c..1a8e49a42 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 6ad7bc28b..9d4ceecc3 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index 726427ef0..2dc71ecff 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 500be9252..be63ee1b1 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index d4c8fa65c..02d834b60 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 127c4c440..d511fadc8 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 9b4615e4b..f2aa90250 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 302122bd4..0bcaedec0 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 23f615d8d..f1d2f9b94 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 21df51cb9..e163487ec 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index ff39b7c5a..ea73cd1b9 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index b51272eb0..438eaba90 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 302693854..be963ef3f 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index f43567ce9..732707e5f 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index b126598a6..dbaeaf1d2 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index 7f0d9f328..37447d746 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 80fb60827..243b35172 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:5.6-fpm-stretch +FROM php:5.6-fpm-stretch ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 8c11bdd13..8c47e7a6a 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.0-fpm-stretch +FROM php:7.0-fpm-stretch ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index ed8aa1284..2260e2738 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.1-fpm-alpine +FROM php:7.1-fpm-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index ac196443f..566f3cdce 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.1-fpm-buster +FROM php:7.1-fpm-buster ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 9da29e3ec..ae45d5885 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.2-fpm-alpine +FROM php:7.2-fpm-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index e34b50e25..05307ed70 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.2-fpm-buster +FROM php:7.2-fpm-buster ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index ff1ab16b6..4f3c0fa36 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.3-fpm-alpine +FROM php:7.3-fpm-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 1b44f1ef1..cea262041 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.3-fpm-buster +FROM php:7.3-fpm-buster ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 41039ca0f..c2b1b3ea7 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.4-fpm-alpine +FROM php:7.4-fpm-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 8dbe83656..9ea4bfe8f 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:7.4-fpm-buster +FROM php:7.4-fpm-buster ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index a5730e05f..31b1fbf61 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:8.0-fpm-alpine +FROM php:8.0-fpm-alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 0842d5d33..0ce5ff49e 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM php:8.0-fpm-buster +FROM php:8.0-fpm-buster ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 03a71645c..2fbc33c64 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +FROM webdevops/base-app:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index cc5ac6320..e6947d6e0 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +FROM webdevops/base-app:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index 384aed566..fbcc5cd41 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:centos-7 +FROM webdevops/base-app:centos-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile index ccc9f11df..30fb8016f 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-10 +FROM webdevops/base-app:debian-10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 881ebaa71..8fdecb920 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-7 +FROM webdevops/base-app:debian-7 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 8977731de..23a5ad289 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-8 +FROM webdevops/base-app:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 0bb618c53..15facea24 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-8 +FROM webdevops/base-app:debian-8 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 258d7345b..f6c1201ed 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:debian-9 +FROM webdevops/base-app:debian-9 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index a5111aad7..cf3518bdb 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-12.04 +FROM webdevops/base-app:ubuntu-12.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 6d74abbcf..73cf2b94e 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-14.04 +FROM webdevops/base-app:ubuntu-14.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 2746727ff..39beefeaf 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-15.04 +FROM webdevops/base-app:ubuntu-15.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 3f0a6db28..dce60652f 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-15.10 +FROM webdevops/base-app:ubuntu-15.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index bf226c64e..1b5121226 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-16.04 +FROM webdevops/base-app:ubuntu-16.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 00a69fa38..1d9936fdf 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-16.10 +FROM webdevops/base-app:ubuntu-16.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile index dd384bd60..dda4d5cb8 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-17.04 +FROM webdevops/base-app:ubuntu-17.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile index 438c989ad..9ef83cff7 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-17.10 +FROM webdevops/base-app:ubuntu-17.10 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile index f82587ebe..6eb42de72 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:ubuntu-18.04 +FROM webdevops/base-app:ubuntu-18.04 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index a1651aa49..00de27950 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/php-nginx:7.1 +FROM webdevops/php-nginx:7.1 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 3b7e3a2b9..64ea52100 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:latest +FROM webdevops/base-app:latest ARG BUILDARCH ARG TARGETARCH diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 43f9ac053..0fe69fc01 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM zendesk/samson:latest +FROM zendesk/samson:latest ARG BUILDARCH ARG TARGETARCH diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index acd273872..b52597306 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 064b83d71..84d60befb 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM webdevops/base-app:latest +FROM webdevops/base-app:latest ARG BUILDARCH ARG TARGETARCH diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index 817255a33..713d57898 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM alpine:latest +FROM alpine:latest ARG BUILDARCH ARG TARGETARCH diff --git a/docker/toolbox/alpine/Dockerfile b/docker/toolbox/alpine/Dockerfile index 57ba2244f..b513c3271 100644 --- a/docker/toolbox/alpine/Dockerfile +++ b/docker/toolbox/alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM alpine:latest +FROM alpine:latest ARG BUILDARCH ARG TARGETARCH diff --git a/docker/toolbox/buster/Dockerfile b/docker/toolbox/buster/Dockerfile index 3e08871ec..c1b0fa6f3 100644 --- a/docker/toolbox/buster/Dockerfile +++ b/docker/toolbox/buster/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM debian:buster-slim +FROM debian:buster-slim ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 0013d272a..7cb6aba77 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 +FROM guywithnose/solr:4.10.4 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index bb6f588fa..2d38fc361 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM guywithnose/solr:4.10.4 +FROM guywithnose/solr:4.10.4 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index badbe3542..0dd75b798 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM solr:6.3.0 +FROM solr:6.3.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index afe7b8a54..89cc3f543 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM solr:6.3.0 +FROM solr:6.3.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 8ef695094..e1207a914 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM solr:6.6.2 +FROM solr:6.6.2 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index fc474a28d..b501348a6 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM solr:6.3.0 +FROM solr:6.3.0 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 302419c6d..2b831a235 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM solr:6.6.2 +FROM solr:6.6.2 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 7f4e7ada8..2cbf4bb0d 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM solr:6.6.2 +FROM solr:6.6.2 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 95b609276..1fef622dd 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -5,7 +5,7 @@ # staged baselayout builder -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base +FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base ARG BUILDARCH ARG TARGETARCH @@ -29,7 +29,7 @@ RUN set -eux \ rm -rf "$GNUPGHOME"; \ chmod +x "/baselayout/sbin/gosu"; -FROM --platform=$BUILDPLATFORM solr:6.6.3 +FROM solr:6.6.3 ARG BUILDARCH ARG TARGETARCH diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 291568f21..d8827d8c9 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine ARG BUILDARCH ARG TARGETARCH diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index d613d0c2c..ac413bcfc 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM --platform=$BUILDPLATFORM ghcr.io/cocoastorm/webdevops/base:latest +FROM ghcr.io/cocoastorm/webdevops/base:latest ARG BUILDARCH ARG TARGETARCH diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 95b814927..22b9c9dda 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -1,17 +1,9 @@ -{% macro from(image, tag="latest", user="webdevops", platform=True) -%} -{% if platform -%} -FROM --platform=$BUILDPLATFORM {{ user }}/{{ image }}:{{ tag }} -{%- else -%} +{% macro from(image, tag="latest", user="webdevops") -%} FROM {{ user }}/{{ image }}:{{ tag }} -{%- endif %} {%- endmacro %} -{% macro fromOfficial(image, tag="latest", platform=True) -%} -{% if platform -%} -FROM --platform=$BUILDPLATFORM {{ image }}:{{ tag }} -{%- else -%} +{% macro fromOfficial(image, tag="latest") -%} FROM {{ image }}:{{ tag }} -{%- endif %} {%- endmacro %} {% macro image(name, tag="latest", user="webdevops") -%} From 1538d32f162881d92e5aafeaaf6a9a864e7495aa Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 9 Aug 2022 13:22:15 -0700 Subject: [PATCH 078/123] avoid configuring ldap with a hardcoded libdir --- docker/php-official/5.6/Dockerfile | 1 - docker/php-official/7.0/Dockerfile | 1 - docker/php-official/7.1-alpine/Dockerfile | 1 - docker/php-official/7.1/Dockerfile | 1 - docker/php-official/7.2-alpine/Dockerfile | 1 - docker/php-official/7.2/Dockerfile | 1 - docker/php-official/7.3-alpine/Dockerfile | 1 - docker/php-official/7.3/Dockerfile | 1 - docker/php-official/7.4-alpine/Dockerfile | 1 - docker/php-official/7.4/Dockerfile | 1 - docker/php-official/8.0-alpine/Dockerfile | 1 - docker/php-official/8.0/Dockerfile | 1 - template/Dockerfile/images/php.jinja2 | 2 -- 13 files changed, 14 deletions(-) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 243b35172..580a9d1d0 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -167,7 +167,6 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 8c47e7a6a..aeed4da09 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -167,7 +167,6 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 2260e2738..90abb7b3f 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -174,7 +174,6 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 566f3cdce..9e3a73d65 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -167,7 +167,6 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index ae45d5885..098312928 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -174,7 +174,6 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 05307ed70..ece6224a3 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -167,7 +167,6 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 4f3c0fa36..d7e824d25 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -174,7 +174,6 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index cea262041..35440b499 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -167,7 +167,6 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index c2b1b3ea7..0b91daec6 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -174,7 +174,6 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 9ea4bfe8f..4fc498233 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -167,7 +167,6 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 31b1fbf61..85d9476ae 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -174,7 +174,6 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 0ce5ff49e..492832c13 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -170,7 +170,6 @@ RUN set -x \ && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 401a7736a..5f5661729 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -71,7 +71,6 @@ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ {%- endif %} - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -241,7 +240,6 @@ && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ {%- endif %} - && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ From 243bd850d6958a0aba9f1e5e0c234c2d24f6bcdf Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 10 Aug 2022 11:23:13 -0700 Subject: [PATCH 079/123] fix scripts for docker-arch-info and go-replace wrapper --- .../conf/usr/local/bin/docker-arch-info | 24 ++++++++--------- .../latest/conf/usr/local/bin/go-replace | 27 ++++++++++++------- .../general/usr/local/bin/docker-arch-info | 24 ++++++++--------- .../general/usr/local/bin/go-replace | 27 ++++++++++++------- 4 files changed, 58 insertions(+), 44 deletions(-) diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info b/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info index 234e235d3..08b4e962a 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info @@ -2,7 +2,8 @@ set -e -FILE="/opt/docker/ARCH_INFO.txt" +DOCKER_DIR="/opt/docker" +ARCH_FILE="/opt/docker/ARCH_INFO" printUsage() { echo "Usage $0 " @@ -14,25 +15,24 @@ printUsage() { exit 1 } -if [ $# -eq 0 ] || [ $# -gt 2 ]; then +if [ $# -lt 1 ]; then printUsage exit 2 fi if [ $# -eq 1 ]; then - BUILDARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" - TARGETARCH="$2" -fi - -if [ $# -eq 2 ]; then + TARGETARCH="$1" +else BUILDARCH="$1" TARGETARCH="$2" fi -mkdir -p "$(dirname $FILE)" -echo "storing to $FILE" +if [ ! -d "$DOCKER_DIR" ]; then + mkdir -p "$DOCKER_DIR" +fi +echo "storing to $ARCH_FILE" { - echo "BUILDARCH=${BUILDARCH}"; \ - echo "TARGETARCH=${TARGETARCH}"; \ -} > $FILE + [ -n "$BUILDARCH" ] && echo "BUILDARCH=${BUILDARCH}"; \ + [ -n "$TARGETARCH" ] && echo "TARGETARCH=${TARGETARCH}"; \ +} | tee $ARCH_FILE diff --git a/docker/base-layout/latest/conf/usr/local/bin/go-replace b/docker/base-layout/latest/conf/usr/local/bin/go-replace index 27ba754da..88734adad 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/go-replace +++ b/docker/base-layout/latest/conf/usr/local/bin/go-replace @@ -2,6 +2,7 @@ set -e +ARCH_FILE="/opt/docker/ARCH_INFO" VERSION="1.1.2" if command -v dpkg > /dev/null; then @@ -12,8 +13,7 @@ download() { /usr/local/bin/install-go-replace "$1" } -if [ -f "/opt/docker/ARCH_INFO.txt" ]; then - ARCH_FILE="/opt/docker/ARCH_INFO.txt" +if [ -f "/opt/docker/ARCH_INFO" ]; then while IFS="=" read -r key value; do case "$key" in "BUILDARCH") BUILDARCH="$value" ;; @@ -22,13 +22,8 @@ if [ -f "/opt/docker/ARCH_INFO.txt" ]; then done < "$ARCH_FILE" fi -if [ ! -n "$BUILDARCH" ]; then - if ! command -v dpkg > /dev/null; then - echo "dpkg not installed and BUILDARCH was not found" - exit 2 - fi - - BUILDARCH="$ARCH" +if [ ! -n "$BUILDARCH" ] && [ -n "$ARCH" ]; then + echo "$BUILDARCH missing, using `dpkg --print-architecture` to determine" fi for TARGET in "$BUILDARCH" "$TARGETARCH"; do @@ -38,7 +33,19 @@ for TARGET in "$BUILDARCH" "$TARGETARCH"; do done if [ -n "$BUILDARCH" ]; then + echo "go-replace-$BUILDARCH" exec "/usr/local/bin/go-replace-$BUILDARCH" "$@" -else +fi + +if [ -n "$TARGETARCH" ]; then + echo "go-replace-$TARGETARCH" + exec "/usr/local/bin/go-replace-$TARGETARCH" "$@" +fi + +if [ -n "$ARCH" ]; then + echo "go-replace-$ARCH" exec "/usr/local/bin/go-replace-$ARCH" "$@" +else + echo "no suitable ARCH found" + exit 2 fi diff --git a/provisioning/base-layout/general/usr/local/bin/docker-arch-info b/provisioning/base-layout/general/usr/local/bin/docker-arch-info index 234e235d3..08b4e962a 100755 --- a/provisioning/base-layout/general/usr/local/bin/docker-arch-info +++ b/provisioning/base-layout/general/usr/local/bin/docker-arch-info @@ -2,7 +2,8 @@ set -e -FILE="/opt/docker/ARCH_INFO.txt" +DOCKER_DIR="/opt/docker" +ARCH_FILE="/opt/docker/ARCH_INFO" printUsage() { echo "Usage $0 " @@ -14,25 +15,24 @@ printUsage() { exit 1 } -if [ $# -eq 0 ] || [ $# -gt 2 ]; then +if [ $# -lt 1 ]; then printUsage exit 2 fi if [ $# -eq 1 ]; then - BUILDARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" - TARGETARCH="$2" -fi - -if [ $# -eq 2 ]; then + TARGETARCH="$1" +else BUILDARCH="$1" TARGETARCH="$2" fi -mkdir -p "$(dirname $FILE)" -echo "storing to $FILE" +if [ ! -d "$DOCKER_DIR" ]; then + mkdir -p "$DOCKER_DIR" +fi +echo "storing to $ARCH_FILE" { - echo "BUILDARCH=${BUILDARCH}"; \ - echo "TARGETARCH=${TARGETARCH}"; \ -} > $FILE + [ -n "$BUILDARCH" ] && echo "BUILDARCH=${BUILDARCH}"; \ + [ -n "$TARGETARCH" ] && echo "TARGETARCH=${TARGETARCH}"; \ +} | tee $ARCH_FILE diff --git a/provisioning/base-layout/general/usr/local/bin/go-replace b/provisioning/base-layout/general/usr/local/bin/go-replace index 27ba754da..88734adad 100755 --- a/provisioning/base-layout/general/usr/local/bin/go-replace +++ b/provisioning/base-layout/general/usr/local/bin/go-replace @@ -2,6 +2,7 @@ set -e +ARCH_FILE="/opt/docker/ARCH_INFO" VERSION="1.1.2" if command -v dpkg > /dev/null; then @@ -12,8 +13,7 @@ download() { /usr/local/bin/install-go-replace "$1" } -if [ -f "/opt/docker/ARCH_INFO.txt" ]; then - ARCH_FILE="/opt/docker/ARCH_INFO.txt" +if [ -f "/opt/docker/ARCH_INFO" ]; then while IFS="=" read -r key value; do case "$key" in "BUILDARCH") BUILDARCH="$value" ;; @@ -22,13 +22,8 @@ if [ -f "/opt/docker/ARCH_INFO.txt" ]; then done < "$ARCH_FILE" fi -if [ ! -n "$BUILDARCH" ]; then - if ! command -v dpkg > /dev/null; then - echo "dpkg not installed and BUILDARCH was not found" - exit 2 - fi - - BUILDARCH="$ARCH" +if [ ! -n "$BUILDARCH" ] && [ -n "$ARCH" ]; then + echo "$BUILDARCH missing, using `dpkg --print-architecture` to determine" fi for TARGET in "$BUILDARCH" "$TARGETARCH"; do @@ -38,7 +33,19 @@ for TARGET in "$BUILDARCH" "$TARGETARCH"; do done if [ -n "$BUILDARCH" ]; then + echo "go-replace-$BUILDARCH" exec "/usr/local/bin/go-replace-$BUILDARCH" "$@" -else +fi + +if [ -n "$TARGETARCH" ]; then + echo "go-replace-$TARGETARCH" + exec "/usr/local/bin/go-replace-$TARGETARCH" "$@" +fi + +if [ -n "$ARCH" ]; then + echo "go-replace-$ARCH" exec "/usr/local/bin/go-replace-$ARCH" "$@" +else + echo "no suitable ARCH found" + exit 2 fi From 90022febaa533d765754800cf0f3576a06616958 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 10 Aug 2022 11:24:38 -0700 Subject: [PATCH 080/123] pull referenced images when building for non-base images --- .github/actions/composite-docker/action.yml | 13 ++++++++++++- .github/workflows/docker.yml | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/actions/composite-docker/action.yml b/.github/actions/composite-docker/action.yml index 072f8a194..3fdc539ef 100644 --- a/.github/actions/composite-docker/action.yml +++ b/.github/actions/composite-docker/action.yml @@ -25,6 +25,16 @@ inputs: image-tags: description: 'docker image tags' required: true + + image-push: + description: 'push built images' + required: false + default: true + + image-pull: + description: 'referenced docker images should be pulled first' + required: false + default: false runs: using: "composite" steps: @@ -46,5 +56,6 @@ runs: with: context: ${{ inputs.image-context }} platforms: ${{ inputs.image-platforms }} - push: true + push: ${{ inputs.image-push }} + pull: ${{ inputs.image-pull }} tags: ${{ inputs.image-tags }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9ebba653f..96ebbc883 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -108,4 +108,5 @@ jobs: image-name: ${{ matrix.name }} image-context: ${{ matrix.context }} image-tags: ${{ matrix.tags }} + image-pull: true From 5862ff03848a5e82e90b9a1000d58126609bbf3d Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 10 Aug 2022 11:28:04 -0700 Subject: [PATCH 081/123] break it some more --- docker/ansible/alpine/Dockerfile | 1 + docker/ansible/centos-7/Dockerfile | 1 + docker/ansible/debian-7/Dockerfile | 1 + docker/ansible/debian-8/Dockerfile | 1 + docker/ansible/debian-9/Dockerfile | 1 + docker/ansible/ubuntu-12.04/Dockerfile | 1 + docker/ansible/ubuntu-14.04/Dockerfile | 1 + docker/ansible/ubuntu-15.04/Dockerfile | 1 + docker/ansible/ubuntu-15.10/Dockerfile | 1 + docker/ansible/ubuntu-16.04/Dockerfile | 1 + docker/ansible/ubuntu-17.04/Dockerfile | 1 + docker/apache-dev/alpine/Dockerfile | 1 + docker/apache-dev/centos-7/Dockerfile | 1 + docker/apache-dev/debian-10/Dockerfile | 1 + docker/apache-dev/debian-7/Dockerfile | 1 + docker/apache-dev/debian-8/Dockerfile | 1 + docker/apache-dev/debian-9/Dockerfile | 1 + docker/apache-dev/ubuntu-12.04/Dockerfile | 1 + docker/apache-dev/ubuntu-14.04/Dockerfile | 1 + docker/apache-dev/ubuntu-15.04/Dockerfile | 1 + docker/apache-dev/ubuntu-15.10/Dockerfile | 1 + docker/apache-dev/ubuntu-16.04/Dockerfile | 1 + docker/apache-dev/ubuntu-16.10/Dockerfile | 1 + docker/apache-dev/ubuntu-17.04/Dockerfile | 1 + docker/apache-dev/ubuntu-17.10/Dockerfile | 1 + docker/apache-dev/ubuntu-18.04/Dockerfile | 1 + docker/apache/alpine/Dockerfile | 1 + docker/apache/centos-7/Dockerfile | 1 + docker/apache/debian-10/Dockerfile | 1 + docker/apache/debian-7/Dockerfile | 2 ++ docker/apache/debian-8/Dockerfile | 2 ++ docker/apache/debian-9/Dockerfile | 1 + docker/apache/ubuntu-12.04/Dockerfile | 1 + docker/apache/ubuntu-14.04/Dockerfile | 1 + docker/apache/ubuntu-15.04/Dockerfile | 1 + docker/apache/ubuntu-15.10/Dockerfile | 1 + docker/apache/ubuntu-16.04/Dockerfile | 1 + docker/apache/ubuntu-16.10/Dockerfile | 1 + docker/apache/ubuntu-17.04/Dockerfile | 1 + docker/apache/ubuntu-17.10/Dockerfile | 1 + docker/apache/ubuntu-18.04/Dockerfile | 1 + docker/base-app/alpine/Dockerfile | 1 + docker/base-app/centos-7/Dockerfile | 1 + docker/base-app/debian-10/Dockerfile | 1 + docker/base-app/debian-7/Dockerfile | 1 + docker/base-app/debian-8/Dockerfile | 1 + docker/base-app/debian-9/Dockerfile | 1 + docker/base-app/ubuntu-12.04/Dockerfile | 1 + docker/base-app/ubuntu-14.04/Dockerfile | 1 + docker/base-app/ubuntu-15.04/Dockerfile | 1 + docker/base-app/ubuntu-15.10/Dockerfile | 1 + docker/base-app/ubuntu-16.04/Dockerfile | 1 + docker/base-app/ubuntu-16.10/Dockerfile | 1 + docker/base-app/ubuntu-17.04/Dockerfile | 1 + docker/base-app/ubuntu-17.10/Dockerfile | 1 + docker/base-app/ubuntu-18.04/Dockerfile | 1 + docker/base/alpine/Dockerfile | 1 + docker/base/centos-7/Dockerfile | 1 + docker/base/debian-10/Dockerfile | 1 + docker/base/debian-7/Dockerfile | 1 + docker/base/debian-8/Dockerfile | 1 + docker/base/debian-9/Dockerfile | 1 + docker/base/ubuntu-12.04/Dockerfile | 1 + docker/base/ubuntu-14.04/Dockerfile | 1 + docker/base/ubuntu-15.04/Dockerfile | 1 + docker/base/ubuntu-15.10/Dockerfile | 1 + docker/base/ubuntu-16.04/Dockerfile | 1 + docker/base/ubuntu-16.10/Dockerfile | 1 + docker/base/ubuntu-17.04/Dockerfile | 1 + docker/base/ubuntu-17.10/Dockerfile | 1 + docker/base/ubuntu-18.04/Dockerfile | 1 + docker/bootstrap/alpine/Dockerfile | 1 + docker/bootstrap/centos-7/Dockerfile | 1 + docker/bootstrap/ubuntu-12.04/Dockerfile | 1 + docker/bootstrap/ubuntu-14.04/Dockerfile | 1 + docker/bootstrap/ubuntu-15.04/Dockerfile | 1 + docker/bootstrap/ubuntu-15.10/Dockerfile | 1 + docker/bootstrap/ubuntu-16.04/Dockerfile | 1 + docker/bootstrap/ubuntu-16.10/Dockerfile | 1 + docker/bootstrap/ubuntu-17.04/Dockerfile | 1 + docker/bootstrap/ubuntu-17.10/Dockerfile | 1 + docker/bootstrap/ubuntu-18.04/Dockerfile | 1 + docker/certbot/latest/Dockerfile | 1 + docker/dockerfile-build-env/latest/Dockerfile | 1 + docker/liquidsoap/latest/Dockerfile | 1 + docker/mail-sandbox/latest/Dockerfile | 1 + docker/nginx/alpine/Dockerfile | 1 + docker/nginx/centos-7/Dockerfile | 1 + docker/nginx/debian-10/Dockerfile | 1 + docker/nginx/debian-7/Dockerfile | 1 + docker/nginx/debian-8/Dockerfile | 1 + docker/nginx/debian-9/Dockerfile | 1 + docker/nginx/ubuntu-12.04/Dockerfile | 1 + docker/nginx/ubuntu-14.04/Dockerfile | 1 + docker/nginx/ubuntu-15.04/Dockerfile | 1 + docker/nginx/ubuntu-15.10/Dockerfile | 1 + docker/nginx/ubuntu-16.04/Dockerfile | 1 + docker/nginx/ubuntu-16.10/Dockerfile | 1 + docker/nginx/ubuntu-17.04/Dockerfile | 1 + docker/nginx/ubuntu-17.10/Dockerfile | 1 + docker/nginx/ubuntu-18.04/Dockerfile | 1 + docker/php-apache-dev/5.6/Dockerfile | 1 + docker/php-apache-dev/7.0/Dockerfile | 1 + docker/php-apache-dev/7.1-alpine/Dockerfile | 1 + docker/php-apache-dev/7.1/Dockerfile | 1 + docker/php-apache-dev/7.2-alpine/Dockerfile | 1 + docker/php-apache-dev/7.2/Dockerfile | 1 + docker/php-apache-dev/7.3-alpine/Dockerfile | 1 + docker/php-apache-dev/7.3/Dockerfile | 1 + docker/php-apache-dev/7.4-alpine/Dockerfile | 1 + docker/php-apache-dev/7.4/Dockerfile | 1 + docker/php-apache-dev/8.0-alpine/Dockerfile | 1 + docker/php-apache-dev/8.0/Dockerfile | 1 + docker/php-apache-dev/centos-7-php56/Dockerfile | 1 + docker/php-apache-dev/centos-7-php7/Dockerfile | 1 + docker/php-apache-dev/centos-7/Dockerfile | 1 + docker/php-apache-dev/debian-10/Dockerfile | 1 + docker/php-apache-dev/debian-7/Dockerfile | 1 + docker/php-apache-dev/debian-8-php7/Dockerfile | 1 + docker/php-apache-dev/debian-8/Dockerfile | 1 + docker/php-apache-dev/debian-9/Dockerfile | 1 + docker/php-apache-dev/ubuntu-12.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-14.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-15.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-15.10/Dockerfile | 1 + docker/php-apache-dev/ubuntu-16.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-16.10/Dockerfile | 1 + docker/php-apache-dev/ubuntu-17.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-17.10/Dockerfile | 1 + docker/php-apache-dev/ubuntu-18.04/Dockerfile | 1 + docker/php-apache/5.6/Dockerfile | 1 + docker/php-apache/7.0/Dockerfile | 1 + docker/php-apache/7.1-alpine/Dockerfile | 1 + docker/php-apache/7.1/Dockerfile | 1 + docker/php-apache/7.2-alpine/Dockerfile | 1 + docker/php-apache/7.2/Dockerfile | 1 + docker/php-apache/7.3-alpine/Dockerfile | 1 + docker/php-apache/7.3/Dockerfile | 1 + docker/php-apache/7.4-alpine/Dockerfile | 1 + docker/php-apache/7.4/Dockerfile | 1 + docker/php-apache/8.0-alpine/Dockerfile | 1 + docker/php-apache/8.0/Dockerfile | 1 + docker/php-apache/centos-7-php56/Dockerfile | 1 + docker/php-apache/centos-7-php7/Dockerfile | 1 + docker/php-apache/centos-7/Dockerfile | 1 + docker/php-apache/debian-10/Dockerfile | 1 + 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 | 1 + docker/php-apache/ubuntu-12.04/Dockerfile | 1 + docker/php-apache/ubuntu-14.04/Dockerfile | 1 + docker/php-apache/ubuntu-15.04/Dockerfile | 1 + docker/php-apache/ubuntu-15.10/Dockerfile | 1 + docker/php-apache/ubuntu-16.04/Dockerfile | 1 + docker/php-apache/ubuntu-16.10/Dockerfile | 1 + docker/php-apache/ubuntu-17.04/Dockerfile | 1 + docker/php-apache/ubuntu-17.10/Dockerfile | 1 + docker/php-apache/ubuntu-18.04/Dockerfile | 1 + docker/php-dev/5.6/Dockerfile | 1 + docker/php-dev/7.0/Dockerfile | 1 + docker/php-dev/7.1-alpine/Dockerfile | 1 + docker/php-dev/7.1/Dockerfile | 1 + docker/php-dev/7.2-alpine/Dockerfile | 1 + docker/php-dev/7.2/Dockerfile | 1 + docker/php-dev/7.3-alpine/Dockerfile | 1 + docker/php-dev/7.3/Dockerfile | 1 + docker/php-dev/7.4-alpine/Dockerfile | 1 + docker/php-dev/7.4/Dockerfile | 1 + docker/php-dev/8.0-alpine/Dockerfile | 1 + docker/php-dev/8.0/Dockerfile | 1 + docker/php-dev/centos-7-php56/Dockerfile | 1 + docker/php-dev/centos-7-php7/Dockerfile | 1 + docker/php-dev/centos-7/Dockerfile | 1 + docker/php-dev/debian-10/Dockerfile | 1 + docker/php-dev/debian-7/Dockerfile | 1 + docker/php-dev/debian-8-php7/Dockerfile | 1 + docker/php-dev/debian-8/Dockerfile | 1 + docker/php-dev/debian-9/Dockerfile | 1 + docker/php-dev/ubuntu-12.04/Dockerfile | 1 + docker/php-dev/ubuntu-14.04/Dockerfile | 1 + docker/php-dev/ubuntu-15.04/Dockerfile | 1 + docker/php-dev/ubuntu-15.10/Dockerfile | 1 + docker/php-dev/ubuntu-16.04/Dockerfile | 1 + docker/php-dev/ubuntu-16.10/Dockerfile | 1 + docker/php-dev/ubuntu-17.04/Dockerfile | 1 + docker/php-dev/ubuntu-17.10/Dockerfile | 1 + docker/php-dev/ubuntu-18.04/Dockerfile | 1 + docker/php-nginx-dev/5.6/Dockerfile | 1 + docker/php-nginx-dev/7.0/Dockerfile | 1 + docker/php-nginx-dev/7.1-alpine/Dockerfile | 1 + docker/php-nginx-dev/7.1/Dockerfile | 1 + docker/php-nginx-dev/7.2-alpine/Dockerfile | 1 + docker/php-nginx-dev/7.2/Dockerfile | 1 + docker/php-nginx-dev/7.3-alpine/Dockerfile | 1 + docker/php-nginx-dev/7.3/Dockerfile | 1 + docker/php-nginx-dev/7.4-alpine/Dockerfile | 1 + docker/php-nginx-dev/7.4/Dockerfile | 1 + docker/php-nginx-dev/8.0-alpine/Dockerfile | 1 + docker/php-nginx-dev/8.0/Dockerfile | 1 + docker/php-nginx-dev/centos-7-php56/Dockerfile | 1 + docker/php-nginx-dev/centos-7-php7/Dockerfile | 1 + docker/php-nginx-dev/centos-7/Dockerfile | 1 + docker/php-nginx-dev/debian-10/Dockerfile | 1 + docker/php-nginx-dev/debian-7/Dockerfile | 1 + docker/php-nginx-dev/debian-8-php7/Dockerfile | 1 + docker/php-nginx-dev/debian-8/Dockerfile | 1 + docker/php-nginx-dev/debian-9/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 1 + docker/php-nginx/5.6/Dockerfile | 1 + docker/php-nginx/7.0/Dockerfile | 1 + docker/php-nginx/7.1-alpine/Dockerfile | 1 + docker/php-nginx/7.1/Dockerfile | 1 + docker/php-nginx/7.2-alpine/Dockerfile | 1 + docker/php-nginx/7.2/Dockerfile | 1 + docker/php-nginx/7.3-alpine/Dockerfile | 1 + docker/php-nginx/7.3/Dockerfile | 1 + docker/php-nginx/7.4-alpine/Dockerfile | 1 + docker/php-nginx/7.4/Dockerfile | 1 + docker/php-nginx/8.0-alpine/Dockerfile | 1 + docker/php-nginx/8.0/Dockerfile | 1 + docker/php-nginx/centos-7-php56/Dockerfile | 1 + docker/php-nginx/centos-7-php7/Dockerfile | 1 + docker/php-nginx/centos-7/Dockerfile | 1 + docker/php-nginx/debian-10/Dockerfile | 1 + docker/php-nginx/debian-7/Dockerfile | 1 + docker/php-nginx/debian-8-php7/Dockerfile | 1 + docker/php-nginx/debian-8/Dockerfile | 1 + docker/php-nginx/debian-9/Dockerfile | 1 + docker/php-nginx/ubuntu-12.04/Dockerfile | 1 + docker/php-nginx/ubuntu-14.04/Dockerfile | 1 + docker/php-nginx/ubuntu-15.04/Dockerfile | 1 + docker/php-nginx/ubuntu-15.10/Dockerfile | 1 + docker/php-nginx/ubuntu-16.04/Dockerfile | 1 + docker/php-nginx/ubuntu-16.10/Dockerfile | 1 + docker/php-nginx/ubuntu-17.04/Dockerfile | 1 + docker/php-nginx/ubuntu-17.10/Dockerfile | 1 + docker/php-nginx/ubuntu-18.04/Dockerfile | 1 + docker/php-official/5.6/Dockerfile | 3 +++ docker/php-official/7.0/Dockerfile | 3 +++ docker/php-official/7.1-alpine/Dockerfile | 3 +++ docker/php-official/7.1/Dockerfile | 3 +++ docker/php-official/7.2-alpine/Dockerfile | 3 +++ docker/php-official/7.2/Dockerfile | 3 +++ docker/php-official/7.3-alpine/Dockerfile | 3 +++ docker/php-official/7.3/Dockerfile | 3 +++ docker/php-official/7.4-alpine/Dockerfile | 3 +++ docker/php-official/7.4/Dockerfile | 3 +++ docker/php-official/8.0-alpine/Dockerfile | 4 +++- docker/php-official/8.0-alpine/Dockerfile.jinja2 | 1 - docker/php-official/8.0/Dockerfile | 3 +++ docker/php/centos-7-php56/Dockerfile | 1 + docker/php/centos-7-php7/Dockerfile | 1 + docker/php/centos-7/Dockerfile | 1 + docker/php/debian-10/Dockerfile | 1 + docker/php/debian-7/Dockerfile | 1 + docker/php/debian-8-php7/Dockerfile | 1 + docker/php/debian-8/Dockerfile | 1 + docker/php/debian-9/Dockerfile | 1 + docker/php/ubuntu-12.04/Dockerfile | 1 + docker/php/ubuntu-14.04/Dockerfile | 1 + docker/php/ubuntu-15.04/Dockerfile | 1 + docker/php/ubuntu-15.10/Dockerfile | 1 + docker/php/ubuntu-16.04/Dockerfile | 1 + docker/php/ubuntu-16.10/Dockerfile | 1 + docker/php/ubuntu-17.04/Dockerfile | 1 + docker/php/ubuntu-17.10/Dockerfile | 1 + docker/php/ubuntu-18.04/Dockerfile | 1 + docker/piwik/latest/Dockerfile | 1 + docker/postfix/latest/Dockerfile | 1 + docker/samson-deployment/latest/Dockerfile | 8 ++++++++ docker/sphinx/latest/Dockerfile | 1 + docker/ssh/latest/Dockerfile | 1 + docker/typo3-solr/5.0/Dockerfile | 1 + docker/typo3-solr/6.0/Dockerfile | 1 + docker/typo3-solr/6.1/Dockerfile | 1 + docker/typo3-solr/6.5/Dockerfile | 1 + docker/typo3-solr/7.0/Dockerfile | 1 + docker/typo3-solr/7.5/Dockerfile | 1 + docker/typo3-solr/8.0/Dockerfile | 1 + docker/typo3-solr/8.1/Dockerfile | 1 + docker/varnish/latest/Dockerfile | 1 + docker/vsftp/latest/Dockerfile | 1 + template/Dockerfile/docker.jinja2 | 1 + template/Dockerfile/provision.jinja2 | 4 ---- 293 files changed, 327 insertions(+), 6 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index ab4817bc9..bfca256dd 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && apk del python-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 32b49e680..328d46879 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && yum erase -y python-devel \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index f61f51e37..b89eee8df 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -34,4 +34,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index d1f6d009b..54dd350f2 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -34,4 +34,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 9c9c79cbe..24a5861f8 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -34,4 +34,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 9c4cfef9a..9122bc984 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 7398e6295..1273719e1 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index b353d39ca..9880d55e7 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 7c477eb59..3e86d3271 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index cc0315d19..4cebe0f03 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index f812bd3de..6ed8f46d8 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 8fa268c02..0f8079a03 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index a05a9fd8e..f33daa1bb 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index 22d1a86a2..e0132f9f3 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index e1d0792a2..df68cbc92 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index b7f2a5a03..5dc3ea485 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index aea3d70e7..818370789 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 681ad20a2..653187da2 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index a9a5ef924..7fec58aa0 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 7e388258b..222fd7c26 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 53810d742..7fee24627 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 324dc0b93..896d40c18 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index a63b2757a..dc72cdcd4 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index e00833883..97253f08e 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index b55f69fc4..9fa33c68c 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index 572cc5b98..d8828194f 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index d69e6d804..4ac94e8f3 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -32,6 +32,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 4d63f1a01..d2114e822 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index e7c258880..17c87444c 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 9f5a70567..16cdc7e30 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -30,9 +30,11 @@ RUN set -x \ && a2enmod actions fastcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 3571fab43..08e9d0cec 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -29,9 +29,11 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 83f0507fa..2dd1dbaeb 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 520563828..2310116a2 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -31,6 +31,7 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 78cb8849e..5717316bc 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -31,6 +31,7 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 7747aab45..19c74c604 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index c0f5adecf..58affe8a7 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index fef43d8be..80f987025 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index be233557a..fe11925dc 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index fb53c5bc5..93fbd35fd 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index b6a685d62..19dd5d97f 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index 166412251..7b5c36a63 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index 72d0bfda4..7cbed3fde 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index d4299ddc5..038d8ed4c 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index 5ff688667..a7b34e291 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index a05b8898d..698751a43 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index fad5f36b1..c4b62ee7e 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index d38905569..08500d3a3 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 5f8cb9b46..e0652064f 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 116ac7a24..bbf3dde7f 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 81a569f6c..efe3060d6 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 154bfbd07..dede9f575 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 00f43b29c..112618dc2 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 3026396d6..bb1ff1267 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index 991b231b8..9c18dbfa9 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index d46f82dd4..2a62e97bc 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index b81ae66e8..048b89a3c 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 1290807fe..14d25ec9a 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index a5d3528a1..0fb7d1e56 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index 3d73acc16..0678ce2d7 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index cacbf831b..012c84649 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 329c46515..f7d41e1fa 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index bb267c6c0..d089e730e 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index bafca8de2..ec2781487 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 3058e1653..ea0b2f835 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 66d970cea..f10a3aed5 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 6d5f3fc96..006c81e71 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 704c91bdd..0db46ae6e 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 5b1d1212c..a953091b7 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index 1c3a5ee87..c7c6c8a46 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index 1f6113935..3eb1defed 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index df80a2c82..ebfa46deb 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENTRYPOINT ["/entrypoint"] diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 1a79df1e0..bc7097ad6 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -65,4 +65,5 @@ RUN set -x \ && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 9a485d667..37c06bb79 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -56,4 +56,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 3da22523b..e350efb13 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -66,4 +66,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index ba6f2a7c2..0fce08323 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -61,4 +61,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 4a3659ae7..d953e4999 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -66,4 +66,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 60480ba4b..98817311d 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -66,4 +66,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index ea55c60aa..11923866f 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -61,4 +61,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 74d119b6a..75e759838 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -66,4 +66,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 4a643410b..0f0ad7ec3 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -66,4 +66,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 0360adefc..47dba71a2 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -61,4 +61,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 5fb617d34..47b00ba2d 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -61,4 +61,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index d2c36d74e..68db2fa39 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -24,4 +24,5 @@ RUN set -x \ && pip install certbot \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index e51008e6c..065f2a7e7 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -36,6 +36,7 @@ RUN apt-install \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ && cd /tmp/Dockerfile \ && make setup \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR /app diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index ca27774ff..2de98787b 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -17,6 +17,7 @@ RUN /usr/local/bin/apt-install \ gstreamer1.0-plugins-good \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENV LIQUIDSOAP_USER "liquidsoap" diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index d13aebb53..360241d1d 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -22,6 +22,7 @@ RUN set -x \ && docker-service enable dovecot \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index 74e432257..eace734c4 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 194b0fbbe..b31ddf252 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index ed9fa51d4..b2d27cb71 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -26,6 +26,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index b0a82a334..62311c52f 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -26,6 +26,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index df2743b7f..84fcc5151 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -26,6 +26,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 65eaf5db7..2e7a52809 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -26,6 +26,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 002f02f39..a225e7923 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index a7c7ec521..e62070f25 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index c10d80156..3b5a7f1d1 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 2cdcbee9f..20877a613 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 65cda28a6..7549e7519 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 7e2eb30cd..034af14da 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index f10b8ee1b..36e175007 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index 4787bc38e..8b984b7aa 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index 759c0cc19..2c05bc074 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index b422c849c..f25fa69e6 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 317aed878..61043c239 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index 35419e9b5..5d89a2ed1 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -42,4 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index e84528415..e83c90c2f 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index ed37277b8..daf1858fb 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -42,4 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index f20bb86a8..d5090a750 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index d0ea00147..21119ebf5 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -42,4 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 6f6b84fa2..2082cae70 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index e44c682e1..c3ad4834b 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -42,4 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index 4e1bab9cf..864dbd5d8 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index e0bde0034..798b3cf65 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -36,4 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index e26ff98f4..fef955002 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 736da29c9..4cb5a17ea 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -36,4 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index 5f5cc74c5..d027cf839 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -36,4 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index a5a19e585..fc445aaed 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -37,4 +37,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile index f1d3f607e..e51d93c2a 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 796d922d3..94cf54939 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 3ebbcfa52..847b89413 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index ee7b04215..de70a7351 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 2b61fc9e6..e041e8f55 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 2d5973ac9..4eb976513 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 831a8228f..63841e831 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 0605d73a0..b517ece03 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index 3e0e61bcd..04fc6a5f3 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index e862bc585..1691faf2f 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index 0a68391af..d6d4ccd7c 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index bd4b8d629..8f6c82494 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index 9952d625f..84a8a3204 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index 52b9e041e..1665f8303 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index 5485f3aa0..8b7d213dd 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index 1499f1e76..d4e182b6a 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index 8073cb88f..ac7c0b7ad 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index 1e47e2870..31bb14492 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index 02799a52c..45eb7ef64 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index e85eeed92..922d5d5da 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 22424fdd6..8ddb6b4a4 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index a1ba6514a..9b906ead2 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index 8d7d3094d..95b349d1b 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index c7073a994..51e4993ad 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 81960adf1..63fccc090 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index 178a0cf7d..77d3282c5 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index e5aecf3f8..ab6598c77 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 1c79f88d5..869d016e1 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 7bb89c9c2..c9ac5e070 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index 31b35436e..d2bf8d581 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index dc2980630..4649facf8 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -31,9 +31,11 @@ RUN set -x \ && a2enmod actions fastcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 208557d1d..545c3433d 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -30,9 +30,11 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 77079b3f6..b32b076c4 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -30,9 +30,11 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 49e5bd2d1..fea96be26 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 860253cf3..db7e27da6 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -32,6 +32,7 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index fba1c23e7..ce1d1123f 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -32,6 +32,7 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 19039ae0e..de302ca63 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 8ee27a2a9..c076f8dae 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index ae3e5cbbb..1872cad33 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index 54bb5714a..dfd217899 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index 5958a844c..608a41685 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index b247f7ee3..a85cc5b49 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index f70e76a0e..af5588097 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index 363cffc88..18f72fb17 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -25,4 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 9c0c55c9c..e787a1f81 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -25,4 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index 778d4956c..4358df8b6 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -34,4 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 82a653796..5d8d5cdef 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -25,4 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index f219110b7..1162c753c 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -34,4 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index f091d8d13..1bcba2454 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -25,4 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index e7d463639..dc86a34f1 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -34,4 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index d7413ab4e..161536a68 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -25,4 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index b62896c8e..c210d4892 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -34,4 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index a9e7c2654..d9edf3795 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -25,4 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 5159c7a0e..1d1a2aa43 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -28,4 +28,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 9dab85db2..4150a696e 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -25,4 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index bea619461..8577440b8 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -28,4 +28,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index 3e4174f4b..e5d70d0a6 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -28,4 +28,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 6f8f2b316..7aeaf786c 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -29,4 +29,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index 6e2ae8d88..7e1e07e32 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 7713b0e37..81dcdcfbe 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 993da482b..00073771e 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 995e7c58c..3fc5d447b 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 092cc5871..2b570afac 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index a9b2f82d4..4418c41d3 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 3d4d12554..ec323385f 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 02f03ad50..7f4cfffe8 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index fc610d184..e5ddbd62c 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 20f99b5c7..d90450b3f 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 260b8fa8d..775ca2af8 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index 1aff963e1..e8964facb 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index 5d26ce83c..1b53f0c6d 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index 246faf984..22ec4e5cd 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -32,4 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 28e5eb616..1b17604ec 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index 81902c326..dd26eadfe 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index 787eaacbd..2c389fe99 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -42,4 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index ca0fedbcb..1c47638a3 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index 051b27a07..9bb40133f 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -42,4 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index 9dbb5f7e2..c94f994b7 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index 5be7dc422..277ada141 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -42,4 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index 8fac6062a..5f00a59aa 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index cfc3b9c4d..570c6d5c5 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -42,4 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index 61e24a103..3035c7e3e 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 0cc4310aa..59643bde6 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -36,4 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index 492361d0d..0601a92dd 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -33,4 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 8ee48e4d1..db79ec198 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -36,4 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index 73fb8b63a..d4e5a894c 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -36,4 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index babc55a31..ac210a4c8 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -37,4 +37,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile index 3746b1243..be2076355 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 9b561e654..b1bcf499d 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 5de0f5234..3dda33557 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index da687cc30..a96eb630a 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index fb4c4adb9..0ab467869 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 8bcacfdc1..c43c19253 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 74b2a6938..ea341f4c2 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 4e579a820..4fb54b414 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index d088a00ac..4aef07cb5 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index bb173b006..d28830fec 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index b95287a04..9fc47bb9a 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index a88fe443c..2201e4467 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index 26f0b1dd4..6265552bf 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index 7ed050af0..f9ff549c8 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -40,4 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index a41e7b8f8..4959bf557 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index af3a9ecd2..31b28bdc2 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index 74c8d3218..2cb41a21e 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index fde7f205d..5300bef6d 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index 0be485955..0c4f77caf 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index cafb6cf48..7b4259432 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index 4acea7739..41fd7a4fb 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index c071007ef..da3b55d96 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index 8950bfb99..43766c0ff 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index a80b5059d..147fc1ccc 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index 85440765f..7c97c116c 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index 983ae9042..f26421153 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index aa554f8e9..9ed1c7a4b 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 1a8e49a42..a0e7923b4 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 9d4ceecc3..cd12b3f9b 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index 2dc71ecff..8534b0448 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index be63ee1b1..0e3c33cd2 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 02d834b60..2331b2cc6 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index d511fadc8..01d5913c0 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index f2aa90250..4b2c506f7 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 0bcaedec0..2c6fb9ef1 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index f1d2f9b94..9b8691258 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index e163487ec..5c8184473 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index ea73cd1b9..7aa54217b 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 438eaba90..55cb6b8e2 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index be963ef3f..372729739 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index 732707e5f..d584ea747 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index dbaeaf1d2..753774015 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index 37447d746..c2906e8fa 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 580a9d1d0..9ad23c952 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -106,6 +107,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -236,6 +238,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index aeed4da09..181727fa3 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -106,6 +107,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -241,6 +243,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 90abb7b3f..18fb018c9 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -110,6 +111,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -258,6 +260,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 9e3a73d65..316e846bb 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -106,6 +107,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -241,6 +243,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 098312928..7bf759f14 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -110,6 +111,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -262,6 +264,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index ece6224a3..7a02f4c1c 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -106,6 +107,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -240,6 +242,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index d7e824d25..639ecaaaf 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -110,6 +111,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -262,6 +264,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 35440b499..256701472 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -106,6 +107,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -240,6 +242,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 0b91daec6..8d2a0a7bf 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -110,6 +111,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -262,6 +264,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 4fc498233..20e10f2b9 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -106,6 +107,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -239,6 +241,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 85d9476ae..09ad9cc09 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -110,6 +111,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -258,7 +260,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && symlink-go-replace \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.0-alpine/Dockerfile.jinja2 b/docker/php-official/8.0-alpine/Dockerfile.jinja2 index 12f1cca5a..ae5d059f9 100644 --- a/docker/php-official/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.0-alpine/Dockerfile.jinja2 @@ -32,7 +32,6 @@ RUN set -x \ RUN set -x \ {{ php.officialAlpine(version='8.0') }} \ - {{ provision.symlinkGoReplace() }} \ {{ docker.cleanup() }} {{ docker.workdir('/') }} diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 492832c13..2d92aa430 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -106,6 +107,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -232,6 +234,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 2fbc33c64..62504d46e 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -66,6 +66,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index e6947d6e0..cd4826359 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -70,6 +70,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index fbcc5cd41..0f7481ef9 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -71,6 +71,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile index 30fb8016f..10579b185 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -67,6 +67,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 8fdecb920..152a0b73a 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -60,6 +60,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 23a5ad289..c18231cb5 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -78,6 +78,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 15facea24..7c8f39f7e 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -61,6 +61,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index f6c1201ed..8513c2269 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index cf3518bdb..fe5be1816 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -61,6 +61,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 73cf2b94e..dff0b910f 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -62,6 +62,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 39beefeaf..94bd3d081 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -62,6 +62,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index dce60652f..ce69655ed 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -62,6 +62,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 1b5121226..3ae6b3900 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 1d9936fdf..5493aec93 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile index dda4d5cb8..15b5fcb59 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile index 9ef83cff7..1614f8d02 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile index 6eb42de72..a0931972b 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -68,6 +68,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index 00de27950..e5ff70d45 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ && find /app/ -type f -exec chmod 0644 {} \; \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup VOLUME /app diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 64ea52100..df2c2db2d 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -15,6 +15,7 @@ RUN set -x \ && docker-service enable postfix \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 25 465 587 diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 0fe69fc01..0aa78b5e0 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ ca-certificates \ locales \ gnupg \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ############################################################################### @@ -101,6 +102,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -116,6 +118,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ############################################################################### @@ -138,6 +141,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ############################################################################### @@ -176,6 +180,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \ ## Enable ansible for deployment user && chmod 755 /usr/local/bin/ansible* \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup # NPM stack @@ -185,6 +190,7 @@ RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \ && npm install -g grunt-cli \ && npm install -g bower \ && npm install -g npm-cache \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup # Deployer stack @@ -201,6 +207,7 @@ RUN set -x \ && chmod +x /usr/local/bin/dep \ # Deployer: capistrano (http://capistranorb.com/) && gem install capistrano \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup # Upload @@ -215,6 +222,7 @@ RUN rake assets:precompile \ && /opt/docker/bin/bootstrap.sh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index b52597306..d8b030d10 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -37,4 +37,5 @@ RUN set -x \ && pip install t3targets \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 84d60befb..0ac10e2b1 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -12,6 +12,7 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 22 diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 2d38fc361..c6cf9efdb 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -65,6 +65,7 @@ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && mkdir -p /opt/solr/server/solr/data \ && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ && chown -R solr:solr /opt/solr/server/solr/ \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 0dd75b798..c34e65c32 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 89cc3f543..da4f3f822 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index e1207a914..3c4ce8c16 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index b501348a6..f60842b46 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 2b831a235..c2feb1323 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 2cbf4bb0d..c381113a1 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 1fef622dd..1492ddfa5 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup USER solr diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index d8827d8c9..275a2242a 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ varnish \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup CMD ["varnishd"] diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index ac413bcfc..24d978576 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -26,6 +26,7 @@ RUN set -x \ /var/log/supervisor \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 20 21 12020 12021 12022 12023 12024 12025 diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 22b9c9dda..f7b4095de 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -56,5 +56,6 @@ CMD ["{{ command }}"] {%- endmacro -%} {%- macro cleanup() -%} + && docker-arch-info $TARGETARCH \ && docker-image-cleanup {%- endmacro -%} diff --git a/template/Dockerfile/provision.jinja2 b/template/Dockerfile/provision.jinja2 index a2603ab07..105422728 100644 --- a/template/Dockerfile/provision.jinja2 +++ b/template/Dockerfile/provision.jinja2 @@ -5,10 +5,6 @@ \{%- endif %} && /opt/docker/bin/bootstrap.sh{% endmacro %} -{% macro symlinkGoReplace() -%} -&& symlink-go-replace -{%- endmacro %} - {% macro runBootstrap() -%} && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap From 9002dd30e4e707dc086205166b3811ae21ac9528 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 10 Aug 2022 11:34:29 -0700 Subject: [PATCH 082/123] let's leave it in there fk it --- .../latest/conf/usr/local/bin/docker-image-cleanup | 4 ---- .../base-layout/general/usr/local/bin/docker-image-cleanup | 4 ---- 2 files changed, 8 deletions(-) diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup index 9950bcbd4..92c179e48 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup @@ -35,7 +35,3 @@ esac find /tmp/ /var/log/ -mindepth 1 -delete rm -rf /root/.cache - -if [ -f "/opt/docker/ARCH_INFO.txt" ]; then - rm -f -- /opt/docker/ARCH_INFO.txt -fi diff --git a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup index 9950bcbd4..92c179e48 100755 --- a/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup +++ b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup @@ -35,7 +35,3 @@ esac find /tmp/ /var/log/ -mindepth 1 -delete rm -rf /root/.cache - -if [ -f "/opt/docker/ARCH_INFO.txt" ]; then - rm -f -- /opt/docker/ARCH_INFO.txt -fi From b68da680f145ee8bf0955877118e3683e291bb3c Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 10 Aug 2022 19:30:47 -0700 Subject: [PATCH 083/123] baselayout: unset BUILDARCH if explicitly called with just TARGETARCH --- docker/base-layout/latest/conf/usr/local/bin/docker-arch-info | 1 + provisioning/base-layout/general/usr/local/bin/docker-arch-info | 1 + template/Dockerfile/docker.jinja2 | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info b/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info index 08b4e962a..73abf5bbd 100755 --- a/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info @@ -21,6 +21,7 @@ if [ $# -lt 1 ]; then fi if [ $# -eq 1 ]; then + unset BUILDARCH TARGETARCH="$1" else BUILDARCH="$1" diff --git a/provisioning/base-layout/general/usr/local/bin/docker-arch-info b/provisioning/base-layout/general/usr/local/bin/docker-arch-info index 08b4e962a..73abf5bbd 100755 --- a/provisioning/base-layout/general/usr/local/bin/docker-arch-info +++ b/provisioning/base-layout/general/usr/local/bin/docker-arch-info @@ -21,6 +21,7 @@ if [ $# -lt 1 ]; then fi if [ $# -eq 1 ]; then + unset BUILDARCH TARGETARCH="$1" else BUILDARCH="$1" diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index f7b4095de..246568e57 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -55,7 +55,7 @@ ENTRYPOINT ["{{ command }}"] CMD ["{{ command }}"] {%- endmacro -%} -{%- macro cleanup() -%} +{%- macro cleanup() %} && docker-arch-info $TARGETARCH \ && docker-image-cleanup {%- endmacro -%} From f8bb63880d3ad5b17aedc73082c84ec737206bf8 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 12 Aug 2022 15:58:36 -0700 Subject: [PATCH 084/123] 3 matrixes: base, multiservice, and dev --- .../generate_gh_action_matrix_command.py | 64 +++++----- bin/webdevops/DockerfileFilter.py | 113 ++++++++++++++++++ 2 files changed, 143 insertions(+), 34 deletions(-) create mode 100644 bin/webdevops/DockerfileFilter.py diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index 797cf300c..f888888bf 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -6,6 +6,7 @@ import sys from cleo import Output from webdevops import DockerfileUtility +from webdevops.DockerfileFilter import MatrixBuilder from webdevops.command import BaseCommand class GenerateGHActionMatrixCommand(BaseCommand): @@ -65,52 +66,47 @@ def run_task(self, configuration): whitelist=whitelist, blacklist=blacklist, ) - dockerfile_blocks = [self.process_dockerfile(file) for file in dockerfiles] - - base_img_blocks = [] - needs_dep_img_blocks = [] - - for block in dockerfile_blocks: - block_input = block['input'] - dockerfile_input = os.path.splitext(block_input)[0] - - from_img = DockerfileUtility.parse_dockerfile_from_statement(dockerfile_input) - - if image_prefix in from_img: - needs_dep_img_blocks.append(block) - else: - base_img_blocks.append(block) - - # base images - base_images = [] - for base_img in base_img_blocks: - base_images.append(base_img) - - # toolbox should be first :tm: - if "toolbox" in base_img["name"]: - base_images.insert(0, base_images.pop(base_images.index(base_img))) - - # images with parent image from "webdevops" - # /shrug + matrix = MatrixBuilder(dockerfiles) + matrix.build() + # matrix.printGraph(self.line) output_path = os.path.split(dockerfile_path)[0] - output_base_file = os.path.join(output_path, 'gh_matrix-base-images.json') - output_multi_file = os.path.join(output_path, 'gh_matrix-multi-images.json') # matrix: base images + base_images = [self.process_dockerfile(file) for file in matrix.get_base_images()] + output_base_file = os.path.join(output_path, 'gh_matrix-base-images.json') + self.line("\n\n") base_matrix = self.fmt_github_output("matrix-base", json.dumps(base_images)) print(base_matrix) - self.line("\n\n") - multi_matrix = self.fmt_github_output("matrix-multi", json.dumps(needs_dep_img_blocks)) - print(multi_matrix) with open(output_base_file, 'w') as f: json.dump(base_images, f, indent=2) - with open(output_multi_file, 'w') as fm: - json.dump(needs_dep_img_blocks, fm, indent=2) + # matrix: multiservice images + multiservice_images = [self.process_dockerfile(file) for file in matrix.get_multiservice_images()] + output_multiservice_file = os.path.join(output_path, 'gh_matrix-multiservice-images.json') + + self.line("\n\n") + multi_matrix = self.fmt_github_output("matrix-multi", json.dumps(multiservice_images)) + print(multi_matrix) + self.line("\n\n") + + with open(output_multiservice_file, 'w') as fm: + json.dump(multiservice_images, fm, indent=2) + + # matrix: development images + development_images = [self.process_dockerfile(file) for file in matrix.get_development_images()] + output_development_file = os.path.join(output_path, 'gh_matrix-development-images.json') + + self.line("\n\n") + dev_matrix = self.fmt_github_output("matrix-dev", json.dumps(development_images)) + print(dev_matrix) + self.line("\n\n") + + with open(output_development_file, 'w') as fd: + json.dump(development_images, fd, indent=2) def fmt_github_output(self, name, output): text = output diff --git a/bin/webdevops/DockerfileFilter.py b/bin/webdevops/DockerfileFilter.py new file mode 100644 index 000000000..76201951e --- /dev/null +++ b/bin/webdevops/DockerfileFilter.py @@ -0,0 +1,113 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import json + +def should_be_ignored(name, ignore_list): + for ignore_term in ignore_list: + if ignore_term in name: + return True + return False + +class MatrixBuilder(): + cache = {} + + base_images = [] + graph = {} + + image_prefix = '' + dockerfile_blocks = [] + + # ignore these for now + ignore = [ + 'php-official', + 'toolbox', + ] + + def __init__(self, dockerfile_blocks, my_image_prefix="webdevops"): + self.image_prefix = my_image_prefix + self.dockerfile_blocks = dockerfile_blocks + + def __add_to_cache(self, dockerfile_block): + image_name = dockerfile_block['image']['fullname'] + self.cache[image_name] = dockerfile_block + + def __add_to_base_images_list(self, dockerfile_block): + dockerfile_image = dockerfile_block['image'] + image_from = dockerfile_image['from'] + + if self.image_prefix in image_from and should_be_ignored(image_from, self.ignore): + self.base_images.append(dockerfile_block) + + def __add_to_dependency_graph(self, dockerfile_block): + dockerfile_image = dockerfile_block['image'] + + image_name = dockerfile_image['fullname'] + image_from = dockerfile_image['from'] + image_multistage = dockerfile_image['multiStageImages'] + + if self.image_prefix not in image_from: + return + + if should_be_ignored(image_from, self.ignore): + return + + image_deps = [dockerfile_image['from']] + + if image_multistage: + image_deps.extend(image_multistage) + + self.__add_to_cache(dockerfile_block) + + for image_dep in image_deps: + if should_be_ignored(image_dep, self.ignore): + continue + + graph_list = self.graph.get(image_dep) + + if graph_list: + graph_list.extend([image_name]) + self.graph[image_dep] = graph_list + else: + self.graph[image_dep] = [image_name] + + def __build_dependency_graph(self): + for dockerfile_block in self.dockerfile_blocks: + self.__add_to_base_images_list(dockerfile_block) + self.__add_to_dependency_graph(dockerfile_block) + + def __ignore_base_images(self): + for base_dockerfile_block in self.base_images: + # https://stackoverflow.com/a/11277439/5332177 + self.graph.pop(base_dockerfile_block['image']['fullname'], None) + + def build(self): + self.__build_dependency_graph() + self.__ignore_base_images() + + def get_base_images(self): + return self.base_images + + def get_multiservice_images(self): + multiservice_images_list = self.graph.keys() + return [self.cache[name] for name in multiservice_images_list] + + def get_development_images(self): + dependent_images_list = [] + + for images in self.graph.values(): + dependent_images_list.extend(images) + + return [self.cache[name] for name in dependent_images_list] + + def printGraph(self, line): + line("base images") + line(json.dumps(self.base_images)) + + line("") + line("multiservice images:") + line(json.dumps(self.get_multiservice_images())) + + line("") + line("dev images:") + line(json.dumps(self.get_development_images())) From e6a3b4cc5a8324b1639ba9f33d3872c66a2db5ec Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 15 Aug 2022 16:25:42 -0700 Subject: [PATCH 085/123] docker workflow: build base, multi, and dev matrixes --- .github/actions/composite-docker/action.yml | 2 +- .github/workflows/docker.yml | 30 +++++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/actions/composite-docker/action.yml b/.github/actions/composite-docker/action.yml index 3fdc539ef..3c57444f5 100644 --- a/.github/actions/composite-docker/action.yml +++ b/.github/actions/composite-docker/action.yml @@ -1,4 +1,4 @@ -name: 'Docker Composite Build' +name: Docker Build description: 'qemu + buildx + ghcr.io login + docker-build-push' inputs: registry-user: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 96ebbc883..1abfa05c4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,6 +5,7 @@ on: branches: - 'main' - 'experimental/gh-actions' + - 'experimental/some-dependency-tracking' concurrency: group: "${{ github.ref }}" @@ -49,6 +50,7 @@ jobs: outputs: base: ${{ steps.generate-matrix.outputs.matrix-base }} multi: ${{ steps.generate-matrix.outputs.matrix-multi }} + dev: ${{ steps.generate-matrix.outputs.matrix-dev }} steps: - name: Checkout uses: actions/checkout@v3 @@ -66,7 +68,6 @@ jobs: build-base-images: needs: - - build-toolbox-image - generate-matrix runs-on: ubuntu-latest strategy: @@ -77,7 +78,7 @@ jobs: - name: Check out repository uses: actions/checkout@v3 - - name: Docker Build Composite + - name: Build "${{ matrix.name }}" uses: ./.github/actions/composite-docker with: registry-user: ${{ github.repository_owner }} @@ -89,7 +90,6 @@ jobs: build-multi-images: needs: - generate-matrix - - build-toolbox-image - build-base-images runs-on: ubuntu-latest strategy: @@ -100,7 +100,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Docker Build Composite + - name: Build "${{ matrix.name }}" uses: ./.github/actions/composite-docker with: registry-user: ${{ github.repository_owner }} @@ -108,5 +108,25 @@ jobs: image-name: ${{ matrix.name }} image-context: ${{ matrix.context }} image-tags: ${{ matrix.tags }} - image-pull: true + build-dev-images: + needs: + - generate-matrix + - build-multi-images + runs-on: ubuntu-latest + strategy: + max-parallel: 2 + matrix: + include: ${{ fromJson(needs.generate-matrix.outputs.dev) }} + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Build ${{ matrix.name }} + uses: ./.github/actions/composite-docker + with: + registry-user: ${{ github.repository_owner }} + registry-secret: ${{ secrets.GITHUB_TOKEN }} + image-name: ${{ matrix.name }} + image-context: ${{ matrix.context }} + image-tags: ${{ matrix.tags }} From db9b8ee9fad7308abe05821a32e481b92085cc59 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 15 Aug 2022 16:29:35 -0700 Subject: [PATCH 086/123] docker workflow: build-base-images job should need build-toolbox-image --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1abfa05c4..42a359eac 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -69,6 +69,7 @@ jobs: build-base-images: needs: - generate-matrix + - build-toolbox-image runs-on: ubuntu-latest strategy: max-parallel: 2 From 8a65af26e26126432a141ca590d7d51ce2076efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Fri, 19 Nov 2021 12:06:53 +0100 Subject: [PATCH 087/123] remove xdebug 2 --- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- .../general/provision/bootstrap.d/10-nginx.sh | 1 + .../provision/bootstrap.d/20-php-module-xdebug.sh | 3 --- .../provision/entrypoint.d/10-php-debugger.sh | 15 --------------- 177 files changed, 1 insertion(+), 1584 deletions(-) diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-apache-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/debian-8/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/debian-9/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-17.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-17.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-18.04/conf/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" diff --git a/provisioning/nginx/general/provision/bootstrap.d/10-nginx.sh b/provisioning/nginx/general/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/provisioning/nginx/general/provision/bootstrap.d/10-nginx.sh +++ b/provisioning/nginx/general/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/provisioning/php-dev/general/provision/bootstrap.d/20-php-module-xdebug.sh b/provisioning/php-dev/general/provision/bootstrap.d/20-php-module-xdebug.sh index 538774c9a..e76310003 100644 --- a/provisioning/php-dev/general/provision/bootstrap.d/20-php-module-xdebug.sh +++ b/provisioning/php-dev/general/provision/bootstrap.d/20-php-module-xdebug.sh @@ -23,14 +23,11 @@ esac # Configure xdebug for development go-replace --mode=lineinfile --regex \ - -s '^[\s;]*xdebug.remote_enable[\s]*=' -r 'xdebug.remote_enable = 1' \ -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ - -s '^[\s;]*xdebug.remote_connect_back[\s]*=' -r 'xdebug.remote_connect_back = 1' \ -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ - -s '^[\s;]*xdebug.profiler_output_dir[\s]*=' -r 'xdebug.profiler_output_dir = /tmp/debug' \ -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ -- /opt/docker/etc/php/php.webdevops.ini diff --git a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh index 76260e6a1..7b392587c 100644 --- a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh +++ b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh @@ -88,14 +88,6 @@ function phpEnvironmentVariable() { # XDEBUG ################### -# xdebug2 remote debugger -phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" -phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" -phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" -phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" -phpEnvironmentVariable "xdebug.max_nesting_level" "XDEBUG_MAX_NESTING_LEVEL" -phpEnvironmentVariable "xdebug.idekey" "XDEBUG_IDE_KEY" - # xdebug3 remote debugger phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" @@ -103,13 +95,6 @@ phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" -# xdebug2 profiler -phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" -phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" -phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" -phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" -phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" - # xdebug3 profiler phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" From f334519b789810a1a81cc38457a97e4a025d9638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Tue, 30 Nov 2021 15:49:56 +0100 Subject: [PATCH 088/123] feat: php 8.1 official --- docker/php-apache-dev/8.0-alpine/Dockerfile | 6 + docker/php-apache-dev/8.1/Dockerfile | 27 ++ docker/php-apache-dev/8.1/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.1/conf/bin/service.d/blackfire-agent.sh | 25 ++ .../8.1/conf/etc/httpd/conf.d/02-dev.conf | 8 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.1/conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ .../provision/entrypoint.d/20-apache-dev.sh | 5 + docker/php-apache/8.1/Dockerfile | 30 ++ docker/php-apache/8.1/Dockerfile.jinja2 | 13 + .../8.1/conf/bin/service.d/httpd.d/10-init.sh | 6 + .../8.1/conf/bin/service.d/httpd.sh | 14 + .../8.1/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../8.1/conf/etc/httpd/conf.d/10-log.conf | 4 + .../8.1/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../8.1/conf/etc/httpd/conf.d/10-server.conf | 18 + .../php-apache/8.1/conf/etc/httpd/global.conf | 1 + .../php-apache/8.1/conf/etc/httpd/main.conf | 10 + docker/php-apache/8.1/conf/etc/httpd/php.conf | 1 + .../8.1/conf/etc/httpd/ssl/server.crt | 28 ++ .../8.1/conf/etc/httpd/ssl/server.csr | 26 ++ .../8.1/conf/etc/httpd/ssl/server.key | 51 +++ .../8.1/conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../php-apache/8.1/conf/etc/httpd/vhost.conf | 36 ++ .../8.1/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../8.1/conf/etc/supervisor.d/apache.conf | 14 + .../8.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ++++++ .../8.1/conf/provision/bootstrap.d/10-php.sh | 8 + .../8.1/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 + docker/php-dev/8.0-alpine/Dockerfile | 6 + docker/php-dev/8.1/Dockerfile | 19 + docker/php-dev/8.1/Dockerfile.jinja2 | 8 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.1/conf/bin/service.d/blackfire-agent.sh | 25 ++ .../bin/service.d/ssh.d/99-development.sh | 3 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.1/conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/bootstrap.d/99-development.sh | 5 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ docker/php-nginx-dev/8.0-alpine/Dockerfile | 6 + docker/php-nginx-dev/8.1/Dockerfile | 27 ++ docker/php-nginx-dev/8.1/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../8.1/conf/bin/service.d/blackfire-agent.sh | 25 ++ .../8.1/conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../8.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 + .../8.1/conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ .../provision/entrypoint.d/20-nginx-dev.sh | 7 + docker/php-nginx/8.1/Dockerfile | 25 ++ docker/php-nginx/8.1/Dockerfile.jinja2 | 14 + .../8.1/conf/bin/service.d/nginx.d/10-init.sh | 5 + .../php-nginx/8.1/conf/bin/service.d/nginx.sh | 10 + .../8.1/conf/etc/nginx/conf.d/.gitkeep | 0 .../8.1/conf/etc/nginx/conf.d/10-php.conf | 3 + .../php-nginx/8.1/conf/etc/nginx/global.conf | 1 + docker/php-nginx/8.1/conf/etc/nginx/main.conf | 4 + docker/php-nginx/8.1/conf/etc/nginx/php.conf | 1 + .../8.1/conf/etc/nginx/ssl/server.crt | 28 ++ .../8.1/conf/etc/nginx/ssl/server.csr | 26 ++ .../8.1/conf/etc/nginx/ssl/server.key | 51 +++ .../8.1/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../php-nginx/8.1/conf/etc/nginx/vhost.conf | 26 ++ .../8.1/conf/etc/nginx/vhost.ssl.conf | 7 + .../8.1/conf/etc/supervisor.d/nginx.conf | 14 + .../8.1/conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 ++ .../8.1/conf/provision/bootstrap.d/10-php.sh | 7 + .../8.1/conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 ++ docker/php-official/5.6/Dockerfile | 4 +- docker/php-official/7.0/Dockerfile | 4 +- docker/php-official/7.1/Dockerfile | 4 +- docker/php-official/7.2/Dockerfile | 4 +- docker/php-official/7.3/Dockerfile | 4 +- docker/php-official/7.4/Dockerfile | 4 +- docker/php-official/8.0/Dockerfile | 4 +- docker/php-official/8.1/8.1 | 1 + docker/php-official/8.1/Dockerfile | 216 ++++++++++++ docker/php-official/8.1/Dockerfile.jinja2 | 37 ++ docker/php-official/8.1/conf/VERSION | 1 + docker/php-official/8.1/conf/bin/bootstrap.sh | 3 + docker/php-official/8.1/conf/bin/config.sh | 117 +++++++ docker/php-official/8.1/conf/bin/control.sh | 160 +++++++++ .../8.1/conf/bin/entrypoint.d/cli.sh | 19 + .../8.1/conf/bin/entrypoint.d/default.sh | 3 + .../8.1/conf/bin/entrypoint.d/noop.sh | 7 + .../8.1/conf/bin/entrypoint.d/root.sh | 14 + .../8.1/conf/bin/entrypoint.d/supervisord.sh | 9 + .../php-official/8.1/conf/bin/entrypoint.sh | 46 +++ docker/php-official/8.1/conf/bin/provision | 8 + docker/php-official/8.1/conf/bin/provision.py | 328 ++++++++++++++++++ .../8.1/conf/bin/service.d/cron.d/10-init.sh | 16 + .../8.1/conf/bin/service.d/cron.sh | 10 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 ++ .../8.1/conf/bin/service.d/dnsmasq.sh | 11 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../8.1/conf/bin/service.d/php-fpm.sh | 10 + .../conf/bin/service.d/postfix.d/10-init.sh | 30 ++ .../8.1/conf/bin/service.d/postfix.sh | 42 +++ .../8.1/conf/bin/service.d/ssh.d/10-init.sh | 7 + .../8.1/conf/bin/service.d/ssh.sh | 10 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../8.1/conf/bin/service.d/supervisor.sh | 11 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../8.1/conf/bin/service.d/syslog-ng.sh | 10 + .../bin/usr-bin/container-file-auto-restore | 26 ++ .../conf/bin/usr-bin/docker-ansible-install | 77 ++++ .../8.1/conf/bin/usr-bin/docker-cronjob | 26 ++ .../8.1/conf/bin/usr-bin/docker-php-setting | 44 +++ .../8.1/conf/bin/usr-bin/docker-provision | 9 + .../8.1/conf/bin/usr-bin/docker-service | 89 +++++ .../conf/bin/usr-bin/docker-service-disable | 3 + .../conf/bin/usr-bin/docker-service-enable | 4 + .../php-official/8.1/conf/bin/usr-bin/service | 86 +++++ .../8.1/conf/bin/usr-bin/version-compare | 43 +++ .../php-official/8.1/conf/etc/cron/.gitkeep | 0 .../8.1/conf/etc/logrotate.d/php5-fpm | 12 + .../8.1/conf/etc/logrotate.d/syslog-ng | 38 ++ .../8.1/conf/etc/php/conf.d/.gitkeep | 0 .../8.1/conf/etc/php/fpm/.gitkeep | 0 docker/php-official/8.1/conf/etc/php/php.ini | 1 + .../8.1/conf/etc/php/php.webdevops.ini | 34 ++ .../php-official/8.1/conf/etc/supervisor.conf | 20 ++ .../8.1/conf/etc/supervisor.d/.gitkeep | 0 .../8.1/conf/etc/supervisor.d/cron.conf | 14 + .../8.1/conf/etc/supervisor.d/dnsmasq.conf | 14 + .../8.1/conf/etc/supervisor.d/php-fpm.conf | 15 + .../8.1/conf/etc/supervisor.d/postfix.conf | 15 + .../8.1/conf/etc/supervisor.d/ssh.conf | 14 + .../8.1/conf/etc/supervisor.d/syslog.conf | 13 + .../8.1/conf/etc/syslog-ng/syslog-ng.conf | 48 +++ .../8.1/conf/provision/ansible.cfg | 0 .../8.1/conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 + .../provision/bootstrap.d/10-permissions.sh | 2 + .../conf/provision/bootstrap.d/10-php-init.sh | 4 + .../provision/bootstrap.d/10-supervisor.sh | 10 + .../bootstrap.d/10-user-application.sh | 10 + .../conf/provision/bootstrap.d/11-php-conf.sh | 10 + .../8.1/conf/provision/bootstrap.d/20-app.sh | 5 + .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 +++ .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 +++ .../provision/bootstrap.d/20-setup-php.sh | 11 + .../provision/bootstrap.d/30-setup-ioncube.sh | 45 +++ .../conf/provision/bootstrap.d/90-cleanup.sh | 12 + .../8.1/conf/provision/build.d/.gitkeep | 0 .../8.1/conf/provision/build.d/10-cleanup.sh | 7 + .../8.1/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 +++++ .../8.1/conf/provision/entrypoint.d/20-php.sh | 75 ++++ .../8.1/conf/provision/onbuild.d/.gitkeep | 0 .../8.1/conf/provision/roles/.gitkeep | 0 .../8.1/conf/provision/service.d/.gitkeep | 0 .../8.1/conf/provision/service.d/cron.sh | 13 + .../8.1/conf/provision/service.d/dnsmasq.sh | 24 ++ .../8.1/conf/provision/service.d/postfix.sh | 32 ++ .../8.1/conf/provision/service.d/ssh.sh | 17 + .../8.1/conf/provision/service.d/syslog.sh | 41 +++ .../conf/provision/variables-webdevops.yml | 7 + .../8.1/conf/provision/variables.yml | 7 + docker/php/8.1 | 1 + template/Dockerfile/images/php.jinja2 | 43 ++- 193 files changed, 4028 insertions(+), 26 deletions(-) create mode 100644 docker/php-apache-dev/8.1/Dockerfile create mode 100644 docker/php-apache-dev/8.1/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/8.1/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-apache-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/8.1/conf/provision/entrypoint.d/20-apache-dev.sh create mode 100644 docker/php-apache/8.1/Dockerfile create mode 100644 docker/php-apache/8.1/Dockerfile.jinja2 create mode 100644 docker/php-apache/8.1/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/8.1/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/8.1/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/8.1/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/8.1/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/8.1/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/8.1/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-apache/8.1/conf/provision/bootstrap.d/10-apache.sh create mode 100644 docker/php-apache/8.1/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache/8.1/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-apache/8.1/conf/provision/entrypoint.d/20-apache.sh create mode 100644 docker/php-dev/8.1/Dockerfile create mode 100644 docker/php-dev/8.1/Dockerfile.jinja2 create mode 100644 docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/8.1/conf/bin/service.d/ssh.d/99-development.sh create mode 100644 docker/php-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-dev/8.1/conf/provision/bootstrap.d/99-development.sh create mode 100644 docker/php-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.1/Dockerfile create mode 100644 docker/php-nginx-dev/8.1/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/8.1/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/20-nginx-dev.sh create mode 100644 docker/php-nginx/8.1/Dockerfile create mode 100644 docker/php-nginx/8.1/Dockerfile.jinja2 create mode 100644 docker/php-nginx/8.1/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/8.1/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/8.1/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/8.1/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx/8.1/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx/8.1/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-nginx/8.1/conf/provision/entrypoint.d/20-nginx.sh create mode 120000 docker/php-official/8.1/8.1 create mode 100644 docker/php-official/8.1/Dockerfile create mode 100644 docker/php-official/8.1/Dockerfile.jinja2 create mode 100644 docker/php-official/8.1/conf/VERSION create mode 100644 docker/php-official/8.1/conf/bin/bootstrap.sh create mode 100644 docker/php-official/8.1/conf/bin/config.sh create mode 100644 docker/php-official/8.1/conf/bin/control.sh create mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/8.1/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/8.1/conf/bin/entrypoint.sh create mode 100755 docker/php-official/8.1/conf/bin/provision create mode 100755 docker/php-official/8.1/conf/bin/provision.py create mode 100644 docker/php-official/8.1/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/8.1/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/container-file-auto-restore create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-ansible-install create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-cronjob create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-php-setting create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-provision create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-service create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/docker-service-enable create mode 100755 docker/php-official/8.1/conf/bin/usr-bin/service create mode 100644 docker/php-official/8.1/conf/bin/usr-bin/version-compare create mode 100644 docker/php-official/8.1/conf/etc/cron/.gitkeep create mode 100644 docker/php-official/8.1/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/8.1/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/8.1/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/8.1/conf/etc/php/fpm/.gitkeep create mode 100644 docker/php-official/8.1/conf/etc/php/php.ini create mode 100644 docker/php-official/8.1/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/8.1/conf/etc/supervisor.conf create mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/ssh.conf create mode 100644 docker/php-official/8.1/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/8.1/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/8.1/conf/provision/ansible.cfg create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-entrypoint.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-permissions.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-php-init.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-supervisor.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/10-user-application.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/11-php-conf.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/20-app.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh create mode 100644 docker/php-official/8.1/conf/provision/bootstrap.d/90-cleanup.sh create mode 100644 docker/php-official/8.1/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/8.1/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/8.1/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/8.1/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/8.1/conf/provision/entrypoint.d/20-php-fpm.sh create mode 100644 docker/php-official/8.1/conf/provision/entrypoint.d/20-php.sh create mode 100644 docker/php-official/8.1/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/8.1/conf/provision/roles/.gitkeep create mode 100644 docker/php-official/8.1/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/8.1/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/8.1/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.1/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/8.1/conf/provision/service.d/ssh.sh create mode 100644 docker/php-official/8.1/conf/provision/service.d/syslog.sh create mode 100644 docker/php-official/8.1/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/8.1/conf/provision/variables.yml create mode 120000 docker/php/8.1 diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 798b3cf65..487467e90 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -20,6 +20,12 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment + && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \ + && mv blackfire-agent /usr/local/bin/ \ + && chmod +x /usr/local/bin/blackfire-agent \ + && wget -q -O blackfire.so https://packages.blackfire.io/binaries/blackfire-php/1.33.0/blackfire-php-alpine_amd64-php-80.so \ + && mv blackfire.so "$(php -r "echo ini_get('extension_dir');")/blackfire.so" \ + && mkdir /var/run/blackfire/ \ && apk-install \ make \ autoconf \ diff --git a/docker/php-apache-dev/8.1/Dockerfile b/docker/php-apache-dev/8.1/Dockerfile new file mode 100644 index 000000000..d775a3067 --- /dev/null +++ b/docker/php-apache-dev/8.1/Dockerfile @@ -0,0 +1,27 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:8.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-apache:8.1 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-apache-dev/8.1/Dockerfile.jinja2 b/docker/php-apache-dev/8.1/Dockerfile.jinja2 new file mode 100644 index 000000000..797fe355c --- /dev/null +++ b/docker/php-apache-dev/8.1/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-apache", "8.1") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.1") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.1/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.1/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off + +LogLevel info diff --git a/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,10 @@ +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/20-apache-dev.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/8.1/conf/provision/entrypoint.d/20-apache-dev.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache/8.1/Dockerfile b/docker/php-apache/8.1/Dockerfile new file mode 100644 index 000000000..c25caa8c6 --- /dev/null +++ b/docker/php-apache/8.1/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:8.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.1 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install apache + && apt-install \ + apache2 \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/8.1/Dockerfile.jinja2 b/docker/php-apache/8.1/Dockerfile.jinja2 new file mode 100644 index 000000000..d8302f97f --- /dev/null +++ b/docker/php-apache/8.1/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php", "8.1") }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ apache.debian9() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.1/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.1/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..4ef318a1e --- /dev/null +++ b/docker/php-apache/8.1/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,6 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + diff --git a/docker/php-apache/8.1/conf/bin/service.d/httpd.sh b/docker/php-apache/8.1/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..1d871e7ea --- /dev/null +++ b/docker/php-apache/8.1/conf/bin/service.d/httpd.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.1/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..950e45105 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..cd62792e2 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout= + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..80b971734 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/8.1/conf/etc/httpd/global.conf b/docker/php-apache/8.1/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.1/conf/etc/httpd/main.conf b/docker/php-apache/8.1/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.1/conf/etc/httpd/php.conf b/docker/php-apache/8.1/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.1/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.1/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.conf b/docker/php-apache/8.1/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/8.1/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.1/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.1/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.1/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/8.1/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.1/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.1/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.1/conf/provision/bootstrap.d/10-apache.sh new file mode 100644 index 000000000..e9feb08b4 --- /dev/null +++ b/docker/php-apache/8.1/conf/provision/bootstrap.d/10-apache.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info dist) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) +IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') + +# Collect environment variables +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf + ;; + + RedHat) + APACHE_MAIN_PATH=/etc/httpd/ + APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf + ;; + + Alpine) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf + ;; +esac + +# Enable apache main config +ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" + +# Ensure /var/run/apache2 exists +mkdir -p -- "/var/run/apache2" + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + mkdir -p -- "/run/apache2" +fi + +# Maintain lock directory +if [[ "$IMAGE_FAMILY" == "Debian" ]]; then + mkdir -p -- "/var/lock/apache2" + chmod 0750 -- "/var/lock/apache2" + chown www-data:www-data -- "/var/lock/apache2" +fi + +APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') + +# Change log to Docker stdout +go-replace --regex --regex-backrefs \ + -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ + -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ + --path="$APACHE_MAIN_PATH" \ + --path-regex='(.*\.conf|default.*|.*log)$' + +# Switch MPM to event +if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -- /etc/httpd/conf.modules.d/00-mpm.conf +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ + -- /etc/apache2/httpd.conf \ + /etc/apache2/conf.d/ssl.conf \ + /etc/apache2/conf.d/proxy.conf + + # Remove default vhost + sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf +fi + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/httpd/ssl +find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.1/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..c8669ca25 --- /dev/null +++ b/docker/php-apache/8.1/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + diff --git a/docker/php-apache/8.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.1/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.1/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.1/conf/provision/entrypoint.d/20-apache.sh new file mode 100644 index 000000000..42ef48932 --- /dev/null +++ b/docker/php-apache/8.1/conf/provision/entrypoint.d/20-apache.sh @@ -0,0 +1,16 @@ +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 1d1a2aa43..25728db92 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -12,6 +12,12 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment + && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \ + && mv blackfire-agent /usr/local/bin/ \ + && chmod +x /usr/local/bin/blackfire-agent \ + && wget -q -O blackfire.so https://packages.blackfire.io/binaries/blackfire-php/1.33.0/blackfire-php-alpine_amd64-php-80.so \ + && mv blackfire.so "$(php -r "echo ini_get('extension_dir');")/blackfire.so" \ + && mkdir /var/run/blackfire/ \ && apk-install \ make \ autoconf \ diff --git a/docker/php-dev/8.1/Dockerfile b/docker/php-dev/8.1/Dockerfile new file mode 100644 index 000000000..5eb1cca0b --- /dev/null +++ b/docker/php-dev/8.1/Dockerfile @@ -0,0 +1,19 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:8.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.1 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-dev/8.1/Dockerfile.jinja2 b/docker/php-dev/8.1/Dockerfile.jinja2 new file mode 100644 index 000000000..f216cf16d --- /dev/null +++ b/docker/php-dev/8.1/Dockerfile.jinja2 @@ -0,0 +1,8 @@ +{{ docker.from("php", "8.1") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.1") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-dev/8.1/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.1/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.1/conf/bin/service.d/ssh.d/99-development.sh new file mode 100644 index 000000000..2502ab3e3 --- /dev/null +++ b/docker/php-dev/8.1/conf/bin/service.d/ssh.d/99-development.sh @@ -0,0 +1,3 @@ + +# Allow root access via ssh +go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-dev/8.1/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.1/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.1/conf/provision/bootstrap.d/99-development.sh new file mode 100644 index 000000000..7fc8cca55 --- /dev/null +++ b/docker/php-dev/8.1/conf/provision/bootstrap.d/99-development.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Set passwords to "dev" +echo "$APPLICATION_USER":"dev" | chpasswd +echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 59643bde6..477c1bbe1 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -20,6 +20,12 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install development environment + && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \ + && mv blackfire-agent /usr/local/bin/ \ + && chmod +x /usr/local/bin/blackfire-agent \ + && wget -q -O blackfire.so https://packages.blackfire.io/binaries/blackfire-php/1.33.0/blackfire-php-alpine_amd64-php-80.so \ + && mv blackfire.so "$(php -r "echo ini_get('extension_dir');")/blackfire.so" \ + && mkdir /var/run/blackfire/ \ && apk-install \ make \ autoconf \ diff --git a/docker/php-nginx-dev/8.1/Dockerfile b/docker/php-nginx-dev/8.1/Dockerfile new file mode 100644 index 000000000..a0b095001 --- /dev/null +++ b/docker/php-nginx-dev/8.1/Dockerfile @@ -0,0 +1,27 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx:8.1 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 new file mode 100644 index 000000000..29b063c47 --- /dev/null +++ b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-nginx", "8.1") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopment(version="8.1") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.1/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.1/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..b6100c8f1 --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable sendfile for nginx (eg. nfs usage) +go-replace --mode=lineinfile --regex \ + -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ + -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/20-nginx-dev.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/8.1/conf/provision/entrypoint.d/20-nginx-dev.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx/8.1/Dockerfile b/docker/php-nginx/8.1/Dockerfile new file mode 100644 index 000000000..520289e4f --- /dev/null +++ b/docker/php-nginx/8.1/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:8.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.1 + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install nginx + && apt-install \ + nginx \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/8.1/Dockerfile.jinja2 b/docker/php-nginx/8.1/Dockerfile.jinja2 new file mode 100644 index 000000000..4c3912db2 --- /dev/null +++ b/docker/php-nginx/8.1/Dockerfile.jinja2 @@ -0,0 +1,14 @@ +{{ docker.from("php", "8.1") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.nginx() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ nginx.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.1/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.1/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..8acb5111d --- /dev/null +++ b/docker/php-nginx/8.1/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,5 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi diff --git a/docker/php-nginx/8.1/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.1/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..3517c72a5 --- /dev/null +++ b/docker/php-nginx/8.1/conf/bin/service.d/nginx.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.1/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.1/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.1/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.1/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/8.1/conf/etc/nginx/global.conf b/docker/php-nginx/8.1/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.1/conf/etc/nginx/main.conf b/docker/php-nginx/8.1/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/php.conf b/docker/php-nginx/8.1/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..31c9bf05a --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size ; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..22b08a50d --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout ; +} diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..8225f314a --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf @@ -0,0 +1,26 @@ +server { + listen 80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,7 @@ +ssl on; +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.1/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.1/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/8.1/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.1/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..1ba70f963 --- /dev/null +++ b/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Remove daemon statement (will be added as command line argument) +go-replace --mode=lineinfile --regex --regex-backrefs \ + -s '^[\s#]*daemon ' -r '' \ + -- /etc/nginx/nginx.conf + +go-replace --mode=line --regex --regex-backrefs \ + -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ + -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ + -- /etc/nginx/nginx.conf + +# Enable nginx main config +mkdir -p /etc/nginx/conf.d/ +ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf + +rm -f \ + /etc/nginx/sites-enabled/default \ + /etc/nginx/conf.d/default.conf + +if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf +fi + +# Clear log dir +rm -rf /var/lib/nginx/logs +mkdir -p /var/lib/nginx/logs + +# Set log to stdout/stderr +ln -sf /var/lib/nginx/logs/access.log /docker.stdout +ln -sf /var/lib/nginx/logs/error.log /docker.stderr + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/nginx/ssl +find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..4a7d82647 --- /dev/null +++ b/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' diff --git a/docker/php-nginx/8.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.1/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.1/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.1/conf/provision/entrypoint.d/20-nginx.sh new file mode 100644 index 000000000..0264b6c2e --- /dev/null +++ b/docker/php-nginx/8.1/conf/provision/entrypoint.d/20-nginx.sh @@ -0,0 +1,24 @@ +# Create tmp dir for nginx +mkdir -p /var/tmp/nginx/ + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 9ad23c952..788f9d2c2 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -187,8 +187,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 181727fa3..163f158cb 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -187,8 +187,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 316e846bb..a5bc9dca2 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -187,8 +187,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 7a02f4c1c..83b835ee0 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -186,8 +186,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 256701472..74ad5e2fb 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -186,8 +186,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 20e10f2b9..3b2387137 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -185,8 +185,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 2d92aa430..e8004d632 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -190,8 +190,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.1/8.1 b/docker/php-official/8.1/8.1 new file mode 120000 index 000000000..8d1eec65a --- /dev/null +++ b/docker/php-official/8.1/8.1 @@ -0,0 +1 @@ +8.1 \ No newline at end of file diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile new file mode 100644 index 000000000..5e547d617 --- /dev/null +++ b/docker/php-official/8.1/Dockerfile @@ -0,0 +1,216 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:8.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM php:8.1-fpm-buster + +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV COMPOSER_VERSION="2" + + +# Baselayout copy (from staged image) +COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ +COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ + + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Init bootstrap + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ + # Enable non-free + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update + && /usr/local/bin/apt-upgrade \ + # Base stuff + && apt-install \ + apt-transport-https \ + ca-certificates \ + locales \ + gnupg + +RUN set -x \ + # Install packages + && chmod +x /opt/docker/bin/* \ + && apt-install \ + supervisor \ + wget \ + curl \ + vim \ + net-tools \ + tzdata \ + && chmod +s /sbin/gosu \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install services + && apt-install \ + # Install common tools + zip \ + unzip \ + bzip2 \ + moreutils \ + dnsutils \ + openssh-client \ + rsync \ + git \ + patch \ + && /usr/local/bin/generate-locales \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install php environment + && apt-install \ + # Install tools + imagemagick \ + graphicsmagick \ + ghostscript \ + jpegoptim \ + libjpeg-turbo-progs \ + pngcrush \ + optipng \ + apngopt \ + pngnq \ + pngquant \ + # Libraries + libvips42 \ + librabbitmq4 \ + libldap-2.4-2 \ + libxslt1.1 \ + zlibc \ + zlib1g \ + libpq5 \ + libpng16-16 \ + libmcrypt4 \ + libzip4 \ + # Dev and headers + libjpeg62-turbo-dev \ + libwebp-dev \ + libfreetype6-dev \ + libbz2-dev \ + libicu-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libmemcached-dev \ + libpng-dev \ + libpq-dev \ + libzip-dev \ + libc-client-dev \ + libc-client2007e-dev \ + libkrb5-dev \ + libvips-dev \ + librabbitmq-dev \ + libmagick++-dev \ + # Install guetzli + && wget https://github.com/google/guetzli/archive/master.zip \ + && unzip master.zip \ + && make -C guetzli-master \ + && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ + && rm -rf master.zip guetzli-master \ + # Install new version of ICU + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ + # Install extensions + && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ + && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-install \ + bcmath \ + amqp \ + imagick \ + bz2 \ + calendar \ + exif \ + intl \ + gettext \ + ldap \ + mysqli \ + imap \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + && pecl install memcached \ + && pecl install apcu \ + && pecl install vips \ + && pecl install redis \ + && pecl install mongodb \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ + && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ + && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ + # Uninstall dev and header packages + && apt-get purge -y -f --force-yes \ + libc-client-dev \ + libkrb5-dev \ + libbz2-dev \ + libicu-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng-dev \ + libwebp-dev \ + libpq-dev \ + libzip-dev \ + libvips-dev \ + librabbitmq-dev \ + libmagick++-dev \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ + && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ + # Enable php services + && docker-service enable syslog \ + && docker-service enable cron \ + && docker-run-bootstrap \ + && docker-image-cleanup + +WORKDIR / +EXPOSE 9000 +ENTRYPOINT ["/entrypoint"] +CMD ["supervisord"] diff --git a/docker/php-official/8.1/Dockerfile.jinja2 b/docker/php-official/8.1/Dockerfile.jinja2 new file mode 100644 index 000000000..d116bbc4a --- /dev/null +++ b/docker/php-official/8.1/Dockerfile.jinja2 @@ -0,0 +1,37 @@ + +{{ docker.fromOfficial("php", "8.1-fpm-buster") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.base() }} +{{ environment.baseApp() }} +{{ environment.phpOfficialSendmailWorkaround() }} +{{ environment.phpComposerVersion() }} + +{{ baselayout.copy() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ bootstrap.debian('buster') }} + +RUN set -x \ + {{ base.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ baseapp.debian() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ php.official(version='8.1') }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.1/conf/VERSION b/docker/php-official/8.1/conf/VERSION new file mode 100644 index 000000000..301160a93 --- /dev/null +++ b/docker/php-official/8.1/conf/VERSION @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/docker/php-official/8.1/conf/bin/bootstrap.sh b/docker/php-official/8.1/conf/bin/bootstrap.sh new file mode 100644 index 000000000..b1b3acdbc --- /dev/null +++ b/docker/php-official/8.1/conf/bin/bootstrap.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-run-bootstrap diff --git a/docker/php-official/8.1/conf/bin/config.sh b/docker/php-official/8.1/conf/bin/config.sh new file mode 100644 index 000000000..46265a3c0 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/config.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create /docker.stdout and /docker.stderr + # + ## +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -n "$LOG_STDOUT" ]]; then + echo "Log stdout redirected to $LOG_STDOUT" + else + LOG_STDOUT="/proc/$$/fd/1" + fi + + if [[ -n "$LOG_STDERR" ]]; then + echo "Log stderr redirected to $LOG_STDERR" + else + LOG_STDERR="/proc/$$/fd/2" + fi + + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr +} +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + echo "-> Executing ${FILE}" + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit 1 +} + + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" +} + +### + # List environment variables (based on prefix) + ## +function envListVars() { + if [[ $# -eq 1 ]]; then + env | grep "^${1}" | cut -d= -f1 + else + env | cut -d= -f1 + fi +} + +### + # Get environment variable (even with dots in name) + # + ## +function envGetValue() { + awk "BEGIN {print ENVIRON[\"$1\"]}" +} diff --git a/docker/php-official/8.1/conf/bin/control.sh b/docker/php-official/8.1/conf/bin/control.sh new file mode 100644 index 000000000..22d189745 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/control.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +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 + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" + ;; + + "service.disable") + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..fe212a8ea --- /dev/null +++ b/docker/php-official/8.1/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/8.1/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..092d55d8b --- /dev/null +++ b/docker/php-official/8.1/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +exec tail -f /dev/null diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/8.1/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/8.1/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.1/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..f21489667 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/8.1/conf/bin/entrypoint.sh b/docker/php-official/8.1/conf/bin/entrypoint.sh new file mode 100644 index 000000000..0489b796c --- /dev/null +++ b/docker/php-official/8.1/conf/bin/entrypoint.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +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 + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /sbin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +createDockerStdoutStderr + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/8.1/conf/bin/provision b/docker/php-official/8.1/conf/bin/provision new file mode 100755 index 000000000..418e81dd8 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/provision @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Install ansible if not installed +if [ -z "`which ansible-playbook`" ]; then + docker-ansible-install +fi + +exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.1/conf/bin/provision.py b/docker/php-official/8.1/conf/bin/provision.py new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/provision.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/8.1/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..611edc9bf --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1,16 @@ +# Install crontab files + +if [[ -d "/opt/docker/etc/cron" ]]; then + mkdir -p /etc/cron.d/ + + find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do + # fix permissions + chmod 0644 -- "$CRONTAB_FILE" + + # add newline, cron needs this + echo >> "$CRONTAB_FILE" + + # Install files + cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" + done +fi diff --git a/docker/php-official/8.1/conf/bin/service.d/cron.sh b/docker/php-official/8.1/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..b5fa80dd3 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/cron.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/cron -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..836ebe2b5 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,37 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +# Enable /etc/dnsmasq.d/ +go-replace --mode=lineinfile --once \ + -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ + -- /etc/dnsmasq.conf + +## clear dns file +echo > /etc/dnsmasq.d/webdevops.conf + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf + done +fi diff --git a/docker/php-official/8.1/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.1/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..b8b4c12e0 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi +if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..7d0dadad6 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,12 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + echo "Setting php-fpm user to $CONTAINER_UID" + go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ + -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +fi diff --git a/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..ef6fd4016 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-official/8.1/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.1/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..15374f566 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..82574153d --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,30 @@ +# force new copy of hosts there (otherwise links could be outdated) +mkdir -p /var/spool/postfix/etc +cp -f /etc/hosts /var/spool/postfix/etc/hosts +cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf +cp -f /etc/services /var/spool/postfix/etc/services + +go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" + +# General +go-replace --mode=lineinfile --regex \ + -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ + -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ + -- /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ + -- /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ + -- /etc/postfix/main.cf +fi + +# generate aliases db +newaliases || : diff --git a/docker/php-official/8.1/conf/bin/service.d/postfix.sh b/docker/php-official/8.1/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..b9e477bcd --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/postfix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +# Init vars +if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start $SERVICE_POSTFIX_OPTS + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +if [[ -f /var/spool/postfix/pid/master.pid ]]; then + while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do + sleep 5 + done +fi diff --git a/docker/php-official/8.1/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/8.1/conf/bin/service.d/ssh.sh b/docker/php-official/8.1/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..f01e87ab3 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/ssh.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/8.1/conf/bin/service.d/supervisor.sh b/docker/php-official/8.1/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..5a82a13ff --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/supervisor.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi +if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.1/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.1/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/8.1/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.1/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..8e1358c1b --- /dev/null +++ b/docker/php-official/8.1/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.1/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.1/conf/bin/usr-bin/container-file-auto-restore new file mode 100644 index 000000000..a41fcb3c8 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/container-file-auto-restore @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +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 + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_FILE="$1" +BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" + +if [[ -f "$BACKUP_FILE" ]]; then + ## Backup file exists + ## -> container was restarted + ## -> restoring configuration + cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" +else + ## Backup file DOESN'T exists + ## -> container first startup + ## -> backup configuration + cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" +fi diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.1/conf/bin/usr-bin/docker-ansible-install new file mode 100644 index 000000000..dfb06fc7d --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/docker-ansible-install @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev + + chmod 750 /usr/local/bin/ansible* + ;; + + RedHat) + yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel + easy_install pip + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + yum erase -y python-devel + + chmod 750 /usr/bin/ansible* + ;; + + Alpine) + apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apk del python-dev + + chmod 750 /usr/bin/ansible* + ;; +esac +docker-image-cleanup diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.1/conf/bin/usr-bin/docker-cronjob new file mode 100644 index 000000000..2746c75f5 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/docker-cronjob @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +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 + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -eq 0 ]]; then + echo "Usage: $0 ''" + exit 1 +fi + +# create crontab file +touch /etc/cron.d/webdevops-docker +chmod 0644 /etc/cron.d/webdevops-docker + +for CRONJOB_LINES in "$@"; do + echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker +done + +# Add required newline at end +echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.1/conf/bin/usr-bin/docker-php-setting new file mode 100644 index 000000000..30bbb979f --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/docker-php-setting @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +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 + +# Defaults +PHP_INI_FILE="/opt/docker/etc/php/php.ini" +PHP_VALUE_RAW=0 +PHP_KEY= +PHP_VALUE= + +for arg in "$@"; do + case "$arg" in + --raw) + PHP_VALUE_RAW=1 + shift + ;; + esac +done + +if [[ "$#" -le 2 ]]; then + echo "Usage: $(basename "$0") [--raw] " + exit 1 +fi + +PHP_SETTING_KEY=$1 +shift +PHP_SETTING_VALUE="$@" + +if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then + case "$PHP_SETTING_VALUE" in + ''|*[!0-9]*) + # non numeric + PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" + ;; + esac +fi + + +echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" +echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" + diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-provision b/docker/php-official/8.1/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +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 + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-service b/docker/php-official/8.1/conf/bin/usr-bin/docker-service new file mode 100644 index 000000000..70a493767 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/docker-service @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +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 + +if [[ "$#" -le 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SERVICE_COMMAND=$1 +shift + +for SERVICE in "$@"; do + RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + case "$SERVICE_COMMAND" in + enable) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + disable) + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + install) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + ;; + + run) + if [[ -f "$RUN_FILE" ]]; then + exec "$RUN_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" + exit 1 + fi + ;; + + stop|start|restart|status|pid|check) + service "${SERVICE}" "$SERVICE_COMMAND" + ;; + + *) + echo "[ERROR] $SERVICE_COMMAND is not a valid command" + exit 1 + ;; + esac +done + diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.1/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..991f249c8 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-service disable "$@" diff --git a/docker/php-official/8.1/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.1/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..da99c9aeb --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +exec docker-service enable "$@" + diff --git a/docker/php-official/8.1/conf/bin/usr-bin/service b/docker/php-official/8.1/conf/bin/usr-bin/service new file mode 100755 index 000000000..69874cb80 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +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 + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/8.1/conf/bin/usr-bin/version-compare b/docker/php-official/8.1/conf/bin/usr-bin/version-compare new file mode 100644 index 000000000..ca450b0e9 --- /dev/null +++ b/docker/php-official/8.1/conf/bin/usr-bin/version-compare @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +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 + +function versionCompare () { + if [[ $1 == $2 ]] + then + echo -n '=' + return + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo -n '>' + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -n '<' + return + fi + done + + echo -n '=' +} + +versionCompare "$1" "$2" diff --git a/docker/php-official/8.1/conf/etc/cron/.gitkeep b/docker/php-official/8.1/conf/etc/cron/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.1/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php-official/8.1/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.1/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/8.1/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/8.1/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.1/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.1/conf/etc/php/fpm/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/etc/php/php.ini b/docker/php-official/8.1/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/8.1/conf/etc/php/php.webdevops.ini b/docker/php-official/8.1/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..aa1545ab8 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/php/php.webdevops.ini @@ -0,0 +1,34 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 +log_errors = 1 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + +opcache.memory_consumption = 256 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.1/conf/etc/supervisor.conf b/docker/php-official/8.1/conf/etc/supervisor.conf new file mode 100644 index 000000000..479e0db08 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/supervisor.conf @@ -0,0 +1,20 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.1/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.1/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.1/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.1/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/8.1/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.1/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.1/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.1/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/8.1/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.1/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/8.1/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/8.1/conf/provision/ansible.cfg b/docker/php-official/8.1/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.1/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-entrypoint.sh new file mode 100644 index 000000000..413e7b37c --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/10-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Link main entrypoint script to /entrypoint +ln -sf /opt/docker/bin/entrypoint.sh /entrypoint + +# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd +ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd + +# Create /entrypoint.d +mkdir -p /entrypoint.d +chmod 700 /entrypoint.d +chown root:root /entrypoint.d + + diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-permissions.sh new file mode 100644 index 000000000..20d602bdd --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/10-permissions.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash + diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-php-init.sh new file mode 100644 index 000000000..db0141b8f --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/10-php-init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) +IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-supervisor.sh new file mode 100644 index 000000000..311daee4c --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/10-supervisor.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Remove /usr/sbin/service (images have custom service script) +rm -rf /usr/sbin/service + +# Remove existing supervisor configuration +rm -rf -- /etc/supervisor* + +# Link supervisor configuration script +ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/10-user-application.sh new file mode 100644 index 000000000..5bc865e80 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/10-user-application.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Add group +groupadd -g "$APPLICATION_GID" "$APPLICATION_GROUP" + +# Add user +useradd -u "$APPLICATION_UID" --home "/home/application" --create-home --shell /bin/bash --no-user-group "$APPLICATION_USER" + +# Assign user to group +usermod -g "$APPLICATION_GROUP" "$APPLICATION_USER" diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/11-php-conf.sh new file mode 100644 index 000000000..ee56ccaae --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/11-php-conf.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +PHP_CLEAR_ENV_AVAILABLE=1 + +PHP_ETC_DIR=/usr/local/etc/php +PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf +PHP_POOL_CONF=www.conf +PHP_POOL_DIR=/usr/local/etc/php-fpm.d +PHP_FPM_BIN=/usr/local/sbin/php-fpm +PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/20-app.sh new file mode 100644 index 000000000..749966b67 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/20-app.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Create /app folder +mkdir -p /app +chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh new file mode 100644 index 000000000..121788e60 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# Rename pool file file to application.conf +if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then + # Move php-fpm pool directory file to /opt/docker/etc/php/ + mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d + + mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Remove php-fpm pool directory +rm -rf -- "$PHP_POOL_DIR" + +# Symlink php-fpm pool file to original destination +ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" + +# Configure php-fpm pool (application.conf) +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ + -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ + -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ + -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +# Fix user setting +go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ + -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then + # Clear env setting available, disable clearing of environment variables + go-replace --mode=lineinfile --regex \ + -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh +else + # Append clear env workaround in php-fpm pool (old php-fpm versions) + echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +fi diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh new file mode 100644 index 000000000..873ddf608 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Link main php-fpm binary +ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm + +# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink +if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then + mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf +else + rm -f -- "PHP_MAIN_CONF" +fi +ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" + +# Configure php-fpm main (all versions) +go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ + -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +fi + +if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then + # Configure php-fpm main (php 5.x) + go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf +fi diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php.sh new file mode 100644 index 000000000..c1e716300 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/20-setup-php.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Register webdevops ini + ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" + + # Register custom php ini + ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" + ;; +esac diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh new file mode 100644 index 000000000..18a6a9e47 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +echo "Installing ionCube loader" + +DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +TMP_FILE="/tmp/ioncube_loaders.tar.gz" + +echo "Downloading ..." +curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} +echo "Unpacking ..." +tar -xzf ${TMP_FILE} -C /tmp + +PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` +PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` +MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" +SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" + +echo "PHP-VERSION: ${PHP_VERSION}" +echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" +if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then + echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" +else + echo "Installing ${SO_FILE}" + cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} + + echo "Writing module ini" + echo "[ioncube]" > ${MOD_INI} + echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} + echo "; priority=01" >> ${MOD_INI} + + echo "Cleaning up" + rm -rf $TMP_FILE + rm -rf /tmp/ioncube + + echo "Enabling ionCube PHP module" + case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Enable ionCube (if available) + if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" + fi + ;; + esac +fi diff --git a/docker/php-official/8.1/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.1/conf/provision/bootstrap.d/90-cleanup.sh new file mode 100644 index 000000000..3ca393da6 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/bootstrap.d/90-cleanup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Remove default cronjobs +rm -f -- \ + /etc/cron.daily/logrotate \ + /etc/cron.daily/apt-compat \ + /etc/cron.daily/dpkg \ + /etc/cron.daily/passwd \ + /etc/cron.daily/0yum-daily.cron \ + /etc/cron.daily/logrotate \ + /etc/cron.hourly/0yum-hourly.cron \ + /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.1/conf/provision/build.d/.gitkeep b/docker/php-official/8.1/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.1/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..41031b784 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* +rm -rf -- /root/.profile diff --git a/docker/php-official/8.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.1/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.1/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/8.1/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.1/conf/provision/entrypoint.d/20-php-fpm.sh new file mode 100644 index 000000000..5ab722cf7 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/entrypoint.d/20-php-fpm.sh @@ -0,0 +1,80 @@ +####################################### +### FPM MAIN +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" + +echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then + echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf +fi + +# General fpm main setting +for ENV_VAR in $(envListVars "fpm\.global\."); do + env_key=${ENV_VAR#fpm.global.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf +done + +####################################### +### FPM POOL +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" + +echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +# General fpm pool setting +for ENV_VAR in $(envListVars "fpm\.pool\."); do + env_key=${ENV_VAR#fpm.pool.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +done + + +if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then + echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then + echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then + echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then + echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then + echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then + echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then + echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then + echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then + echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi diff --git a/docker/php-official/8.1/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.1/conf/provision/entrypoint.d/20-php.sh new file mode 100644 index 000000000..2e208fb85 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/entrypoint.d/20-php.sh @@ -0,0 +1,75 @@ +container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" + +echo '' >> /opt/docker/etc/php/php.webdevops.ini +echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini + +# General php setting +for ENV_VAR in $(envListVars "php\."); do + env_key=${ENV_VAR#php.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini +done + + +if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then + echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then + echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then + echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then + echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then + echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then + echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then + echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then + echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then + echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then + echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then + echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Disable all PHP mods specified in PHP_DISMOD as comma separated list +if [[ -n "${PHP_DISMOD+x}" ]]; then + ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + for DISABLE_MOD in ${PHP_DISMOD//,/ }; do + rm -f ${ini_dir_cli}/*${DISABLE_MOD}* + rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* + done +fi + +# Link composer version accordingly +ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.1/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.1/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/provision/roles/.gitkeep b/docker/php-official/8.1/conf/provision/roles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/provision/service.d/.gitkeep b/docker/php-official/8.1/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1/conf/provision/service.d/cron.sh b/docker/php-official/8.1/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..bd8a54781 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/service.d/cron.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/8.1/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.1/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..9e5c3228c --- /dev/null +++ b/docker/php-official/8.1/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.1/conf/provision/service.d/postfix.sh b/docker/php-official/8.1/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..a8c7cc61b --- /dev/null +++ b/docker/php-official/8.1/conf/provision/service.d/postfix.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + + # Fix mysql lib + if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then + ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 + fi + ;; + + Alpine) + apk-install postfix + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/8.1/conf/provision/service.d/ssh.sh b/docker/php-official/8.1/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..63d7a9f3a --- /dev/null +++ b/docker/php-official/8.1/conf/provision/service.d/ssh.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/8.1/conf/provision/service.d/syslog.sh b/docker/php-official/8.1/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..675d0b061 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.1/conf/provision/variables-webdevops.yml b/docker/php-official/8.1/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.1/conf/provision/variables.yml b/docker/php-official/8.1/conf/provision/variables.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.1/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php/8.1 b/docker/php/8.1 new file mode 120000 index 000000000..bceb000f2 --- /dev/null +++ b/docker/php/8.1 @@ -0,0 +1 @@ +../php-official/8.1 \ No newline at end of file diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 5f5661729..dad7d7ce7 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -59,14 +59,14 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version != '7.4' and version != '8.0' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' %} && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ {%- else %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ {%- endif %} -{%- if version == '8.0' %} +{%- if version == '8.0' or version == '8.1' %} && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ @@ -74,7 +74,7 @@ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ -{%- if version == '8.0' %} +{%- if version == '8.0' or version == '8.1' %} amqp \ imagick \ {%- endif %} @@ -89,7 +89,7 @@ mcrypt \ {%- endif %} imap \ -{%- if version != '7.4' and version != '8.0' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' %} hash \ {%- endif %} pcntl \ @@ -98,12 +98,14 @@ pgsql \ soap \ sockets \ +{%- if version != '8.1' %} tokenizer \ +{%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' %} +{%- if version != '8.0' and version != '8.1' %} xmlrpc \ {%- endif %} xsl \ @@ -123,12 +125,23 @@ && echo extension=imagick.so > /usr/local/etc/php/conf.d/imagick.ini \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ -{%- elif version == '8.0' %} +{%- elif version == '8.0' or version == '8.1' %} && pecl install memcached \ && pecl install apcu \ + {%- if version != '8.1' %} + && pecl install xmlrpc-1.0.0RC3 \ + {%- endif %} && pecl install vips \ && pecl install redis \ && pecl install mongodb \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ + && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ + && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ + {%- if version != '8.1' %} + && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ + {%- endif %} {%- else %} # Install extensions for PHP 7.x && pecl install apcu \ @@ -288,20 +301,24 @@ && printf "no --disable-memcached-sasl\n" | pecl install memcached-3.0.4 \ && docker-php-ext-enable memcached \ {%- endif %} -{%- if version == '8.0' %} +{%- if version == '8.0' or version == '8.1' %} && pecl install apcu \ && pecl install vips \ && pecl install yaml \ && pecl install redis \ && pecl install mongodb \ - #&& pecl install imagick \ - #&& pecl install amqp \ + {%- if version != '8.1' %} + && pecl install xmlrpc-1.0.0RC3 \ + {%- endif %} && docker-php-ext-enable \ apcu \ vips \ yaml \ redis \ - #imagick \ + {%- if version != '8.1' %} + xmlrpc \ + {%- endif %} + imagick \ mongodb \ #amqp \ {%- else %} @@ -358,14 +375,16 @@ {% macro officialDevelopment(role='', version='') -%} # Install development environment + {%- if version != '8.1' %} && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \ && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ && apt-install \ blackfire-php \ blackfire-agent \ + {%- endif %} {%- if version|int == 5 %} && pecl install xdebug-2.5.5 \ - {%- elif version == '8.0' %} + {%- elif version == '8.0' or version == '8.1' %} && pecl install xdebug \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ @@ -378,7 +397,7 @@ {% macro officialDevelopmentAlpine(role='', version='') -%} # Install development environment - {%- if version != '8.0' %} + {%- if version != '8.1' %} && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \ && mv blackfire-agent /usr/local/bin/ \ && chmod +x /usr/local/bin/blackfire-agent \ From a9c6ac645b27fe6a6904dfbf4776ff5f3742a467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Tue, 30 Nov 2021 17:08:38 +0100 Subject: [PATCH 089/123] feat: 8.1-alpine build --- docker/php-apache-dev/8.1-alpine/Dockerfile | 35 ++ .../8.1-alpine/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 ++ .../conf/etc/httpd/conf.d/02-dev.conf | 8 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ .../provision/entrypoint.d/20-apache-dev.sh | 5 + docker/php-apache/8.1-alpine/Dockerfile | 34 ++ .../php-apache/8.1-alpine/Dockerfile.jinja2 | 13 + .../conf/bin/service.d/httpd.d/10-init.sh | 6 + .../8.1-alpine/conf/bin/service.d/httpd.sh | 13 + .../8.1-alpine/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../conf/etc/httpd/conf.d/10-log.conf | 4 + .../conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../conf/etc/httpd/conf.d/10-server.conf | 18 + .../8.1-alpine/conf/etc/httpd/global.conf | 1 + .../8.1-alpine/conf/etc/httpd/main.conf | 10 + .../8.1-alpine/conf/etc/httpd/php.conf | 1 + .../8.1-alpine/conf/etc/httpd/ssl/server.crt | 28 ++ .../8.1-alpine/conf/etc/httpd/ssl/server.csr | 26 ++ .../8.1-alpine/conf/etc/httpd/ssl/server.key | 51 +++ .../conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../8.1-alpine/conf/etc/httpd/vhost.conf | 36 ++ .../8.1-alpine/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../conf/etc/supervisor.d/apache.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-apache.sh | 100 ++++++ .../conf/provision/bootstrap.d/10-php.sh | 8 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-apache.sh | 16 + docker/php-dev/8.1-alpine/Dockerfile | 27 ++ docker/php-dev/8.1-alpine/Dockerfile.jinja2 | 8 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 ++ .../bin/service.d/ssh.d/99-development.sh | 3 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/bootstrap.d/99-development.sh | 5 + .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ docker/php-nginx-dev/8.1-alpine/Dockerfile | 35 ++ .../8.1-alpine/Dockerfile.jinja2 | 12 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../conf/bin/service.d/blackfire-agent.sh | 25 ++ .../conf/etc/nginx/conf.d/02-dev.conf | 1 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 6 + .../conf/provision/bootstrap.d/10-php.sh | 24 ++ .../bootstrap.d/20-php-module-blackfire.sh | 6 + .../bootstrap.d/20-php-module-opcache.sh | 11 + .../bootstrap.d/20-php-module-xdebug.sh | 33 ++ .../provision/entrypoint.d/10-php-debugger.sh | 106 ++++++ .../provision/entrypoint.d/20-nginx-dev.sh | 7 + docker/php-nginx/8.1-alpine/Dockerfile | 25 ++ docker/php-nginx/8.1-alpine/Dockerfile.jinja2 | 14 + .../conf/bin/service.d/nginx.d/10-init.sh | 5 + .../8.1-alpine/conf/bin/service.d/nginx.sh | 10 + .../8.1-alpine/conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 3 + .../8.1-alpine/conf/etc/nginx/global.conf | 1 + .../8.1-alpine/conf/etc/nginx/main.conf | 4 + .../8.1-alpine/conf/etc/nginx/nginx.conf | 34 ++ .../8.1-alpine/conf/etc/nginx/php.conf | 1 + .../8.1-alpine/conf/etc/nginx/ssl/server.crt | 28 ++ .../8.1-alpine/conf/etc/nginx/ssl/server.csr | 26 ++ .../8.1-alpine/conf/etc/nginx/ssl/server.key | 51 +++ .../conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../8.1-alpine/conf/etc/nginx/vhost.conf | 26 ++ .../8.1-alpine/conf/etc/nginx/vhost.ssl.conf | 7 + .../conf/etc/supervisor.d/nginx.conf | 14 + .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/bootstrap.d/10-nginx.sh | 38 ++ .../conf/provision/bootstrap.d/10-php.sh | 7 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/20-nginx.sh | 24 ++ docker/php-official/7.1-alpine/Dockerfile | 4 +- docker/php-official/7.2-alpine/Dockerfile | 4 +- docker/php-official/7.3-alpine/Dockerfile | 4 +- docker/php-official/7.4-alpine/Dockerfile | 4 +- docker/php-official/8.0-alpine/Dockerfile | 4 +- docker/php-official/8.1-alpine/Dockerfile | 239 +++++++++++++ .../php-official/8.1-alpine/Dockerfile.jinja2 | 38 ++ docker/php-official/8.1-alpine/conf/VERSION | 1 + .../8.1-alpine/conf/bin/bootstrap.sh | 3 + .../8.1-alpine/conf/bin/config.sh | 117 +++++++ .../8.1-alpine/conf/bin/control.sh | 160 +++++++++ .../8.1-alpine/conf/bin/entrypoint.d/cli.sh | 19 + .../conf/bin/entrypoint.d/default.sh | 3 + .../8.1-alpine/conf/bin/entrypoint.d/noop.sh | 7 + .../8.1-alpine/conf/bin/entrypoint.d/root.sh | 14 + .../conf/bin/entrypoint.d/supervisord.sh | 9 + .../8.1-alpine/conf/bin/entrypoint.sh | 46 +++ .../8.1-alpine/conf/bin/provision | 8 + .../8.1-alpine/conf/bin/provision.py | 328 ++++++++++++++++++ .../conf/bin/service.d/cron.d/10-init.sh | 16 + .../8.1-alpine/conf/bin/service.d/cron.sh | 10 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 37 ++ .../8.1-alpine/conf/bin/service.d/dnsmasq.sh | 11 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 12 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../8.1-alpine/conf/bin/service.d/php-fpm.sh | 10 + .../conf/bin/service.d/postfix.d/10-init.sh | 30 ++ .../8.1-alpine/conf/bin/service.d/postfix.sh | 42 +++ .../conf/bin/service.d/ssh.d/10-init.sh | 7 + .../8.1-alpine/conf/bin/service.d/ssh.sh | 10 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../conf/bin/service.d/supervisor.sh | 11 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../conf/bin/service.d/syslog-ng.sh | 10 + .../bin/usr-bin/container-file-auto-restore | 26 ++ .../conf/bin/usr-bin/docker-ansible-install | 77 ++++ .../conf/bin/usr-bin/docker-cronjob | 26 ++ .../conf/bin/usr-bin/docker-php-setting | 44 +++ .../conf/bin/usr-bin/docker-provision | 9 + .../conf/bin/usr-bin/docker-service | 89 +++++ .../conf/bin/usr-bin/docker-service-disable | 3 + .../conf/bin/usr-bin/docker-service-enable | 4 + .../8.1-alpine/conf/bin/usr-bin/service | 86 +++++ .../conf/bin/usr-bin/version-compare | 43 +++ .../8.1-alpine/conf/etc/cron/.gitkeep | 0 .../8.1-alpine/conf/etc/logrotate.d/php5-fpm | 12 + .../8.1-alpine/conf/etc/logrotate.d/syslog-ng | 38 ++ .../8.1-alpine/conf/etc/php/conf.d/.gitkeep | 0 .../8.1-alpine/conf/etc/php/fpm/.gitkeep | 0 .../8.1-alpine/conf/etc/php/php.ini | 1 + .../8.1-alpine/conf/etc/php/php.webdevops.ini | 34 ++ .../8.1-alpine/conf/etc/supervisor.conf | 20 ++ .../8.1-alpine/conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 14 + .../conf/etc/supervisor.d/dnsmasq.conf | 14 + .../conf/etc/supervisor.d/php-fpm.conf | 15 + .../conf/etc/supervisor.d/postfix.conf | 15 + .../8.1-alpine/conf/etc/supervisor.d/ssh.conf | 14 + .../conf/etc/supervisor.d/syslog.conf | 13 + .../conf/etc/syslog-ng/syslog-ng.conf | 48 +++ .../8.1-alpine/conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../provision/bootstrap.d/10-entrypoint.sh | 14 + .../provision/bootstrap.d/10-permissions.sh | 2 + .../conf/provision/bootstrap.d/10-php-init.sh | 4 + .../provision/bootstrap.d/10-supervisor.sh | 10 + .../bootstrap.d/10-user-application.sh | 8 + .../conf/provision/bootstrap.d/11-php-conf.sh | 10 + .../conf/provision/bootstrap.d/20-app.sh | 5 + .../bootstrap.d/20-setup-php-fpm-pool.sh | 45 +++ .../provision/bootstrap.d/20-setup-php-fpm.sh | 43 +++ .../provision/bootstrap.d/20-setup-php.sh | 11 + .../provision/bootstrap.d/30-setup-ioncube.sh | 45 +++ .../conf/provision/bootstrap.d/90-cleanup.sh | 12 + .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 7 + .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../conf/provision/entrypoint.d/20-php-fpm.sh | 80 +++++ .../conf/provision/entrypoint.d/20-php.sh | 75 ++++ .../conf/provision/onbuild.d/.gitkeep | 0 .../8.1-alpine/conf/provision/roles/.gitkeep | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 13 + .../conf/provision/service.d/dnsmasq.sh | 24 ++ .../conf/provision/service.d/postfix.sh | 32 ++ .../conf/provision/service.d/ssh.sh | 17 + .../conf/provision/service.d/syslog.sh | 41 +++ .../conf/provision/variables-webdevops.yml | 7 + .../8.1-alpine/conf/provision/variables.yml | 7 + docker/php/8.1-alpine | 1 + template/Dockerfile/images/php.jinja2 | 12 +- 188 files changed, 4064 insertions(+), 15 deletions(-) create mode 100644 docker/php-apache-dev/8.1-alpine/Dockerfile create mode 100644 docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/8.1-alpine/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh create mode 100644 docker/php-apache/8.1-alpine/Dockerfile create mode 100644 docker/php-apache/8.1-alpine/Dockerfile.jinja2 create mode 100644 docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/8.1-alpine/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-apache.sh create mode 100644 docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/20-apache.sh create mode 100644 docker/php-dev/8.1-alpine/Dockerfile create mode 100644 docker/php-dev/8.1-alpine/Dockerfile.jinja2 create mode 100644 docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/8.1-alpine/conf/bin/service.d/ssh.d/99-development.sh create mode 100644 docker/php-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/99-development.sh create mode 100644 docker/php-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/Dockerfile create mode 100644 docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh create mode 100644 docker/php-nginx/8.1-alpine/Dockerfile create mode 100644 docker/php-nginx/8.1-alpine/Dockerfile.jinja2 create mode 100644 docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/nginx.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh create mode 100644 docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-php.sh create mode 100644 docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/20-nginx.sh create mode 100644 docker/php-official/8.1-alpine/Dockerfile create mode 100644 docker/php-official/8.1-alpine/Dockerfile.jinja2 create mode 100644 docker/php-official/8.1-alpine/conf/VERSION create mode 100644 docker/php-official/8.1-alpine/conf/bin/bootstrap.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/config.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/control.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/entrypoint.sh create mode 100755 docker/php-official/8.1-alpine/conf/bin/provision create mode 100755 docker/php-official/8.1-alpine/conf/bin/provision.py create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/container-file-auto-restore create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-ansible-install create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-cronjob create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-php-setting create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-provision create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-enable create mode 100755 docker/php-official/8.1-alpine/conf/bin/usr-bin/service create mode 100644 docker/php-official/8.1-alpine/conf/bin/usr-bin/version-compare create mode 100644 docker/php-official/8.1-alpine/conf/etc/cron/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/8.1-alpine/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/8.1-alpine/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/etc/php/fpm/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/etc/php/php.ini create mode 100644 docker/php-official/8.1-alpine/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.conf create mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/ssh.conf create mode 100644 docker/php-official/8.1-alpine/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/8.1-alpine/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/8.1-alpine/conf/provision/ansible.cfg create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-permissions.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-php-init.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-user-application.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-app.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/provision/roles/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/ssh.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/service.d/syslog.sh create mode 100644 docker/php-official/8.1-alpine/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/8.1-alpine/conf/provision/variables.yml create mode 120000 docker/php/8.1-alpine diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile new file mode 100644 index 000000000..8c87835c6 --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -0,0 +1,35 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:8.1-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-apache:8.1-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && apk-install \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..7abed43e5 --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-apache", "8.1-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.1") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +EnableSendfile off + +LogLevel info diff --git a/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +1,10 @@ +"> + FileETag None + + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + diff --git a/docker/php-apache-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/8.1-alpine/conf/provision/entrypoint.d/20-apache-dev.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile new file mode 100644 index 000000000..9c6f00f7b --- /dev/null +++ b/docker/php-apache/8.1-alpine/Dockerfile @@ -0,0 +1,34 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:8.1-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.1-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install apache + && apk-install \ + apache2 \ + apache2-ctl \ + apache2-utils \ + apache2-proxy \ + apache2-ssl \ + # Fix issue with module loading order of lbmethod_* (see https://serverfault.com/questions/922573/apache2-fails-to-start-after-recent-update-to-2-4-34-no-clue-why) + && sed -i '2,5{H;d}; ${p;x;s/^\n//}' /etc/apache2/conf.d/proxy.conf \ + && sed -ri ' \ + s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ + s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ + ' /etc/apache2/httpd.conf \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..11c65544c --- /dev/null +++ b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php", "8.1-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ apache.alpine() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..4ef318a1e --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,6 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + diff --git a/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..f88544c62 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/bin/service.d/httpd.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_APACHE_OPTS" ]]; then SERVICE_APACHE_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/httpd/httpd.pid + +exec /usr/sbin/apachectl -DFOREGROUND $SERVICE_APACHE_OPTS diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-error-document.conf @@ -0,0 +1,15 @@ +####################################### +# Faster error documents +####################################### + + ErrorDocument 400 "400 Bad Request" + ErrorDocument 401 "401 Unauthorized" + ErrorDocument 403 "403 Forbidden" + ErrorDocument 404 "404 Not Found" + ErrorDocument 405 "405 Method Not Allowed" + + ErrorDocument 500 "500 Internal Server Error" + ErrorDocument 501 "501 Not Implemented" + ErrorDocument 502 "502 Bad Gateway" + ErrorDocument 503 "503 Service Unavailable" + diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..950e45105 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %{X-Forwarded-For}i - %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..cd62792e2 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout= + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..80b971734 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/conf.d/10-server.conf @@ -0,0 +1,18 @@ +# Settings +TimeOut 1000 +ServerName "" + +DirectoryIndex +DocumentRoot "" + +"> + Options FollowSymLinks + AllowOverride All + + + Allow from all + + = 2.4> + Require all granted + + diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/global.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/main.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/main.conf new file mode 100644 index 000000000..fb04614ca --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/main.conf @@ -0,0 +1,10 @@ +Include /opt/docker/etc/httpd/global.conf +Include /opt/docker/etc/httpd/php.conf + + + Include /opt/docker/etc/httpd/conf.d/*.conf + += 2.4> + IncludeOptional /opt/docker/etc/httpd/conf.d/*.conf + +Include /opt/docker/etc/httpd/vhost.conf diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/php.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.conf @@ -0,0 +1,7 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.conf @@ -0,0 +1,36 @@ +####################################### +# Vhost +####################################### + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + + + + ServerName docker.vm + ServerAlias + DocumentRoot "" + + UseCanonicalName Off + + + Include /opt/docker/etc/httpd/vhost.common.d/*.conf + + = 2.4> + IncludeOptional /opt/docker/etc/httpd/vhost.common.d/*.conf + + + Include /opt/docker/etc/httpd/vhost.ssl.conf + diff --git a/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # SSL + ############ + + SSLEngine on + SSLCertificateFile /opt/docker/etc/httpd/ssl/server.crt + SSLCertificateKeyFile /opt/docker/etc/httpd/ssl/server.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + # This regexp is ok with 17-9! + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + ## SSL Hardening + SSLProtocol All -SSLv2 -SSLv3 + SSLHonorCipherOrder on + SSLCipherSuite 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA' diff --git a/docker/php-apache/8.1-alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.1-alpine/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/etc/supervisor.d/apache.conf @@ -0,0 +1,14 @@ +[group:apache] +programs=apached +priority=20 + +[program:apached] +command = /opt/docker/bin/service.d/httpd.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-apache.sh new file mode 100644 index 000000000..e9feb08b4 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-apache.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info dist) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info dist-version) +IMAGE_DISTRIBUTION_VERSION_MAIN=$(echo "$IMAGE_DISTRIBUTION_VERSION" | sed 's/^\([0-9]*\).*/\1/g') + +# Collect environment variables +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/sites-enabled/10-docker.conf + ;; + + RedHat) + APACHE_MAIN_PATH=/etc/httpd/ + APACHE_DOCKER_VHOST=/etc/httpd/conf.d/zzz-docker.conf + ;; + + Alpine) + APACHE_MAIN_PATH=/etc/apache2/ + APACHE_DOCKER_VHOST=/etc/apache2/conf.d/zzz-docker.conf + ;; +esac + +# Enable apache main config +ln -sf -- /opt/docker/etc/httpd/main.conf "$APACHE_DOCKER_VHOST" + +# Ensure /var/run/apache2 exists +mkdir -p -- "/var/run/apache2" + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + mkdir -p -- "/run/apache2" +fi + +# Maintain lock directory +if [[ "$IMAGE_FAMILY" == "Debian" ]]; then + mkdir -p -- "/var/lock/apache2" + chmod 0750 -- "/var/lock/apache2" + chown www-data:www-data -- "/var/lock/apache2" +fi + +APACHE_CONF_FILES=$(find "$APACHE_MAIN_PATH" -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log') + +# Change log to Docker stdout +go-replace --regex --regex-backrefs \ + -s '^[\s]*(CustomLog|ErrorLog|TransferLog) ([^\s]+)(.*)' -r '$1 /docker.stdout $3' \ + -s '^[\s]*(ErrorLog) ([^\s]+)(.*)' -r '$1 /docker.stderr $3' \ + --path="$APACHE_MAIN_PATH" \ + --path-regex='(.*\.conf|default.*|.*log)$' + +# Switch MPM to event +if [[ "$IMAGE_FAMILY" == "RedHat" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -- /etc/httpd/conf.modules.d/00-mpm.conf +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 14 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]] && [[ "$IMAGE_DISTRIBUTION_VERSION_MAIN" -ge 8 ]]; then + a2enmod mpm_event +fi + +if [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + go-replace --mode=line --regex --regex-backrefs \ + -s '^[\s#]*(LoadModule mpm_prefork_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule mpm_event_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule deflate_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule rewrite_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule logio_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule slotmem_shm_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule actions_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule expires_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule ssl_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule socache_shmcb_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ajp_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_connect_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_balancer_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_express_module.*)' -r '#$1' \ + -s '^[\s#]*(LoadModule proxy_fcgi_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_fdpass_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_ftp_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_http_module.*)' -r '$1' \ + -s '^[\s#]*(LoadModule proxy_scgi_module.*)' -r '$1' \ + -- /etc/apache2/httpd.conf \ + /etc/apache2/conf.d/ssl.conf \ + /etc/apache2/conf.d/proxy.conf + + # Remove default vhost + sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf +fi + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/httpd/ssl +find /opt/docker/etc/httpd/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/httpd/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..c8669ca25 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + diff --git a/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/20-apache.sh new file mode 100644 index 000000000..42ef48932 --- /dev/null +++ b/docker/php-apache/8.1-alpine/conf/provision/entrypoint.d/20-apache.sh @@ -0,0 +1,16 @@ +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile new file mode 100644 index 000000000..d8d040e98 --- /dev/null +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -0,0 +1,27 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:8.1-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.1-alpine + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && apk-install \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..1357fad41 --- /dev/null +++ b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 @@ -0,0 +1,8 @@ +{{ docker.from("php", "8.1-alpine") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.1") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-dev/8.1-alpine/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.1-alpine/conf/bin/service.d/ssh.d/99-development.sh new file mode 100644 index 000000000..2502ab3e3 --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/bin/service.d/ssh.d/99-development.sh @@ -0,0 +1,3 @@ + +# Allow root access via ssh +go-replace --mode=lineinfile -s 'PermitRootLogin' -r 'PermitRootLogin yes' -- /etc/ssh/sshd_config diff --git a/docker/php-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/99-development.sh new file mode 100644 index 000000000..7fc8cca55 --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/provision/bootstrap.d/99-development.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Set passwords to "dev" +echo "$APPLICATION_USER":"dev" | chpasswd +echo "root":"dev" | chpasswd diff --git a/docker/php-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile new file mode 100644 index 000000000..e015df7e7 --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -0,0 +1,35 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.1-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx:8.1-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install development environment + && apk-install \ + make \ + autoconf \ + g++ \ + && pecl install xdebug \ + && apk del -f --purge \ + autoconf \ + g++ \ + make \ + && docker-php-ext-enable xdebug \ + # Enable php development services + && docker-service enable syslog \ + && docker-service enable postfix \ + && docker-service enable ssh \ + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..d3bd5d756 --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php-nginx", "8.1-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.1") }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} diff --git a/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..95daa01ae --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_BLACKFIRE_AGENT_OPTS" ]]; then SERVICE_BLACKFIRE_AGENT_OPTS=""; fi + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS $SERVICE_BLACKFIRE_AGENT_OPTS diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..b6100c8f1 --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable sendfile for nginx (eg. nfs usage) +go-replace --mode=lineinfile --regex \ + -s '^[\s#]*(sendfile)' -r 'sendfile off;' \ + -- /etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..852567f85 --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) + +# Configure php-fpm +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "%R - %u %t \"%m %r%Q%q\" %s %f cpu:%C%% mem:%{megabytes}M reqTime:%d"' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf \ + /opt/docker/etc/php/fpm/php-fpm.conf + +fi diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh new file mode 100644 index 000000000..f4ea7f72e --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Disable blackfire by default +rm -f \ + /etc/php5/cli/conf.d/zz-blackfire.ini \ + /etc/php5/fpm/conf.d/zz-blackfire.ini diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh new file mode 100644 index 000000000..079e59fdf --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Configure opcache for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*opcache.memory_consumption[\s]*=' -r 'opcache.memory_consumption = 256' \ + -s '^[\s;]*opcache.validate_timestamps[\s]*=' -r 'opcache.validate_timestamps = 1' \ + -s '^[\s;]*opcache.revalidate_freq[\s]*=' -r 'opcache.revalidate_freq = 0' \ + -s '^[\s;]*opcache.interned_strings_buffer[\s]*=' -r 'opcache.interned_strings_buffer = 16' \ + -s '^[\s;]*opcache.max_accelerated_files[\s]*=' -r 'opcache.max_accelerated_files = 7963' \ + -s '^[\s;]*opcache.fast_shutdown[\s]*=' -r 'opcache.fast_shutdown = 1' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh new file mode 100644 index 000000000..e76310003 --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Alpine) + # Fix php xdebug module [Alpine family] + + if [[ -f "/etc/php5/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php5/conf.d/xdebug.ini + fi + + if [[ -f "/etc/php7/conf.d/xdebug.ini" ]]; then + go-replace --mode=lineinfile \ + -s '^extension=xdebug.so' -r 'zend_extension=xdebug.so' \ + /etc/php7/conf.d/xdebug.ini + fi + + ;; +esac + +# Configure xdebug for development +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*xdebug.mode[\s]*=' -r 'xdebug.mode = debug' \ + -s '^[\s;]*xdebug.discover_client_host[\s]*=' -r 'xdebug.discover_client_host = 1' \ + -s '^[\s;]*xdebug.idekey[\s]*=' -r 'xdebug.idekey = docker' \ + -s '^[\s;]*xdebug.cli_color[\s]*=' -r 'xdebug.cli_color = 1' \ + -s '^[\s;]*xdebug.max_nesting_level[\s]*=' -r 'xdebug.max_nesting_level = 1000' \ + -s '^[\s;]*xdebug.start_with_request[\s]*=' -r 'xdebug.start_with_request = trigger' \ + -s '^[\s;]*xdebug.output_dir[\s]*=' -r 'xdebug.output_dir = /tmp/debug' \ + -- /opt/docker/etc/php/php.webdevops.ini diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7b392587c --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.1/mods-available +/etc/php/7.2/mods-available +/etc/php/7.3/mods-available +/etc/php/7.4/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.1/cli/conf.d +/etc/php/7.2/cli/conf.d +/etc/php/7.3/cli/conf.d +/etc/php/7.4/cli/conf.d +/etc/php/7.0/fpm/conf.d +/etc/php/7.1/fpm/conf.d +/etc/php/7.2/fpm/conf.d +/etc/php/7.3/fpm/conf.d +/etc/php/7.4/fpm/conf.d +/usr/local/etc/php/conf.d/" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + docker-service-enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# xdebug3 remote debugger +phpEnvironmentVariable "xdebug.discover_client_host" "XDEBUG_DISCOVER_CLIENT_HOST" +phpEnvironmentVariable "xdebug.mode" "XDEBUG_MODE" +phpEnvironmentVariable "xdebug.start_with_request" "XDEBUG_START_WITH_REQUEST" +phpEnvironmentVariable "xdebug.client_host" "XDEBUG_CLIENT_HOST" +phpEnvironmentVariable "xdebug.client_port" "XDEBUG_CLIENT_PORT" + +# xdebug3 profiler +phpEnvironmentVariable "xdebug.trigger_value" "XDEBUG_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.output_dir" "XDEBUG_OUTPUT_DIR" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/8.1-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile new file mode 100644 index 000000000..39e589994 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/Dockerfile @@ -0,0 +1,25 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:8.1-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:8.1-alpine + +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm \ + WEB_PHP_TIMEOUT=600 \ + WEB_PHP_SOCKET="" +ENV WEB_PHP_SOCKET=127.0.0.1:9000 +ENV SERVICE_NGINX_CLIENT_MAX_BODY_SIZE="50m" + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Install nginx + && apk-install \ + nginx \ + && docker-run-bootstrap \ + && docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..35b37682f --- /dev/null +++ b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 @@ -0,0 +1,14 @@ +{{ docker.from("php", "8.1-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.nginx() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ nginx.alpine() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..8acb5111d --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,5 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi diff --git a/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..3517c72a5 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/bin/service.d/nginx.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_NGINX_OPTS" ]]; then SERVICE_NGINX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx -g 'daemon off;' $SERVICE_NGINX_OPTS diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/global.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/main.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/main.conf @@ -0,0 +1,4 @@ +include /opt/docker/etc/nginx/global.conf; +include /opt/docker/etc/nginx/php.conf; +include /opt/docker/etc/nginx/conf.d/*.conf; +include /opt/docker/etc/nginx/vhost.conf; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/nginx.conf new file mode 100644 index 000000000..b9cb4ebc4 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/nginx.conf @@ -0,0 +1,34 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /docker.stdout; +pid /run/nginx.pid; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /docker.stdout main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; +} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/php.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.crt @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE +b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw +WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx +DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK +3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G +Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7 +9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy +0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S +NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+ +FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx +7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD +clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1 +GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH +6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq +Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB +CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY +SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS +t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN +NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw +I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA +aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq +vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q +nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP +4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN +VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9 +ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.csr @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD +VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg +713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm +Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw +BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47 +ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB +Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP +ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/ +SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi +/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt +K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z +kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh +hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA +A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8 +Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX +/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B +JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8 +uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ +UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca +TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3 +6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx +C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0 +7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170 +2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg== +-----END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEAyt0yFIsg713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik +9FW3mcqh75sGYwIOBmNdHfsmQ3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyE +LAFY5w+iqO1xcLTZO/aOiWXwBWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6K +Z6blxg+regwPEI94MtHbmk47ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEsw +uuxkMlWWGhcqYnA9UjbbEZoBFb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpy +COyv5z+0+rgR0IxzvhabBpFPZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9 +hsuLaM76mR6W1MbIMe7E93o/SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEA +lXtPCbn+cbKLlxWpA3JS1ePi/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMo +S7OotF/zOaryQYi4NRi0wkttK6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efq +lqSOHrot3R2dS5dFR+iHKW+zkU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEp +MQorPj/GTSra5qT6KkrtHjjhhThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEA +AQKCAgAbZPdoUsllyZbC+LNkYZ19ILD5QIDNjfRb1xMGQmkXyQz1B+zOmeyrNfPc +OWEJabOfJTfj3pByN7SzG3US4333HNpQnW6mbmqqZ0HFFqPrXR/Ecuf+UUhCG5hp +m3bgM2vKbyccYsmg0VHcKfzrU7RvTTP/UNMjx2fThwvvwS+ttuSdF0HVcXJB5sfP +OWWnZNhkdHZlRf81VCED/jsZqCZYEh5eMyj9AoXvXL4zayPPf+tC0DSKaXW2Xlxg +tZQhqup8+a9nlxZia0Z9hu8clo6jXkiP8FuKgfCMV0cOjiCKLLHS5svTbLLsVWwJ +F2ZAdVcD6mWQ43qHOEK5NEzGvQKO14CaOLnVT2yAkMcyNohsEgoDP9oCBGDJQbBH +NmtZfpVjjtuTr9P9TEkU1FcBRo0x6Il/DkzamGbOeFAmgnaGElhJ5c/CAG7whaIf +mUfFOBGPH/wESY3gBOACDofeSh27RrlvbLaPiCGKivDUTBmhBsIuso6XqOKbvtfV +/HhhndpdRVfIj4DdE7gIrLIGN977JMVAXFCNz7KrvAWwcOXrCHCoWpklJ9repq8l +26ICY8K7VXktzDHQUmhd88ZWR+9ASURsJghUgZUOcMrEGyvci6Y8hpLhHiNVPHuQ ++ps7tpPsXSntBUqWBzhRZh74+nJlOOV6oYykl30JT2JzB6lwiQKCAQEA9ecn8N2z +20tR2UEiTv/MjVSepQtAAajegvcd1iasvvQKXnh3XLmoZHzH2tTa0lp5RIZpUQPl +lOTwko0lYTBnYblt65AJQ3FTgisNobIpoqE8BFXLm6wggz7CbabjmPGDe173lPGR +sI0YSKYvzrdn4zw8Fh6WULJyZHLi58zJYL3r0WBDiOoxpGaGA1GlmkuIWjhKHaX2 +OvF1vOuQDJ2eDyTc5TYFC0NKG76Mvanov5L/yrhNM/umbmp0SPspzHGZobAKUr20 +OazFT8S+2TA1OTxWNbiPbSimFoaZbEdqsNACGfVJWO8Sh8iqlt5RmEcSiSvGBj6L +QKprRO9Fsp2GawKCAQEA0zGhRsnux4JTNsdUSYsEJtITMj6eE+nl7CoZ9DAOwC5X +6/aSpUE4TT+pWNrt9iluXiGL0j89UJ7r/L1OcsiyzGb8ig9NU4zr1NIGTZ0DstHi +HPYINjeiBJEFIy17kOQn+9/I5c4hBUwz6ihwNoEomymVB/EsLJKAML0AudJGKg+Z +/f/qrS40eab5SAiaKgsh0MZnj+vIxyGBydt6r2HGmjfNITVbXIu6IpO+6NXDwM/e +7v10AAZ3j9+gb1RedLg2ghuIuYU90hmMhtVWsh9nVmaOkMW9/WFgOPYvt/mHH/hR +d4pePZ9kACGmqo/b9sHvHw1YEubtCt1VUiNuFxnJCwKCAQBWnxz0vkRTJY8phsY9 +KeK2jm5sGTBs5T2syLwb6ffENFdKvAjgAw6Mh2And/+1ReWd+/MxdLv03UjZdxsJ +x3FDfXx5FH4O4ebW3a+pnAcKoN1xcX+N0O6LDRqUYcue3sTAOs3gC9CUbr91KAWD +Phw8ccWAzTmKJ7IgLFA982ekyoI9eTmRC159WRgwJxy844qerWF+XC4GyXP+HsTZ +jNRW5Vdi7sqMEyIR7+fIEAhLI88zbATWIPmZv6pC4ybwO7wwtsCMMQNBpdjDprzL +6S12ggikV+U+QKlxGe0FtYqhykRTPJKf32eZqVheWOZJTA/9fgv9ux52oxGycM8O +gmsNAoIBAQC60m5uZnd5uYnPLWkcXYNgq/kbO1UvHHut/FhVMKX7z4MrU0XKNfWO +MECoP5K9bU0aq+Y6KIMe7FapjvT0iSHRu1Cu+HZY8JI2A0xcIAeDijLRl7sP6wrB +q1+2DKgANjRAlWfsEfoX658JBpitPngjOheBnRCMpVQMyUT5HE/BKWf5zwdUB0mY +S+K8nA90HcDeJIS8RcGolbVwUV0oBABhr/cf50lYhqozqCr7YQ33ZGs7Uq3oz8+4 +UARmN2YPLl3Znm3GX12em8c6B0LX8vvA7Jw06Rf2Ksup1+3Ce1PTLiEy9A4FyRf3 +Hc2HmBbnJAtZlr5QikMqlzzAmmLqwH6dAoIBAC+ryaQGJFsijCSuaDfRp/uy9xnd +DjgMdTwjl5WLBmyudChVMANl8eqCbvVO41CN84yORk03oQ4cx0eKxAZaLaSzgkb3 +W0X2nFQe7VJSYMQswCQ+1WfJvEFrIdkEKIa//uQdhqNrgUKSNVhhSTMbNEkDTIWn +ssbv2H9hvUaFt/J/vP9zCKuU5oYvNU7Oi6ZXRYezRn9atlJYanLFoJnHUBRzGms5 +K0vhdCPDXQq87z5Yudoh0jLUQF9Nx0GTWeBceQ9n5hZeRUNQWxP4AJThQX9KSPTS +mbL3Kh4XNRmAUJ2N+Njh+3dg91s+JkKvC1wcspLsmLPQe+9AxBSH9y5JE/8= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.conf @@ -0,0 +1,2 @@ +# compatibility for PHP and TYPO3 Docker Boilerplate +include /opt/docker/etc/nginx/vhost.common.d/*.conf; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..31c9bf05a --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size ; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf @@ -0,0 +1,3 @@ +location / { + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..22b08a50d --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout ; +} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..8225f314a --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf @@ -0,0 +1,26 @@ +server { + listen 80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf @@ -0,0 +1,7 @@ +ssl on; +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive +ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA'; +ssl_prefer_server_ciphers on; + +ssl_certificate /opt/docker/etc/nginx/ssl/server.crt; +ssl_certificate_key /opt/docker/etc/nginx/ssl/server.key; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.1-alpine/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/etc/supervisor.d/nginx.conf @@ -0,0 +1,14 @@ +[group:nginx] +programs=nginxd +priority=20 + +[program:nginxd] +command = /opt/docker/bin/service.d/nginx.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh new file mode 100644 index 000000000..1ba70f963 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Remove daemon statement (will be added as command line argument) +go-replace --mode=lineinfile --regex --regex-backrefs \ + -s '^[\s#]*daemon ' -r '' \ + -- /etc/nginx/nginx.conf + +go-replace --mode=line --regex --regex-backrefs \ + -s '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stdout $3' \ + -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ + -- /etc/nginx/nginx.conf + +# Enable nginx main config +mkdir -p /etc/nginx/conf.d/ +ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf + +rm -f \ + /etc/nginx/sites-enabled/default \ + /etc/nginx/conf.d/default.conf + +if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then + ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf +fi + +# Clear log dir +rm -rf /var/lib/nginx/logs +mkdir -p /var/lib/nginx/logs + +# Set log to stdout/stderr +ln -sf /var/lib/nginx/logs/access.log /docker.stdout +ln -sf /var/lib/nginx/logs/error.log /docker.stderr + +# Fix rights of ssl files +chown -R root:root /opt/docker/etc/nginx/ssl +find /opt/docker/etc/nginx/ssl -type d -exec chmod 750 {} \; +find /opt/docker/etc/nginx/ssl -type f -exec chmod 640 {} \; diff --git a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-php.sh new file mode 100644 index 000000000..4a7d82647 --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-php.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Restrict php-fpm to local connection +go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 127.0.0.1:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' diff --git a/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/20-nginx.sh new file mode 100644 index 000000000..0264b6c2e --- /dev/null +++ b/docker/php-nginx/8.1-alpine/conf/provision/entrypoint.d/20-nginx.sh @@ -0,0 +1,24 @@ +# Create tmp dir for nginx +mkdir -p /var/tmp/nginx/ + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + -s "" -r "$WEB_PHP_TIMEOUT" \ + -s "" -r "$SERVICE_NGINX_CLIENT_MAX_BODY_SIZE" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "$WEB_PHP_SOCKET" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index 18fb018c9..a269887a8 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -193,8 +193,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 7bf759f14..a2cdb58ba 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -193,8 +193,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 639ecaaaf..b4b83fd03 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -193,8 +193,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 8d2a0a7bf..bb1e7ec63 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -193,8 +193,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 09ad9cc09..89748e839 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -193,8 +193,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile new file mode 100644 index 000000000..9cb88e13f --- /dev/null +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -0,0 +1,239 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:8.1-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM php:8.1-fpm-alpine + +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 +ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" +ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" +ENV COMPOSER_VERSION="2" + + +# Baselayout copy (from staged image) +COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ +COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ + + +COPY conf/ /opt/docker/ + +RUN set -x \ + # Init bootstrap + # Add community + && echo https://dl-4.alpinelinux.org/alpine/v3.12/community/ >> /etc/apk/repositories \ + # System update + && /usr/local/bin/apk-upgrade \ + # Install base stuff + && apk-install \ + bash \ + ca-certificates \ + openssl \ + && update-ca-certificates \ + && /usr/local/bin/generate-dockerimage-info \ + ## Fix su execution (eg for tests) + && mkdir -p /etc/pam.d/ \ + && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su + +RUN set -x \ + # Install services + && chmod +x /opt/docker/bin/* \ + && apk-install \ + supervisor \ + wget \ + curl \ + vim \ + sed \ + tzdata \ + busybox-suid \ + && chmod +s /sbin/gosu \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + && apk-install shadow \ + && apk-install \ + # Install common tools + zip \ + unzip \ + bzip2 \ + drill \ + ldns \ + openssh-client \ + rsync \ + patch \ + git \ + && docker-run-bootstrap \ + && docker-image-cleanup + +RUN set -x \ + # Install php environment + && apk-install \ + imagemagick \ + graphicsmagick \ + ghostscript \ + jpegoptim \ + pngcrush \ + optipng \ + pngquant \ + vips \ + rabbitmq-c \ + c-client \ + # Libraries + libldap \ + icu-libs \ + libintl \ + libpq \ + libxslt \ + libzip \ + libmemcached \ + yaml \ + # Build dependencies + autoconf \ + g++ \ + make \ + libtool \ + pcre-dev \ + gettext-dev \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + vips-dev \ + krb5-dev \ + openssl-dev \ + imap-dev \ + imagemagick-dev \ + rabbitmq-c-dev \ + openldap-dev \ + icu-dev \ + postgresql-dev \ + libxml2-dev \ + ldb-dev \ + pcre-dev \ + libxslt-dev \ + libzip-dev \ + libmemcached-dev \ + yaml-dev \ + # Install guetzli + && wget https://github.com/google/guetzli/archive/master.zip \ + && unzip master.zip \ + && make -C guetzli-master \ + && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \ + && rm -rf master.zip guetzli-master \ + # https://github.com/docker-library/php/issues/240 + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ + # Install new version of ICU + && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ + && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ + # Install extensions + && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ + && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && docker-php-ext-configure ldap \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + ffi \ + imagick \ + amqp \ + intl \ + gettext \ + ldap \ + mysqli \ + imap \ + pcntl \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + soap \ + sockets \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + # Install extensions for PHP 7.x + # Memcached for 7.3 can currently only be built from master + && MEMCACHED="`mktemp -d`" \ + && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ + && docker-php-ext-configure $MEMCACHED \ + && docker-php-ext-install $MEMCACHED \ + && rm -rf $MEMCACHED \ + && pecl install apcu \ + && pecl install vips \ + && pecl install yaml \ + && pecl install redis \ + && pecl install mongodb \ + && docker-php-ext-enable \ + apcu \ + vips \ + yaml \ + redis \ + imagick \ + mongodb \ + # Uninstall dev and header packages + && apk del -f --purge \ + autoconf \ + g++ \ + make \ + libtool \ + pcre-dev \ + gettext-dev \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + vips-dev \ + krb5-dev \ + openssl-dev \ + imap-dev \ + rabbitmq-c-dev \ + imagemagick-dev \ + openldap-dev \ + icu-dev \ + postgresql-dev \ + libxml2-dev \ + ldb-dev \ + pcre-dev \ + libxslt-dev \ + libzip-dev \ + libmemcached-dev \ + yaml-dev \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \ + && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \ + # Enable php services + && docker-service enable syslog \ + && docker-service enable cron \ + && docker-run-bootstrap \ + && docker-image-cleanup + +WORKDIR / +EXPOSE 9000 +ENTRYPOINT ["/entrypoint"] +CMD ["supervisord"] diff --git a/docker/php-official/8.1-alpine/Dockerfile.jinja2 b/docker/php-official/8.1-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..b5e4c40d0 --- /dev/null +++ b/docker/php-official/8.1-alpine/Dockerfile.jinja2 @@ -0,0 +1,38 @@ + +{{ docker.fromOfficial("php", "8.1-fpm-alpine") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.base() }} +{{ environment.baseApp() }} +{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #} +{{ environment.phpAlpineIconvWorkaround() }} +{{ environment.phpComposerVersion() }} + +{{ baselayout.copy() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ bootstrap.alpine('3.12') }} + +RUN set -x \ + {{ base.alpine() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ baseapp.alpine() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +RUN set -x \ + {{ php.officialAlpine(version='8.1') }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/8.1-alpine/conf/VERSION b/docker/php-official/8.1-alpine/conf/VERSION new file mode 100644 index 000000000..301160a93 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/VERSION @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/docker/php-official/8.1-alpine/conf/bin/bootstrap.sh b/docker/php-official/8.1-alpine/conf/bin/bootstrap.sh new file mode 100644 index 000000000..b1b3acdbc --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/bootstrap.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-run-bootstrap diff --git a/docker/php-official/8.1-alpine/conf/bin/config.sh b/docker/php-official/8.1-alpine/conf/bin/config.sh new file mode 100644 index 000000000..46265a3c0 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/config.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create /docker.stdout and /docker.stderr + # + ## +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -n "$LOG_STDOUT" ]]; then + echo "Log stdout redirected to $LOG_STDOUT" + else + LOG_STDOUT="/proc/$$/fd/1" + fi + + if [[ -n "$LOG_STDERR" ]]; then + echo "Log stderr redirected to $LOG_STDERR" + else + LOG_STDERR="/proc/$$/fd/2" + fi + + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr +} +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + echo "-> Executing ${FILE}" + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit 1 +} + + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" +} + +### + # List environment variables (based on prefix) + ## +function envListVars() { + if [[ $# -eq 1 ]]; then + env | grep "^${1}" | cut -d= -f1 + else + env | cut -d= -f1 + fi +} + +### + # Get environment variable (even with dots in name) + # + ## +function envGetValue() { + awk "BEGIN {print ENVIRON[\"$1\"]}" +} diff --git a/docker/php-official/8.1-alpine/conf/bin/control.sh b/docker/php-official/8.1-alpine/conf/bin/control.sh new file mode 100644 index 000000000..22d189745 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/control.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +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 + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" + ;; + + "service.disable") + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..fe212a8ea --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..092d55d8b --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +exec tail -f /dev/null diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..f21489667 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/8.1-alpine/conf/bin/entrypoint.sh b/docker/php-official/8.1-alpine/conf/bin/entrypoint.sh new file mode 100644 index 000000000..0489b796c --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/entrypoint.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +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 + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /sbin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +createDockerStdoutStderr + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/provision b/docker/php-official/8.1-alpine/conf/bin/provision new file mode 100755 index 000000000..418e81dd8 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/provision @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Install ansible if not installed +if [ -z "`which ansible-playbook`" ]; then + docker-ansible-install +fi + +exec /opt/docker/bin/provision.py "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/provision.py b/docker/php-official/8.1-alpine/conf/bin/provision.py new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/provision.py @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..611edc9bf --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1,16 @@ +# Install crontab files + +if [[ -d "/opt/docker/etc/cron" ]]; then + mkdir -p /etc/cron.d/ + + find /opt/docker/etc/cron -type f | while read CRONTAB_FILE; do + # fix permissions + chmod 0644 -- "$CRONTAB_FILE" + + # add newline, cron needs this + echo >> "$CRONTAB_FILE" + + # Install files + cp -a -- "$CRONTAB_FILE" "/etc/cron.d/$(basename "$CRONTAB_FILE")" + done +fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..5af135768 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/cron.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_CRON_OPTS" ]]; then SERVICE_CRON_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/crond -f $SERVICE_CRON_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..836ebe2b5 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,37 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +# Enable /etc/dnsmasq.d/ +go-replace --mode=lineinfile --once \ + -s 'conf-dir' -r 'conf-dir=/etc/dnsmasq.d/,*.conf' \ + -- /etc/dnsmasq.conf + +## clear dns file +echo > /etc/dnsmasq.d/webdevops.conf + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward.conf + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops.conf + done +fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..b8b4c12e0 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_DNSMASQ_OPTS" ]]; then SERVICE_DNSMASQ_OPTS=""; fi +if [[ -z "$SERVICE_DNSMASQ_USER" ]]; then SERVICE_DNSMASQ_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground --user="$SERVICE_DNSMASQ_USER" $SERVICE_DNSMASQ_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..7d0dadad6 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,12 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + echo "Setting php-fpm user to $CONTAINER_UID" + go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $CONTAINER_UID" \ + -s '^[\s;]*group[\s]*=' -r "group = $CONTAINER_UID" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..ef6fd4016 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# Workaround for old php-fpm versions which don't have clear_env setting +# + +VARIABLE_LIST="; Workaround for missing clear_env feature in PHP-FPM" + +# For each exported variable +for envVariable in $(printenv|cut -f1 -d=); do + + case "$envVariable" in + "_"|"PATH"|"PWD") + ## ignore this variables + ;; + + *) + ## get content of variable + envVariableContent="${!envVariable}" + + ## php-fpm requires that env variable has to be filled with content + if [[ -n "$envVariableContent" ]]; then + ## quote quotes + envVariableContent=${envVariableContent//\"/\\\"} + + ## add to list + VARIABLE_LIST="${VARIABLE_LIST}"$'\n'"env[${envVariable}] = \"${envVariableContent}\"" + fi + ;; + esac + +done + +# Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..15374f566 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/php-fpm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_PHPFPM_OPTS" ]]; then SERVICE_PHPFPM_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" + +exec /usr/local/bin/php-fpm --nodaemonize $SERVICE_PHPFPM_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..82574153d --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,30 @@ +# force new copy of hosts there (otherwise links could be outdated) +mkdir -p /var/spool/postfix/etc +cp -f /etc/hosts /var/spool/postfix/etc/hosts +cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf +cp -f /etc/services /var/spool/postfix/etc/services + +go-replace --mode=line --regex -s '^[\s]*myhostname[\s]*=.*' -r "myhostname = $HOSTNAME" + +# General +go-replace --mode=lineinfile --regex \ + -s '^[\s]*myhostname[\s]*=.*.*' -r "myhostname = $HOSTNAME" \ + -s '^[\s]*inet_interfaces[\s]*=.*' -r "inet_interfaces = 127.0.0.1" \ + -- /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*relayhost[\s]*=.*' -r "relayhost = $POSTFIX_RELAYHOST" \ + -- /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + go-replace --mode=lineinfile --regex \ + -s '^[\s]*mynetworks[\s]*=.*' -r "mynetworks = $POSTFIX_MYNETWORKS" \ + -- /etc/postfix/main.cf +fi + +# generate aliases db +newaliases || : diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..b9e477bcd --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/postfix.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +# Init vars +if [[ -z "$SERVICE_POSTFIX_OPTS" ]]; then SERVICE_POSTFIX_OPTS=""; fi + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start $SERVICE_POSTFIX_OPTS + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +if [[ -f /var/spool/postfix/pid/master.pid ]]; then + while kill -0 "$(cat /var/spool/postfix/pid/master.pid 2>/dev/null)" &>/dev/null; do + sleep 5 + done +fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..f01e87ab3 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/ssh.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SSH_OPTS" ]]; then SERVICE_SSH_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D $SERVICE_SSH_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..5a82a13ff --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/supervisor.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SUPERVISOR_OPTS" ]]; then SERVICE_SUPERVISOR_OPTS=""; fi +if [[ -z "$SERVICE_SUPERVISOR_USER" ]]; then SERVICE_SUPERVISOR_USER="root"; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user "$SERVICE_SUPERVISOR_USER" $SERVICE_SUPERVISOR_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..8e1358c1b --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Init vars +if [[ -z "$SERVICE_SYSLOG_OPTS" ]]; then SERVICE_SYSLOG_OPTS=""; fi + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS $SERVICE_SYSLOG_OPTS diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.1-alpine/conf/bin/usr-bin/container-file-auto-restore new file mode 100644 index 000000000..a41fcb3c8 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/container-file-auto-restore @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +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 + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SOURCE_FILE="$1" +BACKUP_FILE="$(dirname "$1")/.$(basename "$1").bak" + +if [[ -f "$BACKUP_FILE" ]]; then + ## Backup file exists + ## -> container was restarted + ## -> restoring configuration + cp -a -- "$BACKUP_FILE" "$SOURCE_FILE" +else + ## Backup file DOESN'T exists + ## -> container first startup + ## -> backup configuration + cp -a -- "$SOURCE_FILE" "$BACKUP_FILE" +fi diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-ansible-install new file mode 100644 index 000000000..dfb06fc7d --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-ansible-install @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev + + chmod 750 /usr/local/bin/ansible* + ;; + + RedHat) + yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel + easy_install pip + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + yum erase -y python-devel + + chmod 750 /usr/bin/ansible* + ;; + + Alpine) + apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko + pip install --upgrade pip + hash -r + pip install --no-cache-dir ansible + # Cleanup + apk del python-dev + + chmod 750 /usr/bin/ansible* + ;; +esac +docker-image-cleanup diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-cronjob new file mode 100644 index 000000000..2746c75f5 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-cronjob @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +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 + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -eq 0 ]]; then + echo "Usage: $0 ''" + exit 1 +fi + +# create crontab file +touch /etc/cron.d/webdevops-docker +chmod 0644 /etc/cron.d/webdevops-docker + +for CRONJOB_LINES in "$@"; do + echo "$CRONJOB_LINES" >> /etc/cron.d/webdevops-docker +done + +# Add required newline at end +echo >> /etc/cron.d/webdevops-docker diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-php-setting new file mode 100644 index 000000000..30bbb979f --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-php-setting @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +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 + +# Defaults +PHP_INI_FILE="/opt/docker/etc/php/php.ini" +PHP_VALUE_RAW=0 +PHP_KEY= +PHP_VALUE= + +for arg in "$@"; do + case "$arg" in + --raw) + PHP_VALUE_RAW=1 + shift + ;; + esac +done + +if [[ "$#" -le 2 ]]; then + echo "Usage: $(basename "$0") [--raw] " + exit 1 +fi + +PHP_SETTING_KEY=$1 +shift +PHP_SETTING_VALUE="$@" + +if [[ "$PHP_VALUE_RAW" -eq 0 ]]; then + case "$PHP_SETTING_VALUE" in + ''|*[!0-9]*) + # non numeric + PHP_SETTING_VALUE="\"${PHP_SETTING_VALUE}\"" + ;; + esac +fi + + +echo "$(basename "$0"): Setting php setting: ${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" +echo "${PHP_SETTING_KEY} = ${PHP_SETTING_VALUE}" >> "$PHP_INI_FILE" + diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-provision b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +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 + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service new file mode 100644 index 000000000..70a493767 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service @@ -0,0 +1,89 @@ +#!/usr/bin/env bash + +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 + +if [[ "$#" -le 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +SERVICE_COMMAND=$1 +shift + +for SERVICE in "$@"; do + RUN_FILE="/opt/docker/bin/service.d/${SERVICE}.sh" + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + case "$SERVICE_COMMAND" in + enable) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + disable) + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + install) + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + ;; + + run) + if [[ -f "$RUN_FILE" ]]; then + exec "$RUN_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${RUN_FILE})" + exit 1 + fi + ;; + + stop|start|restart|status|pid|check) + service "${SERVICE}" "$SERVICE_COMMAND" + ;; + + *) + echo "[ERROR] $SERVICE_COMMAND is not a valid command" + exit 1 + ;; + esac +done + diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..991f249c8 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-service disable "$@" diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..da99c9aeb --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +exec docker-service enable "$@" + diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/service b/docker/php-official/8.1-alpine/conf/bin/usr-bin/service new file mode 100755 index 000000000..69874cb80 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +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 + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/8.1-alpine/conf/bin/usr-bin/version-compare b/docker/php-official/8.1-alpine/conf/bin/usr-bin/version-compare new file mode 100644 index 000000000..ca450b0e9 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/bin/usr-bin/version-compare @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +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 + +function versionCompare () { + if [[ $1 == $2 ]] + then + echo -n '=' + return + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo -n '>' + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -n '<' + return + fi + done + + echo -n '=' +} + +versionCompare "$1" "$2" diff --git a/docker/php-official/8.1-alpine/conf/etc/cron/.gitkeep b/docker/php-official/8.1-alpine/conf/etc/cron/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.1-alpine/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/logrotate.d/php5-fpm @@ -0,0 +1,12 @@ +/var/log/php5-fpm/fpm.log +/var/log/php5-fpm/access.log +/var/log/php5-fpm/slow.log +/var/log/php5-fpm/error.log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php5-fpm.pid` 2>/dev/null || true + endscript +} diff --git a/docker/php-official/8.1-alpine/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.1-alpine/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/8.1-alpine/conf/etc/php/conf.d/.gitkeep b/docker/php-official/8.1-alpine/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/etc/php/fpm/.gitkeep b/docker/php-official/8.1-alpine/conf/etc/php/fpm/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/etc/php/php.ini b/docker/php-official/8.1-alpine/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/8.1-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/8.1-alpine/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..aa1545ab8 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/php/php.webdevops.ini @@ -0,0 +1,34 @@ +; ------------------------------------- +; Docker Webdevops PHP configuration +; ------------------------------------- + +; this file will overwrite default php.ini settings + +display_errors = 0 +log_errors = 1 + +short_open_tag = Off +variables_order = 'GPCS' +request_order = 'GP' + +allow_url_fopen = On +allow_url_include = Off + +memory_limit = 512M +max_execution_time = 300 +max_input_time = 300 +post_max_size = 50M +upload_max_filesize = 50M +max_input_vars = 5000 + +expose_php = Off + +date.timezone = UTC + +mysql.default_host = mysql +mysqli.default_host = mysql + +opcache.memory_consumption = 256 +opcache.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.conf new file mode 100644 index 000000000..479e0db08 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/supervisor.conf @@ -0,0 +1,20 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.sh +process_name=%(program_name)s +startsecs = 0 +autostart = true +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/8.1-alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.1-alpine/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/8.1-alpine/conf/provision/ansible.cfg b/docker/php-official/8.1-alpine/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh new file mode 100644 index 000000000..413e7b37c --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Link main entrypoint script to /entrypoint +ln -sf /opt/docker/bin/entrypoint.sh /entrypoint + +# Link entrypoint cmd shortcut conf directory to /entrypoint.cmd +ln -sf /opt/docker/bin/entrypoint.d /entrypoint.cmd + +# Create /entrypoint.d +mkdir -p /entrypoint.d +chmod 700 /entrypoint.d +chown root:root /entrypoint.d + + diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-permissions.sh new file mode 100644 index 000000000..20d602bdd --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-permissions.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash + diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-php-init.sh new file mode 100644 index 000000000..db0141b8f --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-php-init.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +PHP_VERSION=$(php -r 'echo phpversion();' | cut -d '-' -f 1) +IMAGE_FAMILY=$(docker-image-info family) diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh new file mode 100644 index 000000000..311daee4c --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-supervisor.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# Remove /usr/sbin/service (images have custom service script) +rm -rf /usr/sbin/service + +# Remove existing supervisor configuration +rm -rf -- /etc/supervisor* + +# Link supervisor configuration script +ln -sf /opt/docker/etc/supervisor.conf /etc/supervisord.conf diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-user-application.sh new file mode 100644 index 000000000..7a7b42f6b --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/10-user-application.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Add group +addgroup -g "$APPLICATION_GID" "$APPLICATION_GROUP" + +# Add user +adduser -D -u "$APPLICATION_UID" -h "/home/application" -s /bin/bash -G $APPLICATION_GROUP "$APPLICATION_USER" + diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh new file mode 100644 index 000000000..ee56ccaae --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +PHP_CLEAR_ENV_AVAILABLE=1 + +PHP_ETC_DIR=/usr/local/etc/php +PHP_MAIN_CONF=/usr/local/etc/php-fpm.conf +PHP_POOL_CONF=www.conf +PHP_POOL_DIR=/usr/local/etc/php-fpm.d +PHP_FPM_BIN=/usr/local/sbin/php-fpm +PHP_MOD_INI_DIR=/usr/local/etc/php/conf.d diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-app.sh new file mode 100644 index 000000000..749966b67 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-app.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +# Create /app folder +mkdir -p /app +chown "$APPLICATION_USER":"$APPLICATION_GROUP" /app diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh new file mode 100644 index 000000000..121788e60 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# Rename pool file file to application.conf +if [[ ! -f "/opt/docker/etc/php/fpm/pool.d/application.conf" ]]; then + # Move php-fpm pool directory file to /opt/docker/etc/php/ + mv -- "$PHP_POOL_DIR" /opt/docker/etc/php/fpm/pool.d + + mv -- "/opt/docker/etc/php/fpm/pool.d/${PHP_POOL_CONF}" /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Remove php-fpm pool directory +rm -rf -- "$PHP_POOL_DIR" + +# Symlink php-fpm pool file to original destination +ln -sf -- /opt/docker/etc/php/fpm/pool.d "$PHP_POOL_DIR" + +# Configure php-fpm pool (application.conf) +go-replace --mode=lineinfile --regex \ + -s '^[\s;]*catch_workers_output[\s]*=' -r 'catch_workers_output = yes' \ + -s '^[\s;]*access.format[\s]*=' -r 'access.format = "[php-fpm:access] %R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"' \ + -s '^[\s;]*access.log[\s]*=' -r 'access.log = /docker.stdout' \ + -s '^[\s;]*slowlog[\s]*=' -r 'slowlog = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[error_log\][\s]*=' -r 'php_admin_value[error_log] = /docker.stderr' \ + -s '^[\s;]*php_admin_value\[log_errors\][\s]*=' -r 'php_admin_value[log_errors] = on' \ + -s '^[\s;]*listen.allowed_clients[\s]*=' -r ";listen.allowed_clients" \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + +# Fix user setting +go-replace --mode=line --regex \ + -s '^[\s;]*user[\s]*=' -r "user = $APPLICATION_USER" \ + -s '^[\s;]*group[\s]*=' -r "group = $APPLICATION_GROUP" \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +if [[ "$PHP_CLEAR_ENV_AVAILABLE" -eq 1 ]]; then + # Clear env setting available, disable clearing of environment variables + go-replace --mode=lineinfile --regex \ + -s '^[\s;]*clear_env[\s]*=' -r 'clear_env = no' \ + -- /opt/docker/etc/php/fpm/pool.d/application.conf + rm -f /opt/docker/bin/service.d/php-fpm.d/11-clear-env.sh +else + # Append clear env workaround in php-fpm pool (old php-fpm versions) + echo ';#CLEAR_ENV_WORKAROUND#' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +fi diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh new file mode 100644 index 000000000..873ddf608 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Link main php-fpm binary +ln -sf -- "$PHP_FPM_BIN" /usr/local/bin/php-fpm + +# Move php-fpm main file to /opt/docker/etc/php/fpm/ and create symlink +if [[ ! -f /opt/docker/etc/php/fpm/php-fpm.conf ]]; then + mv -- "$PHP_MAIN_CONF" /opt/docker/etc/php/fpm/php-fpm.conf +else + rm -f -- "PHP_MAIN_CONF" +fi +ln -sf -- /opt/docker/etc/php/fpm/php-fpm.conf "$PHP_MAIN_CONF" + +# Configure php-fpm main (all versions) +go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*error_log[\s]*=' -r 'error_log = /docker.stderr' \ + -s '^[\s;]*pid[\s]*=' -r 'pid = /var/run/php-fpm.pid' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ "$(version-compare "$PHP_VERSION" "5.5.999")" == "<" ]]; then + # listen on public IPv4 port + # no ipv6 sockets available for old php version + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = 0.0.0.0:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' +else + # listen on public IPv6 port + go-replace --mode=line --regex \ + -s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \ + --path=/opt/docker/etc/php/fpm/ \ + --path-pattern='*.conf' + +fi + +if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then + # Configure php-fpm main (php 5.x) + go-replace --mode=lineinfile --regex \ + --lineinfile-after='\[global\]' \ + -s '^[\s;]*daemonize[\s]*=' -r 'daemonize = no' \ + -- /opt/docker/etc/php/fpm/php-fpm.conf +fi diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh new file mode 100644 index 000000000..71caa48d3 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu|Alpine) + # Register webdevops ini + ln -sf "/opt/docker/etc/php/php.webdevops.ini" "${PHP_ETC_DIR}/conf.d/98-webdevops.ini" + + # Register custom php ini + ln -sf "/opt/docker/etc/php/php.ini" "${PHP_ETC_DIR}/conf.d/99-docker.ini" + ;; +esac diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh new file mode 100644 index 000000000..18a6a9e47 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +echo "Installing ionCube loader" + +DOWNLOAD_URL="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz" +TMP_FILE="/tmp/ioncube_loaders.tar.gz" + +echo "Downloading ..." +curl -sS ${DOWNLOAD_URL} -o ${TMP_FILE} +echo "Unpacking ..." +tar -xzf ${TMP_FILE} -C /tmp + +PHP_VERSION=`php -v | head -1 | grep -o 'PHP [0-9].[0-9]' | sed -r 's/PHP //g'` +PHP_EXTENSION_DIR=`php -i | grep -o -m 1 'extension_dir .* =' | sed -r 's/extension_dir => //g' | sed -r 's/ =//g'` +MOD_INI="${PHP_MOD_INI_DIR}/00-ioncube.ini" +SO_FILE="${PHP_EXTENSION_DIR}/ioncube_loader_lin_${PHP_VERSION}.so" + +echo "PHP-VERSION: ${PHP_VERSION}" +echo "PHP-EXTENSION-DIR: ${PHP_EXTENSION_DIR}" +if [[ ! -f "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ]]; then + echo "There is no ioncube available for PHP${PHP_VERSION}, skipping installation" +else + echo "Installing ${SO_FILE}" + cp "/tmp/ioncube/ioncube_loader_lin_${PHP_VERSION}.so" ${SO_FILE} + + echo "Writing module ini" + echo "[ioncube]" > ${MOD_INI} + echo "zend_extension = ${SO_FILE}" >> ${MOD_INI} + echo "; priority=01" >> ${MOD_INI} + + echo "Cleaning up" + rm -rf $TMP_FILE + rm -rf /tmp/ioncube + + echo "Enabling ionCube PHP module" + case "$IMAGE_FAMILY" in + Debian|Ubuntu) + # Enable ionCube (if available) + if [[ -f "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" ]]; then + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/cli/conf.d/00-ioncube.ini" + ln -sf "${PHP_ETC_DIR}/mods-available/00-ioncube.ini" "${PHP_ETC_DIR}/fpm/conf.d/00-ioncube.ini" + fi + ;; + esac +fi diff --git a/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh new file mode 100644 index 000000000..3ca393da6 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/bootstrap.d/90-cleanup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +# Remove default cronjobs +rm -f -- \ + /etc/cron.daily/logrotate \ + /etc/cron.daily/apt-compat \ + /etc/cron.daily/dpkg \ + /etc/cron.daily/passwd \ + /etc/cron.daily/0yum-daily.cron \ + /etc/cron.daily/logrotate \ + /etc/cron.hourly/0yum-hourly.cron \ + /etc/periodic/daily/logrotate diff --git a/docker/php-official/8.1-alpine/conf/provision/build.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.1-alpine/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..41031b784 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* +rm -rf -- /root/.profile diff --git a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh new file mode 100644 index 000000000..5ab722cf7 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh @@ -0,0 +1,80 @@ +####################################### +### FPM MAIN +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/php-fpm.conf" + +echo '' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/php-fpm.conf +echo '[global]' >> /opt/docker/etc/php/fpm/php-fpm.conf + +if [[ -n "${FPM_PROCESS_MAX+x}" ]]; then + echo "process.max = ${FPM_PROCESS_MAX}" >> /opt/docker/etc/php/fpm/php-fpm.conf +fi + +# General fpm main setting +for ENV_VAR in $(envListVars "fpm\.global\."); do + env_key=${ENV_VAR#fpm.global.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/php-fpm.conf +done + +####################################### +### FPM POOL +####################################### + +container-file-auto-restore "/opt/docker/etc/php/fpm/pool.d/application.conf" + +echo '' >> /opt/docker/etc/php/fpm/pool.d/application.conf +echo '; container env settings' >> /opt/docker/etc/php/fpm/pool.d/application.conf + +# General fpm pool setting +for ENV_VAR in $(envListVars "fpm\.pool\."); do + env_key=${ENV_VAR#fpm.pool.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +done + + +if [[ -n "${FPM_PM_MAX_CHILDREN+x}" ]]; then + echo "pm.max_children = ${FPM_PM_MAX_CHILDREN}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_START_SERVERS+x}" ]]; then + echo "pm.start_servers = ${FPM_PM_START_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MIN_SPARE_SERVERS+x}" ]]; then + echo "pm.min_spare_servers = ${FPM_PM_MIN_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PM_MAX_SPARE_SERVERS+x}" ]]; then + echo "pm.max_spare_servers = ${FPM_PM_MAX_SPARE_SERVERS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_PROCESS_IDLE_TIMEOUT+x}" ]]; then + echo "pm.process_idle_timeout = ${FPM_PROCESS_IDLE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_MAX_REQUESTS+x}" ]]; then + echo "pm.max_requests = ${FPM_MAX_REQUESTS}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_REQUEST_TERMINATE_TIMEOUT+x}" ]]; then + echo "request_terminate_timeout = ${FPM_REQUEST_TERMINATE_TIMEOUT}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_FILES+x}" ]]; then + echo "rlimit_files = ${FPM_RLIMIT_FILES}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +if [[ -n "${FPM_RLIMIT_CORE+x}" ]]; then + echo "rlimit_core = ${FPM_RLIMIT_CORE}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "php_admin_value[sendmail_path] = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/fpm/pool.d/application.conf +fi diff --git a/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php.sh new file mode 100644 index 000000000..2e208fb85 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/entrypoint.d/20-php.sh @@ -0,0 +1,75 @@ +container-file-auto-restore "/opt/docker/etc/php/php.webdevops.ini" + +echo '' >> /opt/docker/etc/php/php.webdevops.ini +echo '; container env settings' >> /opt/docker/etc/php/php.webdevops.ini + +# General php setting +for ENV_VAR in $(envListVars "php\."); do + env_key=${ENV_VAR#php.} + env_val=$(envGetValue "$ENV_VAR") + + echo "$env_key = ${env_val}" >> /opt/docker/etc/php/php.webdevops.ini +done + + +if [[ -n "${PHP_DATE_TIMEZONE+x}" ]]; then + echo "date.timezone = ${PHP_DATE_TIMEZONE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_DISPLAY_ERRORS+x}" ]]; then + echo "display_errors = ${PHP_DISPLAY_ERRORS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MEMORY_LIMIT+x}" ]]; then + echo "memory_limit = ${PHP_MEMORY_LIMIT}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_MAX_EXECUTION_TIME+x}" ]]; then + echo "max_execution_time = ${PHP_MAX_EXECUTION_TIME}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_POST_MAX_SIZE+x}" ]]; then + echo "post_max_size = ${PHP_POST_MAX_SIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_UPLOAD_MAX_FILESIZE+x}" ]]; then + echo "upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MEMORY_CONSUMPTION+x}" ]]; then + echo "opcache.memory_consumption = ${PHP_OPCACHE_MEMORY_CONSUMPTION}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_MAX_ACCELERATED_FILES+x}" ]]; then + echo "opcache.max_accelerated_files = ${PHP_OPCACHE_MAX_ACCELERATED_FILES}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_VALIDATE_TIMESTAMPS+x}" ]]; then + echo "opcache.validate_timestamps = ${PHP_OPCACHE_VALIDATE_TIMESTAMPS}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_REVALIDATE_FREQ+x}" ]]; then + echo "opcache.revalidate_freq = ${PHP_OPCACHE_REVALIDATE_FREQ}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +if [[ -n "${PHP_OPCACHE_INTERNED_STRINGS_BUFFER+x}" ]]; then + echo "opcache.interned_strings_buffer = ${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Workaround for official PHP images +if [[ -n "${PHP_SENDMAIL_PATH+x}" ]]; then + echo "sendmail_path = ${PHP_SENDMAIL_PATH}" >> /opt/docker/etc/php/php.webdevops.ini +fi + +# Disable all PHP mods specified in PHP_DISMOD as comma separated list +if [[ -n "${PHP_DISMOD+x}" ]]; then + ini_dir_cli=$(php -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + ini_dir_fpm=$(php-fpm -i | grep 'Scan this dir for additional .ini files' | cut -c44-) + for DISABLE_MOD in ${PHP_DISMOD//,/ }; do + rm -f ${ini_dir_cli}/*${DISABLE_MOD}* + rm -f ${ini_dir_fpm}/*${DISABLE_MOD}* + done +fi + +# Link composer version accordingly +ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer diff --git a/docker/php-official/8.1-alpine/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/provision/roles/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/roles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/.gitkeep b/docker/php-official/8.1-alpine/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/cron.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..bd8a54781 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/service.d/cron.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..9e5c3228c --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/postfix.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..a8c7cc61b --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/service.d/postfix.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + + # Fix mysql lib + if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then + ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 + fi + ;; + + Alpine) + apk-install postfix + ;; +esac + +# Configuration +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/ssh.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..63d7a9f3a --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/service.d/ssh.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/8.1-alpine/conf/provision/service.d/syslog.sh b/docker/php-official/8.1-alpine/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..675d0b061 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^Installer-Version:[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/8.1-alpine/conf/provision/variables-webdevops.yml b/docker/php-official/8.1-alpine/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/8.1-alpine/conf/provision/variables.yml b/docker/php-official/8.1-alpine/conf/provision/variables.yml new file mode 100644 index 000000000..0b2a21a95 --- /dev/null +++ b/docker/php-official/8.1-alpine/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php/8.1-alpine b/docker/php/8.1-alpine new file mode 120000 index 000000000..87a0269b1 --- /dev/null +++ b/docker/php/8.1-alpine @@ -0,0 +1 @@ +../php-official/8.1-alpine \ No newline at end of file diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index dad7d7ce7..b3e992a4d 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -246,7 +246,7 @@ && curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz \ && tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \ # Install extensions -{%- if version == '7.4' or version == '8.0' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ {%- else %} @@ -259,7 +259,7 @@ bz2 \ calendar \ exif \ -{%- if version == '7.4' or version == '8.0' %} +{%- if version == '7.4' or version == '8.0' or version == '8.1' %} ffi \ {%- endif %} intl \ @@ -267,7 +267,7 @@ ldap \ mysqli \ imap \ -{%- if version != '7.4' and version != '8.0' %} +{%- if version != '7.4' and version != '8.0' and version != '8.1' %} hash \ {%- endif %} pcntl \ @@ -276,12 +276,14 @@ pgsql \ soap \ sockets \ +{%- if version != '8.1' %} tokenizer \ +{%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' %} +{%- if version != '8.0' and version != '8.1' %} xmlrpc \ {%- endif %} xsl \ @@ -290,7 +292,7 @@ gettext \ opcache \ # Install extensions for PHP 7.x - {%- if version == '7.3' or version == '7.4' or version == '8.0' %} + {%- if version == '7.3' or version == '7.4' or version == '8.0' or version == '8.1' %} # Memcached for 7.3 can currently only be built from master && MEMCACHED="`mktemp -d`" \ && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \ From 3dfdf9b5857071c43956de7d6fb1d2a7ec44a8ff Mon Sep 17 00:00:00 2001 From: syerad Date: Sun, 12 Dec 2021 15:23:46 +0100 Subject: [PATCH 090/123] add nginx source to install current stable version --- Makefile | 19 ++++++++++++++++--- docker/php-nginx/5.6/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.0/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.1/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.2/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.3/Dockerfile.jinja2 | 2 +- docker/php-nginx/7.4/Dockerfile.jinja2 | 2 +- docker/php-nginx/8.0/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-10/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-7/Dockerfile.jinja2 | 2 +- .../php-nginx/debian-8-php7/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-8/Dockerfile.jinja2 | 2 +- docker/php-nginx/debian-9/Dockerfile.jinja2 | 2 +- template/Dockerfile/images/nginx.jinja2 | 5 +++-- 14 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 5540affc8..8970800c0 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ full: provision build all: build build: - bin/console docker:build --threads=auto + python2 ./bin/console docker:build --threads=auto bootstrap: webdevops/bootstrap webdevops/ansible base: webdevops/base webdevops/base-app webdevops/storage @@ -53,7 +53,20 @@ graph: bin/console generate:graph graph-full: - bin/console generate:graph --all\ + python2 bin/console test:serverspec --threads=auto -v + +provision: + python2 bin/console generate:dockerfile + python2 bin/console generate:provision + +push: + python2 ./bin/console docker:push --threads=auto + +graph: + python2 ./bin/console generate:graph + +graph-full: + python2 ./bin/console generate:graph --all\ --filename docker-image-full-layout.gv documentation: @@ -65,4 +78,4 @@ documentation: --poll -H 0.0.0.0 /opt/docs html webdevops/%: - bin/console docker:build --threads=auto --whitelist=$@ + python2 ./bin/console docker:build --threads=auto --whitelist=$@ diff --git a/docker/php-nginx/5.6/Dockerfile.jinja2 b/docker/php-nginx/5.6/Dockerfile.jinja2 index 2bc43716a..f17152cf6 100644 --- a/docker/php-nginx/5.6/Dockerfile.jinja2 +++ b/docker/php-nginx/5.6/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/7.0/Dockerfile.jinja2 b/docker/php-nginx/7.0/Dockerfile.jinja2 index d3aa347ff..7018f5535 100644 --- a/docker/php-nginx/7.0/Dockerfile.jinja2 +++ b/docker/php-nginx/7.0/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/7.1/Dockerfile.jinja2 b/docker/php-nginx/7.1/Dockerfile.jinja2 index b4cfd9f47..875606204 100644 --- a/docker/php-nginx/7.1/Dockerfile.jinja2 +++ b/docker/php-nginx/7.1/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/7.2/Dockerfile.jinja2 b/docker/php-nginx/7.2/Dockerfile.jinja2 index 18290a969..0efd85bbc 100644 --- a/docker/php-nginx/7.2/Dockerfile.jinja2 +++ b/docker/php-nginx/7.2/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/7.3/Dockerfile.jinja2 b/docker/php-nginx/7.3/Dockerfile.jinja2 index a0c6ab052..6fc60a501 100644 --- a/docker/php-nginx/7.3/Dockerfile.jinja2 +++ b/docker/php-nginx/7.3/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/7.4/Dockerfile.jinja2 b/docker/php-nginx/7.4/Dockerfile.jinja2 index 822cf3319..b8317a181 100644 --- a/docker/php-nginx/7.4/Dockerfile.jinja2 +++ b/docker/php-nginx/7.4/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/8.0/Dockerfile.jinja2 b/docker/php-nginx/8.0/Dockerfile.jinja2 index 16dfc3c6c..5a5b06554 100644 --- a/docker/php-nginx/8.0/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/debian-10/Dockerfile.jinja2 b/docker/php-nginx/debian-10/Dockerfile.jinja2 index e4db32c61..d739d0f33 100644 --- a/docker/php-nginx/debian-10/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-10/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/debian-7/Dockerfile.jinja2 b/docker/php-nginx/debian-7/Dockerfile.jinja2 index 9a9e639d7..159733ef0 100644 --- a/docker/php-nginx/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-7/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','wheezy') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 index b4c66d1ac..eabec4b82 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','jessie') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/debian-8/Dockerfile.jinja2 b/docker/php-nginx/debian-8/Dockerfile.jinja2 index 11bb9abdc..22f35f116 100644 --- a/docker/php-nginx/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','jessie') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/debian-9/Dockerfile.jinja2 b/docker/php-nginx/debian-9/Dockerfile.jinja2 index 5813eea34..91462c7e4 100644 --- a/docker/php-nginx/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-9/Dockerfile.jinja2 @@ -9,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','stretch') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/template/Dockerfile/images/nginx.jinja2 b/template/Dockerfile/images/nginx.jinja2 index 45d84edfe..5dfa5b7d3 100644 --- a/template/Dockerfile/images/nginx.jinja2 +++ b/template/Dockerfile/images/nginx.jinja2 @@ -14,11 +14,12 @@ nginx {%- endmacro %} -{% macro debian(role='') -%} +{% macro debian(role='',osCodename='buster') -%} # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ {{ osCodename }} nginx\n deb-src http://nginx.org/packages/debian/ {{ osCodename }} nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx {%- endmacro %} From 37a1ddd65f53547c7095d28d98e3826169ea0f1d Mon Sep 17 00:00:00 2001 From: syerad Date: Sun, 12 Dec 2021 15:27:17 +0100 Subject: [PATCH 091/123] update nginx base to use right nginx version --- docker/nginx/debian-10/Dockerfile.jinja2 | 2 +- docker/nginx/debian-7/Dockerfile.jinja2 | 2 +- docker/nginx/debian-8/Dockerfile.jinja2 | 2 +- docker/nginx/debian-9/Dockerfile.jinja2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/nginx/debian-10/Dockerfile.jinja2 b/docker/nginx/debian-10/Dockerfile.jinja2 index 1204e0a77..46b93f89f 100644 --- a/docker/nginx/debian-10/Dockerfile.jinja2 +++ b/docker/nginx/debian-10/Dockerfile.jinja2 @@ -8,7 +8,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','buster') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/nginx/debian-7/Dockerfile.jinja2 b/docker/nginx/debian-7/Dockerfile.jinja2 index 11b5e80b5..ec654714a 100644 --- a/docker/nginx/debian-7/Dockerfile.jinja2 +++ b/docker/nginx/debian-7/Dockerfile.jinja2 @@ -8,7 +8,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','wheezy') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/nginx/debian-8/Dockerfile.jinja2 b/docker/nginx/debian-8/Dockerfile.jinja2 index 60ce91092..6623f2a27 100644 --- a/docker/nginx/debian-8/Dockerfile.jinja2 +++ b/docker/nginx/debian-8/Dockerfile.jinja2 @@ -8,7 +8,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','jessie') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/nginx/debian-9/Dockerfile.jinja2 b/docker/nginx/debian-9/Dockerfile.jinja2 index 0449d5922..929439161 100644 --- a/docker/nginx/debian-9/Dockerfile.jinja2 +++ b/docker/nginx/debian-9/Dockerfile.jinja2 @@ -8,7 +8,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','stretch') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} From a1b465a3548135487567db7a0f900a24c292ddd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Mon, 13 Jun 2022 14:54:27 +0200 Subject: [PATCH 092/123] fix: php8.1 xmlrpc --- docker/php-official/5.6/Dockerfile | 4 ++-- docker/php-official/7.0/Dockerfile | 4 ++-- docker/php-official/7.1/Dockerfile | 4 ++-- docker/php-official/7.2/Dockerfile | 4 ++-- docker/php-official/7.3/Dockerfile | 4 ++-- docker/php-official/7.4/Dockerfile | 4 ++-- docker/php-official/8.0/Dockerfile | 5 +++-- docker/php-official/8.1/Dockerfile | 4 +++- template/Dockerfile/images/php.jinja2 | 12 ++++-------- 9 files changed, 22 insertions(+), 23 deletions(-) diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 788f9d2c2..7627ec2f7 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -187,8 +187,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 163f158cb..fa5011bb4 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -187,8 +187,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index a5bc9dca2..8ab76029d 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -187,8 +187,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 83b835ee0..071548a93 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -186,8 +186,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 74ad5e2fb..f5c9bd265 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -186,8 +186,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 3b2387137..9045fc4d6 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -185,8 +185,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index e8004d632..b4a64a302 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -190,8 +190,8 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ - tokenizer \ + sockets \ + tokenizer \ sysvmsg \ sysvsem \ sysvshm \ @@ -203,6 +203,7 @@ RUN set -x \ opcache \ && pecl install memcached \ && pecl install apcu \ + && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ && pecl install mongodb \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 5e547d617..9bdbdfcc6 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -161,7 +161,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ sysvmsg \ sysvsem \ sysvshm \ @@ -173,6 +173,7 @@ RUN set -x \ opcache \ && pecl install memcached \ && pecl install apcu \ + && pecl install xmlrpc-1.0.0RC3 \ && pecl install vips \ && pecl install redis \ && pecl install mongodb \ @@ -181,6 +182,7 @@ RUN set -x \ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ + && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ # Uninstall dev and header packages && apt-get purge -y -f --force-yes \ libc-client-dev \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index b3e992a4d..40941e33e 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -97,10 +97,10 @@ pdo_pgsql \ pgsql \ soap \ - sockets \ -{%- if version != '8.1' %} - tokenizer \ -{%- endif %} + sockets \ +{%- if version != '8.1' %} + tokenizer \ +{%- endif %} sysvmsg \ sysvsem \ sysvshm \ @@ -128,9 +128,7 @@ {%- elif version == '8.0' or version == '8.1' %} && pecl install memcached \ && pecl install apcu \ - {%- if version != '8.1' %} && pecl install xmlrpc-1.0.0RC3 \ - {%- endif %} && pecl install vips \ && pecl install redis \ && pecl install mongodb \ @@ -139,9 +137,7 @@ && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ - {%- if version != '8.1' %} && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ - {%- endif %} {%- else %} # Install extensions for PHP 7.x && pecl install apcu \ From c879c294c9f684a1b8ed8a898758872647937da2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20H=C3=B6chtl?= Date: Mon, 13 Jun 2022 16:44:10 +0200 Subject: [PATCH 093/123] fix: alpine xmlrpc --- docker/php-official/8.0-alpine/Dockerfile | 1 + docker/php-official/8.1-alpine/Dockerfile | 2 ++ template/Dockerfile/images/php.jinja2 | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 89748e839..7185a898f 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -218,6 +218,7 @@ RUN set -x \ && pecl install mongodb \ #&& pecl install imagick \ #&& pecl install amqp \ + && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ vips \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 9cb88e13f..89879b3fa 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -189,11 +189,13 @@ RUN set -x \ && pecl install yaml \ && pecl install redis \ && pecl install mongodb \ + && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ vips \ yaml \ redis \ + xmlrpc \ imagick \ mongodb \ # Uninstall dev and header packages diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 40941e33e..4ddbdc578 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -313,9 +313,7 @@ vips \ yaml \ redis \ - {%- if version != '8.1' %} xmlrpc \ - {%- endif %} imagick \ mongodb \ #amqp \ From 02e264209aa02b987cb4e48397478350da20d308 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 2 Sep 2022 15:13:23 -0700 Subject: [PATCH 094/123] feat: regenerate dockerfiles for php-8.1 --- docker/php-apache-dev/8.0-alpine/Dockerfile | 1 + docker/php-apache-dev/8.0/Dockerfile | 1 + docker/php-apache-dev/8.1-alpine/Dockerfile | 5 +++- docker/php-apache-dev/8.1/Dockerfile | 5 +++- docker/php-apache/8.0-alpine/Dockerfile | 1 + docker/php-apache/8.0/Dockerfile | 1 + docker/php-apache/8.1-alpine/Dockerfile | 5 +++- docker/php-apache/8.1/Dockerfile | 5 +++- docker/php-dev/8.0-alpine/Dockerfile | 1 + docker/php-dev/8.0/Dockerfile | 1 + docker/php-dev/8.1-alpine/Dockerfile | 5 +++- docker/php-dev/8.1/Dockerfile | 5 +++- docker/php-nginx-dev/8.0-alpine/Dockerfile | 1 + docker/php-nginx-dev/8.0/Dockerfile | 1 + docker/php-nginx-dev/8.1-alpine/Dockerfile | 5 +++- docker/php-nginx-dev/8.1/Dockerfile | 5 +++- docker/php-nginx/8.0-alpine/Dockerfile | 1 + docker/php-nginx/8.0/Dockerfile | 4 ++- docker/php-nginx/8.1-alpine/Dockerfile | 5 +++- docker/php-nginx/8.1/Dockerfile | 11 +++++-- docker/php-official/8.0-alpine/Dockerfile | 8 +++-- docker/php-official/8.0/Dockerfile | 9 ++++++ docker/php-official/8.1-alpine/Dockerfile | 33 +++++++++++---------- docker/php-official/8.1/Dockerfile | 24 +++++++++------ 24 files changed, 104 insertions(+), 39 deletions(-) diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 487467e90..27c3d337f 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index fef955002..dfa15ea3b 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index 8c87835c6..577ec0044 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -31,5 +31,8 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.1/Dockerfile b/docker/php-apache-dev/8.1/Dockerfile index d775a3067..d31e621c9 100644 --- a/docker/php-apache-dev/8.1/Dockerfile +++ b/docker/php-apache-dev/8.1/Dockerfile @@ -23,5 +23,8 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 63fccc090..418a35df9 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index 77d3282c5..22f27e91e 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile index 9c6f00f7b..52375d32c 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile +++ b/docker/php-apache/8.1-alpine/Dockerfile @@ -28,7 +28,10 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.1/Dockerfile b/docker/php-apache/8.1/Dockerfile index c25caa8c6..7e7f6db5a 100644 --- a/docker/php-apache/8.1/Dockerfile +++ b/docker/php-apache/8.1/Dockerfile @@ -24,7 +24,10 @@ RUN set -x \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 25728db92..6443ba41b 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -34,5 +34,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 4150a696e..5e98bc98d 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -25,5 +25,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index d8d040e98..17a0933f3 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -23,5 +23,8 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.1/Dockerfile b/docker/php-dev/8.1/Dockerfile index 5eb1cca0b..ff78a3f50 100644 --- a/docker/php-dev/8.1/Dockerfile +++ b/docker/php-dev/8.1/Dockerfile @@ -15,5 +15,8 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 477c1bbe1..da107583c 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index 0601a92dd..daaf3b653 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index e015df7e7..8ee243f08 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -31,5 +31,8 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.1/Dockerfile b/docker/php-nginx-dev/8.1/Dockerfile index a0b095001..ff6216d4e 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile +++ b/docker/php-nginx-dev/8.1/Dockerfile @@ -23,5 +23,8 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index 7c97c116c..c140b116b 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index f26421153..f834ad331 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile index 39e589994..577ae8027 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile +++ b/docker/php-nginx/8.1-alpine/Dockerfile @@ -19,7 +19,10 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/8.1/Dockerfile b/docker/php-nginx/8.1/Dockerfile index 520289e4f..590b09a1f 100644 --- a/docker/php-nginx/8.1/Dockerfile +++ b/docker/php-nginx/8.1/Dockerfile @@ -17,9 +17,16 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ + >> /etc/apt/sources.list \ + && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ - nginx \ - && docker-run-bootstrap \ + nginx \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 7185a898f..444343335 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -111,6 +112,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -216,15 +218,14 @@ RUN set -x \ && pecl install yaml \ && pecl install redis \ && pecl install mongodb \ - #&& pecl install imagick \ - #&& pecl install amqp \ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ vips \ yaml \ redis \ - #imagick \ + xmlrpc \ + imagick \ mongodb \ #amqp \ # Uninstall dev and header packages @@ -261,6 +262,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index b4a64a302..9605d9c84 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -107,6 +108,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -207,6 +209,12 @@ RUN set -x \ && pecl install vips \ && pecl install redis \ && pecl install mongodb \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \ + && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \ + && echo extension=vips.so > /usr/local/etc/php/conf.d/vips.ini \ + && echo extension=xmlrpc.so > /usr/local/etc/php/conf.d/xmlrpc.ini \ # Uninstall dev and header packages && apt-get purge -y -f --force-yes \ libc-client-dev \ @@ -235,6 +243,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 89879b3fa..ecc520c82 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -27,10 +27,8 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ @@ -63,11 +61,16 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ - && apk-install shadow \ + && apk-install \ + dpkg \ + shadow \ && apk-install \ # Install common tools zip \ @@ -79,7 +82,10 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -144,10 +150,6 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ - && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ - && cd /usr/src/php/ext/amqp && git submodule update --init \ - && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -155,8 +157,6 @@ RUN set -x \ calendar \ exif \ ffi \ - imagick \ - amqp \ intl \ gettext \ ldap \ @@ -189,7 +189,6 @@ RUN set -x \ && pecl install yaml \ && pecl install redis \ && pecl install mongodb \ - && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ vips \ @@ -198,6 +197,7 @@ RUN set -x \ xmlrpc \ imagick \ mongodb \ + #amqp \ # Uninstall dev and header packages && apk del -f --purge \ autoconf \ @@ -232,7 +232,10 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 9bdbdfcc6..1f027ceaa 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -26,10 +26,8 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ - +# base copy (from staged image) +COPY --from=base /baselayout / COPY conf/ /opt/docker/ @@ -60,7 +58,10 @@ RUN set -x \ net-tools \ tzdata \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -77,7 +78,10 @@ RUN set -x \ git \ patch \ && /usr/local/bin/generate-locales \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -142,12 +146,11 @@ RUN set -x \ && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ amqp \ - imagick \ + imagick \ bz2 \ calendar \ exif \ @@ -209,7 +212,10 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / From d8046c700c4a612189a5bf9574307794fd721ff7 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 2 Sep 2022 15:14:07 -0700 Subject: [PATCH 095/123] try ci on port-php8.1 branch --- .github/workflows/docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 42a359eac..cef4ad2c7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,8 +4,7 @@ on: push: branches: - 'main' - - 'experimental/gh-actions' - - 'experimental/some-dependency-tracking' + - 'port-php8.1' concurrency: group: "${{ github.ref }}" From c5c6be5b282dfc4422f33cd39d1418e6f121c0b0 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 2 Sep 2022 15:36:21 -0700 Subject: [PATCH 096/123] remove stray symbolic link (?) --- docker/php-official/8.1/8.1 | 1 - 1 file changed, 1 deletion(-) delete mode 120000 docker/php-official/8.1/8.1 diff --git a/docker/php-official/8.1/8.1 b/docker/php-official/8.1/8.1 deleted file mode 120000 index 8d1eec65a..000000000 --- a/docker/php-official/8.1/8.1 +++ /dev/null @@ -1 +0,0 @@ -8.1 \ No newline at end of file From dbf441432df55532cc81cfe20f9df08e0dab0874 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 29 Nov 2022 16:20:42 -0800 Subject: [PATCH 097/123] fix ci.. maybe idk what's going on with the image names and KeyError --- bin/command/generate_gh_action_matrix_command.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index f888888bf..936eab460 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -66,9 +66,8 @@ def run_task(self, configuration): whitelist=whitelist, blacklist=blacklist, ) - matrix = MatrixBuilder(dockerfiles) + matrix = MatrixBuilder(dockerfiles, user_image_prefix) matrix.build() - # matrix.printGraph(self.line) output_path = os.path.split(dockerfile_path)[0] From c3d35aa23bc174d253ecd88b0d244894f9312c77 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 30 Nov 2022 10:54:16 -0800 Subject: [PATCH 098/123] fix imagick ext install --- docker/ansible/alpine/Dockerfile | 1 + docker/ansible/centos-7/Dockerfile | 1 + docker/ansible/debian-7/Dockerfile | 1 + docker/ansible/debian-8/Dockerfile | 1 + docker/ansible/debian-9/Dockerfile | 1 + docker/ansible/ubuntu-12.04/Dockerfile | 1 + docker/ansible/ubuntu-14.04/Dockerfile | 1 + docker/ansible/ubuntu-15.04/Dockerfile | 1 + docker/ansible/ubuntu-15.10/Dockerfile | 1 + docker/ansible/ubuntu-16.04/Dockerfile | 1 + docker/ansible/ubuntu-17.04/Dockerfile | 1 + docker/apache-dev/alpine/Dockerfile | 1 + docker/apache-dev/centos-7/Dockerfile | 1 + docker/apache-dev/debian-10/Dockerfile | 1 + docker/apache-dev/debian-7/Dockerfile | 1 + docker/apache-dev/debian-8/Dockerfile | 1 + docker/apache-dev/debian-9/Dockerfile | 1 + docker/apache-dev/ubuntu-12.04/Dockerfile | 1 + docker/apache-dev/ubuntu-14.04/Dockerfile | 1 + docker/apache-dev/ubuntu-15.04/Dockerfile | 1 + docker/apache-dev/ubuntu-15.10/Dockerfile | 1 + docker/apache-dev/ubuntu-16.04/Dockerfile | 1 + docker/apache-dev/ubuntu-16.10/Dockerfile | 1 + docker/apache-dev/ubuntu-17.04/Dockerfile | 1 + docker/apache-dev/ubuntu-17.10/Dockerfile | 1 + docker/apache-dev/ubuntu-18.04/Dockerfile | 1 + docker/apache/alpine/Dockerfile | 1 + docker/apache/centos-7/Dockerfile | 1 + docker/apache/debian-10/Dockerfile | 1 + docker/apache/debian-7/Dockerfile | 2 ++ docker/apache/debian-8/Dockerfile | 2 ++ docker/apache/debian-9/Dockerfile | 1 + docker/apache/ubuntu-12.04/Dockerfile | 1 + docker/apache/ubuntu-14.04/Dockerfile | 1 + docker/apache/ubuntu-15.04/Dockerfile | 1 + docker/apache/ubuntu-15.10/Dockerfile | 1 + docker/apache/ubuntu-16.04/Dockerfile | 1 + docker/apache/ubuntu-16.10/Dockerfile | 1 + docker/apache/ubuntu-17.04/Dockerfile | 1 + docker/apache/ubuntu-17.10/Dockerfile | 1 + docker/apache/ubuntu-18.04/Dockerfile | 1 + docker/base-app/alpine/Dockerfile | 1 + docker/base-app/centos-7/Dockerfile | 1 + docker/base-app/debian-10/Dockerfile | 1 + docker/base-app/debian-7/Dockerfile | 1 + docker/base-app/debian-8/Dockerfile | 1 + docker/base-app/debian-9/Dockerfile | 1 + docker/base-app/ubuntu-12.04/Dockerfile | 1 + docker/base-app/ubuntu-14.04/Dockerfile | 1 + docker/base-app/ubuntu-15.04/Dockerfile | 1 + docker/base-app/ubuntu-15.10/Dockerfile | 1 + docker/base-app/ubuntu-16.04/Dockerfile | 1 + docker/base-app/ubuntu-16.10/Dockerfile | 1 + docker/base-app/ubuntu-17.04/Dockerfile | 1 + docker/base-app/ubuntu-17.10/Dockerfile | 1 + docker/base-app/ubuntu-18.04/Dockerfile | 1 + docker/base/alpine/Dockerfile | 1 + docker/base/centos-7/Dockerfile | 1 + docker/base/debian-10/Dockerfile | 1 + docker/base/debian-7/Dockerfile | 1 + docker/base/debian-8/Dockerfile | 1 + docker/base/debian-9/Dockerfile | 1 + docker/base/ubuntu-12.04/Dockerfile | 1 + docker/base/ubuntu-14.04/Dockerfile | 1 + docker/base/ubuntu-15.04/Dockerfile | 1 + docker/base/ubuntu-15.10/Dockerfile | 1 + docker/base/ubuntu-16.04/Dockerfile | 1 + docker/base/ubuntu-16.10/Dockerfile | 1 + docker/base/ubuntu-17.04/Dockerfile | 1 + docker/base/ubuntu-17.10/Dockerfile | 1 + docker/base/ubuntu-18.04/Dockerfile | 1 + docker/bootstrap/alpine/Dockerfile | 1 + docker/bootstrap/centos-7/Dockerfile | 1 + docker/bootstrap/ubuntu-12.04/Dockerfile | 1 + docker/bootstrap/ubuntu-14.04/Dockerfile | 1 + docker/bootstrap/ubuntu-15.04/Dockerfile | 1 + docker/bootstrap/ubuntu-15.10/Dockerfile | 1 + docker/bootstrap/ubuntu-16.04/Dockerfile | 1 + docker/bootstrap/ubuntu-16.10/Dockerfile | 1 + docker/bootstrap/ubuntu-17.04/Dockerfile | 1 + docker/bootstrap/ubuntu-17.10/Dockerfile | 1 + docker/bootstrap/ubuntu-18.04/Dockerfile | 1 + docker/certbot/latest/Dockerfile | 1 + docker/dockerfile-build-env/latest/Dockerfile | 1 + docker/liquidsoap/latest/Dockerfile | 1 + docker/mail-sandbox/latest/Dockerfile | 1 + docker/nginx/alpine/Dockerfile | 1 + .../alpine/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/centos-7/Dockerfile | 1 + .../centos-7/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/debian-10/Dockerfile | 4 +++- .../debian-10/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/debian-7/Dockerfile | 4 +++- .../debian-7/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/debian-8/Dockerfile | 4 +++- .../debian-8/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/debian-9/Dockerfile | 4 +++- .../debian-9/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-12.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-14.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-15.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-15.10/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-16.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-16.10/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-17.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-17.10/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/nginx/ubuntu-18.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-apache-dev/5.6/Dockerfile | 1 + docker/php-apache-dev/7.0/Dockerfile | 1 + docker/php-apache-dev/7.1-alpine/Dockerfile | 1 + docker/php-apache-dev/7.1/Dockerfile | 1 + docker/php-apache-dev/7.2-alpine/Dockerfile | 1 + docker/php-apache-dev/7.2/Dockerfile | 1 + docker/php-apache-dev/7.3-alpine/Dockerfile | 1 + docker/php-apache-dev/7.3/Dockerfile | 1 + docker/php-apache-dev/7.4-alpine/Dockerfile | 1 + docker/php-apache-dev/7.4/Dockerfile | 1 + docker/php-apache-dev/centos-7-php56/Dockerfile | 1 + docker/php-apache-dev/centos-7-php7/Dockerfile | 1 + docker/php-apache-dev/centos-7/Dockerfile | 1 + docker/php-apache-dev/debian-10/Dockerfile | 1 + docker/php-apache-dev/debian-7/Dockerfile | 1 + docker/php-apache-dev/debian-8-php7/Dockerfile | 1 + docker/php-apache-dev/debian-8/Dockerfile | 1 + docker/php-apache-dev/debian-9/Dockerfile | 1 + docker/php-apache-dev/ubuntu-12.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-14.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-15.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-15.10/Dockerfile | 1 + docker/php-apache-dev/ubuntu-16.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-16.10/Dockerfile | 1 + docker/php-apache-dev/ubuntu-17.04/Dockerfile | 1 + docker/php-apache-dev/ubuntu-17.10/Dockerfile | 1 + docker/php-apache-dev/ubuntu-18.04/Dockerfile | 1 + docker/php-apache/5.6/Dockerfile | 1 + docker/php-apache/7.0/Dockerfile | 1 + docker/php-apache/7.1-alpine/Dockerfile | 1 + docker/php-apache/7.1/Dockerfile | 1 + docker/php-apache/7.2-alpine/Dockerfile | 1 + docker/php-apache/7.2/Dockerfile | 1 + docker/php-apache/7.3-alpine/Dockerfile | 1 + docker/php-apache/7.3/Dockerfile | 1 + docker/php-apache/7.4-alpine/Dockerfile | 1 + docker/php-apache/7.4/Dockerfile | 1 + docker/php-apache/centos-7-php56/Dockerfile | 1 + docker/php-apache/centos-7-php7/Dockerfile | 1 + docker/php-apache/centos-7/Dockerfile | 1 + docker/php-apache/debian-10/Dockerfile | 1 + 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 | 1 + docker/php-apache/ubuntu-12.04/Dockerfile | 1 + docker/php-apache/ubuntu-14.04/Dockerfile | 1 + docker/php-apache/ubuntu-15.04/Dockerfile | 1 + docker/php-apache/ubuntu-15.10/Dockerfile | 1 + docker/php-apache/ubuntu-16.04/Dockerfile | 1 + docker/php-apache/ubuntu-16.10/Dockerfile | 1 + docker/php-apache/ubuntu-17.04/Dockerfile | 1 + docker/php-apache/ubuntu-17.10/Dockerfile | 1 + docker/php-apache/ubuntu-18.04/Dockerfile | 1 + docker/php-dev/5.6/Dockerfile | 1 + docker/php-dev/7.0/Dockerfile | 1 + docker/php-dev/7.1-alpine/Dockerfile | 1 + docker/php-dev/7.1/Dockerfile | 1 + docker/php-dev/7.2-alpine/Dockerfile | 1 + docker/php-dev/7.2/Dockerfile | 1 + docker/php-dev/7.3-alpine/Dockerfile | 1 + docker/php-dev/7.3/Dockerfile | 1 + docker/php-dev/7.4-alpine/Dockerfile | 1 + docker/php-dev/7.4/Dockerfile | 1 + docker/php-dev/centos-7-php56/Dockerfile | 1 + docker/php-dev/centos-7-php7/Dockerfile | 1 + docker/php-dev/centos-7/Dockerfile | 1 + docker/php-dev/debian-10/Dockerfile | 1 + docker/php-dev/debian-7/Dockerfile | 1 + docker/php-dev/debian-8-php7/Dockerfile | 1 + docker/php-dev/debian-8/Dockerfile | 1 + docker/php-dev/debian-9/Dockerfile | 1 + docker/php-dev/ubuntu-12.04/Dockerfile | 1 + docker/php-dev/ubuntu-14.04/Dockerfile | 1 + docker/php-dev/ubuntu-15.04/Dockerfile | 1 + docker/php-dev/ubuntu-15.10/Dockerfile | 1 + docker/php-dev/ubuntu-16.04/Dockerfile | 1 + docker/php-dev/ubuntu-16.10/Dockerfile | 1 + docker/php-dev/ubuntu-17.04/Dockerfile | 1 + docker/php-dev/ubuntu-17.10/Dockerfile | 1 + docker/php-dev/ubuntu-18.04/Dockerfile | 1 + docker/php-nginx-dev/5.6/Dockerfile | 1 + docker/php-nginx-dev/7.0/Dockerfile | 1 + docker/php-nginx-dev/7.1-alpine/Dockerfile | 1 + docker/php-nginx-dev/7.1/Dockerfile | 1 + docker/php-nginx-dev/7.2-alpine/Dockerfile | 1 + docker/php-nginx-dev/7.2/Dockerfile | 1 + docker/php-nginx-dev/7.3-alpine/Dockerfile | 1 + docker/php-nginx-dev/7.3/Dockerfile | 1 + docker/php-nginx-dev/7.4-alpine/Dockerfile | 1 + docker/php-nginx-dev/7.4/Dockerfile | 1 + docker/php-nginx-dev/centos-7-php56/Dockerfile | 1 + docker/php-nginx-dev/centos-7-php7/Dockerfile | 1 + docker/php-nginx-dev/centos-7/Dockerfile | 1 + docker/php-nginx-dev/debian-10/Dockerfile | 1 + docker/php-nginx-dev/debian-7/Dockerfile | 1 + docker/php-nginx-dev/debian-8-php7/Dockerfile | 1 + docker/php-nginx-dev/debian-8/Dockerfile | 1 + docker/php-nginx-dev/debian-9/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 1 + docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 1 + docker/php-nginx/5.6/Dockerfile | 4 +++- .../5.6/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.0/Dockerfile | 4 +++- .../7.0/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.1-alpine/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.1/Dockerfile | 4 +++- .../7.1/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.2-alpine/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.2/Dockerfile | 4 +++- .../7.2/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.3-alpine/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.3/Dockerfile | 4 +++- .../7.3/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.4-alpine/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/7.4/Dockerfile | 4 +++- .../7.4/conf/provision/bootstrap.d/10-nginx.sh | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + .../8.0/conf/provision/bootstrap.d/10-nginx.sh | 1 + .../php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf | 2 ++ .../conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- docker/php-nginx/8.1/conf/etc/nginx/vhost.conf | 2 ++ .../8.1/conf/provision/bootstrap.d/10-nginx.sh | 8 +++++++- docker/php-nginx/centos-7-php56/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/centos-7-php7/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/centos-7/Dockerfile | 1 + .../centos-7/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/debian-10/Dockerfile | 4 +++- .../debian-10/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/debian-7/Dockerfile | 4 +++- .../debian-7/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/debian-8-php7/Dockerfile | 4 +++- .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/debian-8/Dockerfile | 4 +++- .../debian-8/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/debian-9/Dockerfile | 4 +++- .../debian-9/conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-12.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-14.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-15.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-15.10/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-16.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-16.10/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-17.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-17.10/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-nginx/ubuntu-18.04/Dockerfile | 1 + .../conf/provision/bootstrap.d/10-nginx.sh | 1 + docker/php-official/5.6/Dockerfile | 4 ++++ docker/php-official/7.0/Dockerfile | 4 ++++ docker/php-official/7.1-alpine/Dockerfile | 6 +++++- docker/php-official/7.1/Dockerfile | 4 ++++ docker/php-official/7.2-alpine/Dockerfile | 6 +++++- docker/php-official/7.2/Dockerfile | 4 ++++ docker/php-official/7.3-alpine/Dockerfile | 6 +++++- docker/php-official/7.3/Dockerfile | 4 ++++ docker/php-official/7.4-alpine/Dockerfile | 12 +++++++++--- docker/php-official/7.4/Dockerfile | 4 ++++ docker/php-official/8.0-alpine/Dockerfile | 6 ++++++ docker/php-official/8.0/Dockerfile | 1 + docker/php-official/8.1-alpine/Dockerfile | 6 ++++++ docker/php-official/8.1/Dockerfile | 1 + docker/php/centos-7-php56/Dockerfile | 1 + docker/php/centos-7-php7/Dockerfile | 1 + docker/php/centos-7/Dockerfile | 1 + docker/php/debian-10/Dockerfile | 1 + docker/php/debian-7/Dockerfile | 1 + docker/php/debian-8-php7/Dockerfile | 1 + docker/php/debian-8/Dockerfile | 1 + docker/php/debian-9/Dockerfile | 1 + docker/php/ubuntu-12.04/Dockerfile | 1 + docker/php/ubuntu-14.04/Dockerfile | 1 + docker/php/ubuntu-15.04/Dockerfile | 1 + docker/php/ubuntu-15.10/Dockerfile | 1 + docker/php/ubuntu-16.04/Dockerfile | 1 + docker/php/ubuntu-16.10/Dockerfile | 1 + docker/php/ubuntu-17.04/Dockerfile | 1 + docker/php/ubuntu-17.10/Dockerfile | 1 + docker/php/ubuntu-18.04/Dockerfile | 1 + docker/piwik/latest/Dockerfile | 1 + docker/postfix/latest/Dockerfile | 1 + docker/samson-deployment/latest/Dockerfile | 8 ++++++++ docker/sphinx/latest/Dockerfile | 1 + docker/ssh/latest/Dockerfile | 1 + docker/typo3-solr/5.0/Dockerfile | 1 + docker/typo3-solr/6.0/Dockerfile | 1 + docker/typo3-solr/6.1/Dockerfile | 1 + docker/typo3-solr/6.5/Dockerfile | 1 + docker/typo3-solr/7.0/Dockerfile | 1 + docker/typo3-solr/7.5/Dockerfile | 1 + docker/typo3-solr/8.0/Dockerfile | 1 + docker/typo3-solr/8.1/Dockerfile | 1 + docker/varnish/latest/Dockerfile | 1 + docker/vsftp/latest/Dockerfile | 1 + template/Dockerfile/images/php.jinja2 | 12 +++++++++--- 331 files changed, 443 insertions(+), 26 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index bfca256dd..946cf415d 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && apk del python-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 328d46879..5853f8190 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && yum erase -y python-devel \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index b89eee8df..e285853b0 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -34,5 +34,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 54dd350f2..896415167 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -34,5 +34,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 24a5861f8..be4829461 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -34,5 +34,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 9122bc984..a30d5df8f 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 1273719e1..a56ed34cf 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 9880d55e7..f8b64b8a4 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 3e86d3271..39e46f2fe 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 4cebe0f03..8df58946d 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index 6ed8f46d8..ae559ef5b 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 0f8079a03..4e1701d2c 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index f33daa1bb..ca1958491 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index e0132f9f3..e50d15f88 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index df68cbc92..9077f6e62 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 5dc3ea485..05bc517d9 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 818370789..ecf479a79 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 653187da2..3fc7e7833 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 7fec58aa0..8e7ea5299 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 222fd7c26..848313ee4 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 7fee24627..cf8b6308f 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 896d40c18..995daf6af 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index dc72cdcd4..736b20eb1 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index 97253f08e..65faac769 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index 9fa33c68c..74582fc3f 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index d8828194f..b90a39137 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -16,6 +16,7 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index 4ac94e8f3..7156203c2 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -32,6 +32,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index d2114e822..e2412f8a8 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index 17c87444c..9155e7e54 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 16cdc7e30..a3a10ad61 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -30,10 +30,12 @@ RUN set -x \ && a2enmod actions fastcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 08e9d0cec..3535c6178 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -29,10 +29,12 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 2dd1dbaeb..b929f002c 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 2310116a2..2da9f5b25 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -31,6 +31,7 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 5717316bc..28f2ff539 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -31,6 +31,7 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 19c74c604..c04df48fa 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 58affe8a7..1975e966e 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 80f987025..050382bd5 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index fe11925dc..0362d4fc1 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index 93fbd35fd..702821d28 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index 19dd5d97f..9004a849b 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index 7b5c36a63..61e94944a 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index 7cbed3fde..a2a13d5e5 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 038d8ed4c..dbead417a 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index a7b34e291..fdddefa11 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 698751a43..16467c11c 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index c4b62ee7e..16e40aaf8 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 08500d3a3..c64ace292 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index e0652064f..5231d9a46 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index bbf3dde7f..34a5f4109 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index efe3060d6..9a3ac4eff 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index dede9f575..e8d77d1b0 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 112618dc2..ecbc3d102 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index bb1ff1267..e44c91f3a 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index 9c18dbfa9..8bb20d03f 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index 2a62e97bc..7d225fb19 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index 048b89a3c..f29bc579c 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 14d25ec9a..9e8130737 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 0fb7d1e56..cad12e9ac 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index 0678ce2d7..cf338c27f 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 012c84649..c4adb86df 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index f7d41e1fa..e32c36424 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index d089e730e..42eba689f 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index ec2781487..29d9ad433 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index ea0b2f835..93bdd4da3 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index f10a3aed5..2438d3c6d 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 006c81e71..b6e5abba9 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 0db46ae6e..8d0eed32d 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index a953091b7..b26fd52bd 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index c7c6c8a46..c41c6cf66 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index 3eb1defed..bb392a0c5 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index ebfa46deb..04d7ff470 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index bc7097ad6..a2d3e857a 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -65,5 +65,6 @@ RUN set -x \ && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 37c06bb79..5545b88fe 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -56,5 +56,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index e350efb13..fb32b9cd3 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -66,5 +66,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 0fce08323..a8f5b32ef 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -61,5 +61,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index d953e4999..1a9f580ea 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -66,5 +66,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 98817311d..e50dbacbb 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -66,5 +66,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 11923866f..5ca2ccef8 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -61,5 +61,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 75e759838..70a83012b 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -66,5 +66,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 0f0ad7ec3..22befa0a7 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -66,5 +66,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 47dba71a2..eeb09192c 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -61,5 +61,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 47b00ba2d..974324ac8 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -61,5 +61,6 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 68db2fa39..48a35456f 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -24,5 +24,6 @@ RUN set -x \ && pip install certbot \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 065f2a7e7..a7ac3b338 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -36,6 +36,7 @@ RUN apt-install \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ && cd /tmp/Dockerfile \ && make setup \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index 2de98787b..25abd18c8 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -17,6 +17,7 @@ RUN /usr/local/bin/apt-install \ gstreamer1.0-plugins-good \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 360241d1d..148447c10 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -22,6 +22,7 @@ RUN set -x \ && docker-service enable dovecot \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index eace734c4..9b1c346e4 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/alpine/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index b31ddf252..adc4a57fc 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index b2d27cb71..45630d492 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -19,13 +19,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 62311c52f..94de7b12d 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -19,13 +19,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ wheezy nginx\n deb-src http://nginx.org/packages/debian/ wheezy nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 84fcc5151..e5f042721 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -19,13 +19,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ jessie nginx\n deb-src http://nginx.org/packages/debian/ jessie nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 2e7a52809..f27d2517b 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -19,13 +19,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ stretch nginx\n deb-src http://nginx.org/packages/debian/ stretch nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index a225e7923..88095994f 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index e62070f25..6455cb1aa 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 3b5a7f1d1..04a83940b 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 20877a613..db8e41e44 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 7549e7519..22d1cb78b 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 034af14da..10c56f094 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index 36e175007..1c86ef77d 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index 8b984b7aa..8c13bc394 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index 2c05bc074..eb4d6a48a 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index f25fa69e6..62d894de8 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 61043c239..134edbfcb 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index 5d89a2ed1..f0de4ede7 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index e83c90c2f..94291a3fe 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index daf1858fb..a961980f8 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index d5090a750..a838906d9 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index 21119ebf5..3836e5cba 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 2082cae70..183ab5c96 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index c3ad4834b..812dcdf32 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index 864dbd5d8..276c6981c 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 4cb5a17ea..8b54bcdda 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -36,5 +36,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index d027cf839..ec5dccccd 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -36,5 +36,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index fc445aaed..364a725d2 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -37,5 +37,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile index e51d93c2a..228dc7f60 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 94cf54939..d834c8a75 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 847b89413..263d3f7da 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index de70a7351..2d76a5694 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index e041e8f55..a79461141 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 4eb976513..fae7740da 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 63841e831..7d6ee8fa2 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index b517ece03..2c4658a62 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index 04fc6a5f3..dd9a7f575 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 1691faf2f..64198f12a 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index d6d4ccd7c..e334e42de 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index 8f6c82494..7f17fb22a 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index 84a8a3204..39ecf90da 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index 1665f8303..643df03e5 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index 8b7d213dd..6f49e52f2 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index d4e182b6a..dbb1bd0ea 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index ac7c0b7ad..4751384ce 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index 31bb14492..a7af7a827 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index 45eb7ef64..fbc52889d 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index 922d5d5da..c06e4a628 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 8ddb6b4a4..b767c7690 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index 9b906ead2..c518a9622 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index 95b349d1b..34718b618 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index 51e4993ad..26bcdb1c7 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index ab6598c77..9203cae4d 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 869d016e1..0e6805dde 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index c9ac5e070..831c34057 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index d2bf8d581..30d066e36 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 4649facf8..14f69c315 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -31,10 +31,12 @@ RUN set -x \ && a2enmod actions fastcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 545c3433d..b96ca0400 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -30,10 +30,12 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index b32b076c4..9e5875a08 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -30,10 +30,12 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index fea96be26..9f9e8300b 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -29,6 +29,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index db7e27da6..e927f9c11 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -32,6 +32,7 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index ce1d1123f..2b857605f 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -32,6 +32,7 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index de302ca63..fe6990d5e 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index c076f8dae..6b7a6573c 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 1872cad33..8cfc0d0d7 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index dfd217899..a2ee76c56 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index 608a41685..7f736bd69 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index a85cc5b49..41baa7161 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index af5588097..cb4ef71ee 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -30,6 +30,7 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index 18f72fb17..837ef0eef 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -25,5 +25,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index e787a1f81..36e057929 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -25,5 +25,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index 4358df8b6..69141b4c8 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -34,5 +34,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 5d8d5cdef..11a1840b2 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -25,5 +25,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index 1162c753c..5e95d8454 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -34,5 +34,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index 1bcba2454..a46bad5fe 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -25,5 +25,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index dc86a34f1..e49727e20 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -34,5 +34,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 161536a68..3dd9df287 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -25,5 +25,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index c210d4892..9b7706b21 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -34,5 +34,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index d9edf3795..7a0860ff6 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -25,5 +25,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 8577440b8..f5612c20a 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -28,5 +28,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index e5d70d0a6..142d2176b 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -28,5 +28,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 7aeaf786c..efbb9c432 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -29,5 +29,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index 7e1e07e32..3b876a42a 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 81dcdcfbe..09544d01d 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 00073771e..91011552c 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 3fc5d447b..cec07fe63 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 2b570afac..58f7c456a 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 4418c41d3..9f6c1d13e 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index ec323385f..96f65d150 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 7f4cfffe8..afd337406 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index e5ddbd62c..f98836760 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index d90450b3f..1e3264c51 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 775ca2af8..398561085 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index e8964facb..a9113a1d7 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index 1b53f0c6d..dde1ba454 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index 22ec4e5cd..4f92b366d 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -32,5 +32,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 1b17604ec..a3c288c47 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index dd26eadfe..cc59aee47 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index 2c389fe99..a1d631fb8 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 1c47638a3..138294fad 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index 9bb40133f..e12b6b527 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index c94f994b7..cd01db045 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index 277ada141..782ebdb4f 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index 5f00a59aa..fb5a82ff5 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 570c6d5c5..285f5d6e5 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -42,5 +42,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index 3035c7e3e..b0729bd79 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -33,5 +33,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index db79ec198..dd7a24aee 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -36,5 +36,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index d4e5a894c..f72d80728 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -36,5 +36,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index ac210a4c8..490320330 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -37,5 +37,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile index be2076355..e124f890b 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index b1bcf499d..5f4dd8cb6 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -40,6 +40,7 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 3dda33557..9ba4d7ea3 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index a96eb630a..78b71193e 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index 0ab467869..18ac9bd95 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index c43c19253..5a443c75a 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -40,6 +40,7 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index ea341f4c2..b3580e7ba 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 4fb54b414..cf8c4dbf2 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 4aef07cb5..5b4ed6c7c 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index d28830fec..80cc37627 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 9fc47bb9a..9bccbe06a 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index 2201e4467..7d1219242 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index 6265552bf..7056bcd1d 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index f9ff549c8..2cb9845ba 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -40,5 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index 4959bf557..d2d42ae98 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index 31b28bdc2..13e717c69 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index 2cb41a21e..6ee3360df 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 5300bef6d..9994fe28b 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index 0c4f77caf..9c062460e 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index 7b4259432..2a547da15 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index 41fd7a4fb..da968f048 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.3-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index da3b55d96..6645b42f3 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.3/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index 43766c0ff..8c67581c5 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.4-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index 147fc1ccc..2632e3609 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/7.4/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/8.0-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/8.0/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf index 8225f314a..109fbb31b 100644 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf @@ -1,5 +1,6 @@ server { listen 80 default_server; + listen [::]:80 default_server; server_name _ docker; @@ -15,6 +16,7 @@ server { server { listen 443 default_server; + listen [::]:443 default_server; server_name _ docker; diff --git a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh index 1ba70f963..e6f15ce61 100644 --- a/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/8.1-alpine/conf/provision/bootstrap.d/10-nginx.sh @@ -12,13 +12,19 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf index 8225f314a..109fbb31b 100644 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf @@ -1,5 +1,6 @@ server { listen 80 default_server; + listen [::]:80 default_server; server_name _ docker; @@ -15,6 +16,7 @@ server { server { listen 443 default_server; + listen [::]:443 default_server; server_name _ docker; diff --git a/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh index 1ba70f963..e6f15ce61 100644 --- a/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/8.1/conf/provision/bootstrap.d/10-nginx.sh @@ -12,13 +12,19 @@ go-replace --mode=line --regex --regex-backrefs \ -s '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' -r '$1 /docker.stderr $3' \ -- /etc/nginx/nginx.conf +# newer nginx installations might have http.d as the directory +if [ ! -d /etc/nginx/conf.d ]; then + mkdir -p /etc/nginx/conf.d +fi + # Enable nginx main config mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ /etc/nginx/sites-enabled/default \ - /etc/nginx/conf.d/default.conf + /etc/nginx/conf.d/default.conf \ + /etc/nginx/http.d/default.conf if [[ "$IMAGE_FAMILY" == "RedHat" ]] || [[ "$IMAGE_FAMILY" == "Alpine" ]]; then ln -sf /opt/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 9ed1c7a4b..c189e1c0e 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/centos-7-php56/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index a0e7923b4..a1ed95cd0 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/centos-7-php7/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index cd12b3f9b..00bce439b 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index 8534b0448..9a4f58527 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ buster nginx\n deb-src http://nginx.org/packages/debian/ buster nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 0e3c33cd2..4f082dacb 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ wheezy nginx\n deb-src http://nginx.org/packages/debian/ wheezy nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 2331b2cc6..4c0374a69 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ jessie nginx\n deb-src http://nginx.org/packages/debian/ jessie nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-8-php7/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 01d5913c0..975d47e27 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ jessie nginx\n deb-src http://nginx.org/packages/debian/ jessie nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 4b2c506f7..75f5352bf 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -20,13 +20,15 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install nginx - && printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \ + && printf "deb http://nginx.org/packages/debian/ stretch nginx\n deb-src http://nginx.org/packages/debian/ stretch nginx" \ >> /etc/apt/sources.list \ && curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \ + && apt-get update \ && apt-install \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 2c6fb9ef1..171345276 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 9b8691258..9add0a8b4 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-14.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 5c8184473..6713c6a35 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-15.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 7aa54217b..043139c75 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-15.10/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 55cb6b8e2..ab1a5eabd 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-16.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 372729739..2fbc020b6 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-16.10/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index d584ea747..b879393c0 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-17.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index 753774015..8a346b2c5 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-17.10/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index c2906e8fa..cc288981c 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh index 115e2ca91..e6f15ce61 100644 --- a/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh +++ b/docker/php-nginx/ubuntu-18.04/conf/provision/bootstrap.d/10-nginx.sh @@ -18,6 +18,7 @@ if [ ! -d /etc/nginx/conf.d ]; then fi # Enable nginx main config +mkdir -p /etc/nginx/conf.d/ ln -sf /opt/docker/etc/nginx/main.conf /etc/nginx/conf.d/10-docker.conf rm -f \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 7627ec2f7..0bc3ce79b 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -107,6 +108,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -169,6 +171,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -238,6 +241,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index fa5011bb4..e1c921656 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -107,6 +108,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -169,6 +171,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -243,6 +246,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index a269887a8..cd9d7d959 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -111,6 +112,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -176,6 +178,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -215,11 +218,11 @@ RUN set -x \ && pecl install mongodb \ && pecl install imagick \ && pecl install amqp \ + && pecl install yaml \ && docker-php-ext-enable \ apcu \ redis \ - imagick \ mongodb \ amqp \ vips \ @@ -260,6 +263,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 8ab76029d..d89b4c84c 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -107,6 +108,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -169,6 +171,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -243,6 +246,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index a2cdb58ba..faea05f36 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -111,6 +112,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -176,6 +178,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -219,11 +222,11 @@ RUN set -x \ && pecl install mongodb \ && pecl install imagick \ && pecl install amqp \ + && pecl install yaml \ && docker-php-ext-enable \ apcu \ redis \ - imagick \ mongodb \ amqp \ vips \ @@ -264,6 +267,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 071548a93..4ec783b31 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -107,6 +108,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -169,6 +171,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -242,6 +245,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index b4b83fd03..07948e03f 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -111,6 +112,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -176,6 +178,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -219,11 +222,11 @@ RUN set -x \ && pecl install mongodb \ && pecl install imagick \ && pecl install amqp \ + && pecl install yaml \ && docker-php-ext-enable \ apcu \ redis \ - imagick \ mongodb \ amqp \ vips \ @@ -264,6 +267,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index f5c9bd265..39ab65ffe 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -107,6 +108,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -169,6 +171,7 @@ RUN set -x \ # Install extensions && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -242,6 +245,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index bb1e7ec63..80a034403 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -111,6 +112,7 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -176,6 +178,10 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch 3.7.0 --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqplib/php-amqplib.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -183,6 +189,8 @@ RUN set -x \ calendar \ exif \ ffi \ + imagick \ + amqp \ intl \ gettext \ ldap \ @@ -217,13 +225,10 @@ RUN set -x \ && printf "\n" | pecl install vips \ && pecl install redis \ && pecl install mongodb \ - && pecl install imagick \ - && pecl install amqp \ && pecl install yaml \ && docker-php-ext-enable \ apcu \ redis \ - imagick \ mongodb \ amqp \ vips \ @@ -264,6 +269,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 9045fc4d6..01429b66c 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -88,6 +88,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -107,6 +108,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -169,6 +171,7 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -241,6 +244,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 444343335..3ae236299 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -178,6 +178,10 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch 3.7.0 --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqplib/php-amqplib.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -185,6 +189,8 @@ RUN set -x \ calendar \ exif \ ffi \ + imagick \ + amqp \ intl \ gettext \ ldap \ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 9605d9c84..4cd5391ba 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -174,6 +174,7 @@ RUN set -x \ && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index ecc520c82..62cb2e40b 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -150,6 +150,10 @@ RUN set -x \ # Install extensions && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch 3.7.0 --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqplib/php-amqplib.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -157,6 +161,8 @@ RUN set -x \ calendar \ exif \ ffi \ + imagick \ + amqp \ intl \ gettext \ ldap \ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 1f027ceaa..271c6cee9 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -146,6 +146,7 @@ RUN set -x \ && git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 62504d46e..08c17ea84 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -66,6 +66,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index cd4826359..b5b8433eb 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -70,6 +70,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index 0f7481ef9..b27e49bd9 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -71,6 +71,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile index 10579b185..27b35f982 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -67,6 +67,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 152a0b73a..13f2b5ed2 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -60,6 +60,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index c18231cb5..755d4653f 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -78,6 +78,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 7c8f39f7e..1849b25d1 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -61,6 +61,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 8513c2269..1695e07ab 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index fe5be1816..36c17b982 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -61,6 +61,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index dff0b910f..e35e6bb20 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -62,6 +62,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 94bd3d081..8b423415b 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -62,6 +62,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index ce69655ed..c67750502 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -62,6 +62,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 3ae6b3900..c8e2768ba 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 5493aec93..bf32b62aa 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile index 15b5fcb59..575536198 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile index 1614f8d02..a4ff90672 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile index a0931972b..3b624f907 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -68,6 +68,7 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index e5ff70d45..1c62ed2f8 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -23,6 +23,7 @@ RUN set -x \ && find /app/ -type f -exec chmod 0644 {} \; \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index df2c2db2d..0e7786d89 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -15,6 +15,7 @@ RUN set -x \ && docker-service enable postfix \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 0aa78b5e0..46973d7ba 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -69,6 +69,7 @@ RUN set -x \ ca-certificates \ locales \ gnupg \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -102,6 +103,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -118,6 +120,7 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -141,6 +144,7 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -180,6 +184,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \ ## Enable ansible for deployment user && chmod 755 /usr/local/bin/ansible* \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -190,6 +195,7 @@ RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \ && npm install -g grunt-cli \ && npm install -g bower \ && npm install -g npm-cache \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -207,6 +213,7 @@ RUN set -x \ && chmod +x /usr/local/bin/dep \ # Deployer: capistrano (http://capistranorb.com/) && gem install capistrano \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -222,6 +229,7 @@ RUN rake assets:precompile \ && /opt/docker/bin/bootstrap.sh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index d8b030d10..1a77e4ee2 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -37,5 +37,6 @@ RUN set -x \ && pip install t3targets \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 0ac10e2b1..53fd64782 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -12,6 +12,7 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index c6cf9efdb..f1d17ba91 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -65,6 +65,7 @@ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && mkdir -p /opt/solr/server/solr/data \ && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ && chown -R solr:solr /opt/solr/server/solr/ \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index c34e65c32..2b9524292 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index da4f3f822..9d6de7eb8 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 3c4ce8c16..aaac72446 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index f60842b46..6ab75d177 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index c2feb1323..5809a11e5 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index c381113a1..9a0b22e63 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 1492ddfa5..beb694109 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -62,6 +62,7 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 275a2242a..7eae95085 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -24,6 +24,7 @@ RUN set -x \ varnish \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 24d978576..ca567cbad 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -26,6 +26,7 @@ RUN set -x \ /var/log/supervisor \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 4ddbdc578..8d8828c42 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -71,6 +71,7 @@ && cd /usr/src/php/ext/amqp && git submodule update --init \ && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ {%- endif %} + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -245,10 +246,14 @@ {%- if version == '7.4' or version == '8.0' or version == '8.1' %} && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ + && git clone --branch 3.7.0 --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ + && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqplib/php-amqplib.git /usr/src/php/ext/amqp \ + && cd /usr/src/php/ext/amqp && git submodule update --init \ {%- else %} && docker-php-ext-configure intl --with-icu-dir=/usr/local \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \ {%- endif %} + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -257,6 +262,8 @@ exif \ {%- if version == '7.4' or version == '8.0' or version == '8.1' %} ffi \ + imagick \ + amqp \ {%- endif %} intl \ gettext \ @@ -323,13 +330,14 @@ && printf "\n" | pecl install vips \ && pecl install redis \ && pecl install mongodb \ + {%- if version != '7.4' %} && pecl install imagick \ && pecl install amqp \ + {% endif %} && pecl install yaml \ && docker-php-ext-enable \ apcu \ redis \ - imagick \ mongodb \ amqp \ vips \ @@ -409,8 +417,6 @@ && pecl install xdebug-2.5.5 \ {%- elif version == '7.0' or version == '7.1' %} && pecl install xdebug-2.8.1 \ - {%- elif version == '8.0' %} - && pecl install xdebug \ {%- else %} && pecl install xdebug \ {%- endif %} From d70bc8093521e2f8299d7d0df0a81c7cdd879251 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 30 Nov 2022 11:18:23 -0800 Subject: [PATCH 099/123] fix: php-amqp, not php-amqplib --- docker/php-official/7.4-alpine/Dockerfile | 3 ++- docker/php-official/8.0-alpine/Dockerfile | 3 ++- docker/php-official/8.1-alpine/Dockerfile | 3 ++- template/Dockerfile/images/php.jinja2 | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 80a034403..da1067257 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -179,7 +179,8 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch 3.7.0 --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqplib/php-amqplib.git /usr/src/php/ext/amqp \ + && pecl install xdebug \ + && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index 3ae236299..b0da34884 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -179,7 +179,8 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch 3.7.0 --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqplib/php-amqplib.git /usr/src/php/ext/amqp \ + && pecl install xdebug \ + && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 62cb2e40b..5d421d892 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -151,7 +151,8 @@ RUN set -x \ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch 3.7.0 --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqplib/php-amqplib.git /usr/src/php/ext/amqp \ + && pecl install xdebug \ + && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 8d8828c42..4e06a6215 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -247,7 +247,8 @@ && PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \ && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \ && git clone --branch 3.7.0 --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \ - && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqplib/php-amqplib.git /usr/src/php/ext/amqp \ + && pecl install xdebug \ + && git clone --branch v1.11.0 --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \ && cd /usr/src/php/ext/amqp && git submodule update --init \ {%- else %} && docker-php-ext-configure intl --with-icu-dir=/usr/local \ From 79395308f13497ad94ee25562ebb8a670d72e0b6 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 30 Nov 2022 15:52:35 -0800 Subject: [PATCH 100/123] feat: remove dockerStage(), obseleted now due to baselayout.copy() macro change with base image --- docker/bootstrap/alpine/Dockerfile | 31 ++--------------- docker/bootstrap/alpine/Dockerfile.jinja2 | 2 -- docker/bootstrap/centos-7/Dockerfile | 31 ++--------------- docker/bootstrap/centos-7/Dockerfile.jinja2 | 2 -- docker/bootstrap/debian-10/Dockerfile | 31 ++--------------- docker/bootstrap/debian-10/Dockerfile.jinja2 | 2 -- docker/bootstrap/debian-7/Dockerfile | 31 ++--------------- docker/bootstrap/debian-7/Dockerfile.jinja2 | 2 -- docker/bootstrap/debian-8/Dockerfile | 31 ++--------------- docker/bootstrap/debian-8/Dockerfile.jinja2 | 2 -- docker/bootstrap/debian-9/Dockerfile | 31 ++--------------- docker/bootstrap/debian-9/Dockerfile.jinja2 | 2 -- docker/bootstrap/ubuntu-12.04/Dockerfile | 31 ++--------------- .../bootstrap/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/bootstrap/ubuntu-14.04/Dockerfile | 31 ++--------------- .../bootstrap/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/bootstrap/ubuntu-15.04/Dockerfile | 31 ++--------------- .../bootstrap/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/bootstrap/ubuntu-15.10/Dockerfile | 33 ++----------------- .../bootstrap/ubuntu-15.10/Dockerfile.jinja2 | 4 --- docker/bootstrap/ubuntu-16.04/Dockerfile | 31 ++--------------- .../bootstrap/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/bootstrap/ubuntu-16.10/Dockerfile | 31 ++--------------- .../bootstrap/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/bootstrap/ubuntu-17.04/Dockerfile | 31 ++--------------- .../bootstrap/ubuntu-17.04/Dockerfile.jinja2 | 2 -- docker/bootstrap/ubuntu-17.10/Dockerfile | 31 ++--------------- .../bootstrap/ubuntu-17.10/Dockerfile.jinja2 | 2 -- docker/bootstrap/ubuntu-18.04/Dockerfile | 31 ++--------------- .../bootstrap/ubuntu-18.04/Dockerfile.jinja2 | 2 -- docker/php-official/5.6/Dockerfile | 31 ++--------------- docker/php-official/5.6/Dockerfile.jinja2 | 2 -- docker/php-official/7.0/Dockerfile | 31 ++--------------- docker/php-official/7.0/Dockerfile.jinja2 | 2 -- docker/php-official/7.1-alpine/Dockerfile | 31 ++--------------- .../php-official/7.1-alpine/Dockerfile.jinja2 | 4 +-- docker/php-official/7.1/Dockerfile | 31 ++--------------- docker/php-official/7.1/Dockerfile.jinja2 | 2 -- docker/php-official/7.2-alpine/Dockerfile | 31 ++--------------- .../php-official/7.2-alpine/Dockerfile.jinja2 | 4 +-- docker/php-official/7.2/Dockerfile | 31 ++--------------- docker/php-official/7.2/Dockerfile.jinja2 | 2 -- docker/php-official/7.3-alpine/Dockerfile | 31 ++--------------- .../php-official/7.3-alpine/Dockerfile.jinja2 | 4 +-- docker/php-official/7.3/Dockerfile | 31 ++--------------- docker/php-official/7.3/Dockerfile.jinja2 | 2 -- docker/php-official/7.4-alpine/Dockerfile | 31 ++--------------- .../php-official/7.4-alpine/Dockerfile.jinja2 | 4 +-- docker/php-official/7.4/Dockerfile | 31 ++--------------- docker/php-official/7.4/Dockerfile.jinja2 | 2 -- docker/php-official/8.0-alpine/Dockerfile | 31 ++--------------- .../php-official/8.0-alpine/Dockerfile.jinja2 | 4 +-- docker/php-official/8.0/Dockerfile | 31 ++--------------- docker/php-official/8.0/Dockerfile.jinja2 | 2 -- docker/php-official/8.1-alpine/Dockerfile | 5 +-- .../php-official/8.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-official/8.1/Dockerfile | 5 +-- docker/samson-deployment/latest/Dockerfile | 31 ++--------------- .../latest/Dockerfile.jinja2 | 2 -- docker/typo3-solr/3.1/Dockerfile | 31 ++--------------- docker/typo3-solr/3.1/Dockerfile.jinja2 | 2 -- docker/typo3-solr/5.0/Dockerfile | 31 ++--------------- docker/typo3-solr/5.0/Dockerfile.jinja2 | 2 -- docker/typo3-solr/6.0/Dockerfile | 31 ++--------------- docker/typo3-solr/6.0/Dockerfile.jinja2 | 2 -- docker/typo3-solr/6.1/Dockerfile | 31 ++--------------- docker/typo3-solr/6.1/Dockerfile.jinja2 | 2 -- docker/typo3-solr/6.5/Dockerfile | 31 ++--------------- docker/typo3-solr/6.5/Dockerfile.jinja2 | 2 -- docker/typo3-solr/7.0/Dockerfile | 31 ++--------------- docker/typo3-solr/7.0/Dockerfile.jinja2 | 2 -- docker/typo3-solr/7.5/Dockerfile | 31 ++--------------- docker/typo3-solr/7.5/Dockerfile.jinja2 | 2 -- docker/typo3-solr/8.0/Dockerfile | 31 ++--------------- docker/typo3-solr/8.0/Dockerfile.jinja2 | 2 -- docker/typo3-solr/8.1/Dockerfile | 31 ++--------------- docker/typo3-solr/8.1/Dockerfile.jinja2 | 2 -- template/Dockerfile/baselayout.jinja2 | 21 +++--------- 78 files changed, 127 insertions(+), 1141 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index a2d3e857a..69cd714c3 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM alpine:3.11 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/alpine/Dockerfile.jinja2 b/docker/bootstrap/alpine/Dockerfile.jinja2 index 5d259fd97..f59e588b9 100644 --- a/docker/bootstrap/alpine/Dockerfile.jinja2 +++ b/docker/bootstrap/alpine/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("alpine", "3.11") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 5545b88fe..1e27496e7 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM centos:7 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="en_US.utf8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/centos-7/Dockerfile.jinja2 b/docker/bootstrap/centos-7/Dockerfile.jinja2 index 254a0ffd4..2e23e7d0e 100644 --- a/docker/bootstrap/centos-7/Dockerfile.jinja2 +++ b/docker/bootstrap/centos-7/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("centos", "7") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index e8795cff9..5ae54a278 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM debian:buster ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-10/Dockerfile.jinja2 b/docker/bootstrap/debian-10/Dockerfile.jinja2 index b57f4573d..b0f7783f2 100644 --- a/docker/bootstrap/debian-10/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-10/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("debian", "buster") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 098fe1b5c..a2d324e47 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM debian:7 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-7/Dockerfile.jinja2 b/docker/bootstrap/debian-7/Dockerfile.jinja2 index b8ae6b8b3..12cf01d4a 100644 --- a/docker/bootstrap/debian-7/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-7/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("debian", "7") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 487139002..9bd3aa3ff 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM debian:8 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-8/Dockerfile.jinja2 b/docker/bootstrap/debian-8/Dockerfile.jinja2 index 14906dce4..fd9aba666 100644 --- a/docker/bootstrap/debian-8/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-8/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("debian", "8") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index d6b1183ea..d3e8875f8 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM debian:stretch ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-9/Dockerfile.jinja2 b/docker/bootstrap/debian-9/Dockerfile.jinja2 index 079afa606..dadbf3cb3 100644 --- a/docker/bootstrap/debian-9/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-9/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("debian", "stretch") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index fb32b9cd3..51ac51f56 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM ubuntu:12.04 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 index c01d2e759..391f5f6a9 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("ubuntu", "12.04") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index a8f5b32ef..8a016fc48 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM ubuntu:14.04 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 index a395e2be6..52961214f 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("ubuntu", "14.04") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 1a9f580ea..dada2ef03 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM ubuntu:15.04 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 index 95dfd3900..bd9e1f983 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("ubuntu", "15.04") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index e50dbacbb..07ca4da0a 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -3,34 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - -FROM ubuntu:15.10 - ARG BUILDARCH ARG TARGETARCH @@ -44,8 +16,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 index 465b4e83f..7396d867d 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,3 @@ -{{ baselayout.dockerStage() }} - -{{ docker.fromOfficial("ubuntu", "15.10") }} - {{ docker.platformArgs() }} {{ docker.version() }} diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 5ca2ccef8..c60716033 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM ubuntu:16.04 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 index 2fe19786a..d28f1f93d 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("ubuntu", "16.04") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 70a83012b..2c5d1039e 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM ubuntu:16.10 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 index 6e92f6069..91674895a 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("ubuntu", "16.10") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 22befa0a7..0c32cab34 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM ubuntu:17.04 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 index 8c1accdd3..521e09968 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("ubuntu", "17.04") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index eeb09192c..1e1fbf949 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM ubuntu:17.10 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 index bbfae5169..e097ee132 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("ubuntu", "17.10") }} {{ docker.platformArgs() }} diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 974324ac8..637377c2a 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM ubuntu:18.04 ARG BUILDARCH @@ -44,8 +18,9 @@ ENV TERM="xterm" \ LC_ALL="C.UTF-8" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 index 34d061acd..a3ab86249 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("ubuntu", "18.04") }} {{ docker.platformArgs() }} diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 0bc3ce79b..1bf9cb53a 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:5.6-fpm-stretch ARG BUILDARCH @@ -54,8 +28,9 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/5.6/Dockerfile.jinja2 b/docker/php-official/5.6/Dockerfile.jinja2 index 45d701e4b..b71f3fc3f 100644 --- a/docker/php-official/5.6/Dockerfile.jinja2 +++ b/docker/php-official/5.6/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "5.6-fpm-stretch") }} {{ docker.platformArgs() }} diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index e1c921656..64a339b7e 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.0-fpm-stretch ARG BUILDARCH @@ -54,8 +28,9 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.0/Dockerfile.jinja2 b/docker/php-official/7.0/Dockerfile.jinja2 index 4a5a007e6..c5451c823 100644 --- a/docker/php-official/7.0/Dockerfile.jinja2 +++ b/docker/php-official/7.0/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.0-fpm-stretch") }} {{ docker.platformArgs() }} diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index cd9d7d959..deda82702 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.1-fpm-alpine ARG BUILDARCH @@ -55,8 +29,9 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.1-alpine/Dockerfile.jinja2 b/docker/php-official/7.1-alpine/Dockerfile.jinja2 index 25b04010a..c36c265da 100644 --- a/docker/php-official/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.1-fpm-alpine") }} {{ docker.platformArgs() }} @@ -13,7 +11,7 @@ {{ environment.phpAlpineIconvWorkaround() }} {{ environment.phpComposerVersion() }} -{{ baselayout.copy() }} +{{ baselayout.copy("alpine") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index d89b4c84c..07ef25299 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.1-fpm-buster ARG BUILDARCH @@ -54,8 +28,9 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.1/Dockerfile.jinja2 b/docker/php-official/7.1/Dockerfile.jinja2 index 8ed8938fb..82f341cf0 100644 --- a/docker/php-official/7.1/Dockerfile.jinja2 +++ b/docker/php-official/7.1/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.1-fpm-buster") }} {{ docker.platformArgs() }} diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index faea05f36..5c2379cc9 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.2-fpm-alpine ARG BUILDARCH @@ -55,8 +29,9 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.2-alpine/Dockerfile.jinja2 b/docker/php-official/7.2-alpine/Dockerfile.jinja2 index 15233b3be..668988234 100644 --- a/docker/php-official/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.2-fpm-alpine") }} {{ docker.platformArgs() }} @@ -13,7 +11,7 @@ {{ environment.phpAlpineIconvWorkaround() }} {{ environment.phpComposerVersion() }} -{{ baselayout.copy() }} +{{ baselayout.copy("alpine") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 4ec783b31..8dae85c8f 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.2-fpm-buster ARG BUILDARCH @@ -54,8 +28,9 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.2/Dockerfile.jinja2 b/docker/php-official/7.2/Dockerfile.jinja2 index 0b873abd2..3ea9a8f9f 100644 --- a/docker/php-official/7.2/Dockerfile.jinja2 +++ b/docker/php-official/7.2/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.2-fpm-buster") }} {{ docker.platformArgs() }} diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 07948e03f..7f1d0efb9 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.3-fpm-alpine ARG BUILDARCH @@ -55,8 +29,9 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.3-alpine/Dockerfile.jinja2 b/docker/php-official/7.3-alpine/Dockerfile.jinja2 index 0df9074bf..ffc370805 100644 --- a/docker/php-official/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.3-alpine/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.3-fpm-alpine") }} {{ docker.platformArgs() }} @@ -13,7 +11,7 @@ {{ environment.phpAlpineIconvWorkaround() }} {{ environment.phpComposerVersion() }} -{{ baselayout.copy() }} +{{ baselayout.copy("alpine") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index 39ab65ffe..be8bded35 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.3-fpm-buster ARG BUILDARCH @@ -54,8 +28,9 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.3/Dockerfile.jinja2 b/docker/php-official/7.3/Dockerfile.jinja2 index 840ebd934..83694b503 100644 --- a/docker/php-official/7.3/Dockerfile.jinja2 +++ b/docker/php-official/7.3/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.3-fpm-buster") }} {{ docker.platformArgs() }} diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index da1067257..06e3b3016 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.4-fpm-alpine ARG BUILDARCH @@ -55,8 +29,9 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.4-alpine/Dockerfile.jinja2 b/docker/php-official/7.4-alpine/Dockerfile.jinja2 index a59575459..21670f707 100644 --- a/docker/php-official/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.4-alpine/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.4-fpm-alpine") }} {{ docker.platformArgs() }} @@ -13,7 +11,7 @@ {{ environment.phpAlpineIconvWorkaround() }} {{ environment.phpComposerVersion() }} -{{ baselayout.copy() }} +{{ baselayout.copy("alpine") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 01429b66c..f92af026a 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:7.4-fpm-buster ARG BUILDARCH @@ -54,8 +28,9 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.4/Dockerfile.jinja2 b/docker/php-official/7.4/Dockerfile.jinja2 index e3cd25ad4..6a2d55e2a 100644 --- a/docker/php-official/7.4/Dockerfile.jinja2 +++ b/docker/php-official/7.4/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "7.4-fpm-buster") }} {{ docker.platformArgs() }} diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index b0da34884..b03ad902c 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:8.0-fpm-alpine ARG BUILDARCH @@ -55,8 +29,9 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.0-alpine/Dockerfile.jinja2 b/docker/php-official/8.0-alpine/Dockerfile.jinja2 index ae5d059f9..b05d748fa 100644 --- a/docker/php-official/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.0-alpine/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "8.0-fpm-alpine") }} {{ docker.platformArgs() }} @@ -13,7 +11,7 @@ {{ environment.phpAlpineIconvWorkaround() }} {{ environment.phpComposerVersion() }} -{{ baselayout.copy() }} +{{ baselayout.copy("alpine") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 4cd5391ba..85ed09428 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM php:8.0-fpm-buster ARG BUILDARCH @@ -54,8 +28,9 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.0/Dockerfile.jinja2 b/docker/php-official/8.0/Dockerfile.jinja2 index edaa40901..4d2ea48b2 100644 --- a/docker/php-official/8.0/Dockerfile.jinja2 +++ b/docker/php-official/8.0/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("php", "8.0-fpm-buster") }} {{ docker.platformArgs() }} diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 5d421d892..ccc1cd615 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -27,8 +27,9 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.1-alpine/Dockerfile.jinja2 b/docker/php-official/8.1-alpine/Dockerfile.jinja2 index b5e4c40d0..d909efffd 100644 --- a/docker/php-official/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.1-alpine/Dockerfile.jinja2 @@ -10,7 +10,7 @@ {{ environment.phpAlpineIconvWorkaround() }} {{ environment.phpComposerVersion() }} -{{ baselayout.copy() }} +{{ baselayout.copy("alpine") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 271c6cee9..e31ed6779 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -26,8 +26,9 @@ ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i" ENV COMPOSER_VERSION="2" -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 46973d7ba..bb61ee4af 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM zendesk/samson:latest ARG BUILDARCH @@ -51,8 +25,9 @@ ENV APPLICATION_USER=application \ ############################################################################### -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2 index 10d763a7b..81e0e4470 100644 --- a/docker/samson-deployment/latest/Dockerfile.jinja2 +++ b/docker/samson-deployment/latest/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.from("samson", user="zendesk") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 7cb6aba77..492bdc16d 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM guywithnose/solr:4.10.4 ARG BUILDARCH @@ -48,8 +22,9 @@ USER root COPY ./solr/ /tmp/solr -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && rm -rf /opt/solr/server \ diff --git a/docker/typo3-solr/3.1/Dockerfile.jinja2 b/docker/typo3-solr/3.1/Dockerfile.jinja2 index a6be385c2..4eea49f64 100644 --- a/docker/typo3-solr/3.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/3.1/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.from(user="guywithnose", image="solr", tag="4.10.4") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index f1d17ba91..29699fa50 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM guywithnose/solr:4.10.4 ARG BUILDARCH @@ -48,8 +22,9 @@ USER root COPY ./solr/ /tmp/solr -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ WORKDIR / diff --git a/docker/typo3-solr/5.0/Dockerfile.jinja2 b/docker/typo3-solr/5.0/Dockerfile.jinja2 index 53f134ca5..37f7f81f1 100644 --- a/docker/typo3-solr/5.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/5.0/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.from(user="guywithnose", image="solr", tag="4.10.4") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 2b9524292..b470594f1 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM solr:6.3.0 ARG BUILDARCH @@ -46,8 +20,9 @@ ENV TERM="xterm" \ USER root -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/6.0/Dockerfile.jinja2 b/docker/typo3-solr/6.0/Dockerfile.jinja2 index 6142cbbeb..7652928a4 100644 --- a/docker/typo3-solr/6.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.0/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("solr", "6.3.0") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 9d6de7eb8..6d94421b3 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM solr:6.3.0 ARG BUILDARCH @@ -46,8 +20,9 @@ ENV TERM="xterm" \ USER root -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/6.1/Dockerfile.jinja2 b/docker/typo3-solr/6.1/Dockerfile.jinja2 index bf43fd1d5..53883b451 100644 --- a/docker/typo3-solr/6.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.1/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("solr", "6.3.0") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index aaac72446..695231165 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM solr:6.6.2 ARG BUILDARCH @@ -46,8 +20,9 @@ ENV TERM="xterm" \ USER root -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/6.5/Dockerfile.jinja2 b/docker/typo3-solr/6.5/Dockerfile.jinja2 index a00047fd9..8da213583 100644 --- a/docker/typo3-solr/6.5/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.5/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("solr", "6.6.2") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 6ab75d177..93568ceac 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM solr:6.3.0 ARG BUILDARCH @@ -46,8 +20,9 @@ ENV TERM="xterm" \ USER root -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/7.0/Dockerfile.jinja2 b/docker/typo3-solr/7.0/Dockerfile.jinja2 index 0d52233ce..b05316c33 100644 --- a/docker/typo3-solr/7.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/7.0/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("solr", "6.3.0") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 5809a11e5..9c320b838 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM solr:6.6.2 ARG BUILDARCH @@ -46,8 +20,9 @@ ENV TERM="xterm" \ USER root -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/7.5/Dockerfile.jinja2 b/docker/typo3-solr/7.5/Dockerfile.jinja2 index 45d8100e9..a2774e2c3 100644 --- a/docker/typo3-solr/7.5/Dockerfile.jinja2 +++ b/docker/typo3-solr/7.5/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("solr", "6.6.2") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 9a0b22e63..c6569bf25 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM solr:6.6.2 ARG BUILDARCH @@ -46,8 +20,9 @@ ENV TERM="xterm" \ USER root -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/8.0/Dockerfile.jinja2 b/docker/typo3-solr/8.0/Dockerfile.jinja2 index f30316996..776c1e323 100644 --- a/docker/typo3-solr/8.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/8.0/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("solr", "6.6.2") }} {{ docker.platformArgs() }} diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index beb694109..01c76985a 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -3,32 +3,6 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - -# staged baselayout builder -FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine AS base - -ARG BUILDARCH -ARG TARGETARCH - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - ## install go-replace - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ - && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ - && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ - ## install gosu - && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ - wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ - wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ - GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ - rm -rf "$GNUPGHOME"; \ - chmod +x "/baselayout/sbin/gosu"; - FROM solr:6.6.3 ARG BUILDARCH @@ -46,8 +20,9 @@ ENV TERM="xterm" \ USER root -# base copy (from staged image) -COPY --from=base /baselayout / +# Baselayout copy (from staged image) +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/8.1/Dockerfile.jinja2 b/docker/typo3-solr/8.1/Dockerfile.jinja2 index f7c2a6f81..504883e9d 100644 --- a/docker/typo3-solr/8.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/8.1/Dockerfile.jinja2 @@ -1,5 +1,3 @@ -{{ baselayout.dockerStage() }} - {{ docker.fromOfficial("solr", "6.6.3") }} {{ docker.platformArgs() }} diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index 86f67956d..ba87e03d5 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -1,21 +1,8 @@ {% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/tools.jinja2' as tools %} -{% macro dockerStage() %} -# staged baselayout builder -{{ docker.from("toolbox", "alpine", user) }} AS base - -{{ docker.platformArgs() }} - -RUN set -eux \ - mkdir -p \ - /baselayout/sbin \ - /baselayout/usr/local/bin \ - {{ tools.goreplace(path="/baselayout/usr/local/bin") }} \ - {{ tools.gosu(path="/baselayout/sbin") }} -{%- endmacro %} - -{% macro copy() %} -# base copy (from staged image) -COPY --from=base /baselayout / +{% macro copy(flavor="buster") %} +# Baselayout copy (from staged image) +COPY --from={{ docker.from("toolbox", flavor, user) }} /baselayout/sbin/* /sbin/ +COPY --from={{ docker.from("toolbox", flavor, user) }} /baselayout/usr/local/bin/* /usr/local/bin/ {%- endmacro %} From 8be38ca39b0fe2b817be25e6983f15e259ae05b3 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 30 Nov 2022 16:00:24 -0800 Subject: [PATCH 101/123] oops don't include FROM twice now --- docker/bootstrap/alpine/Dockerfile | 4 ++-- docker/bootstrap/centos-7/Dockerfile | 4 ++-- docker/bootstrap/debian-10/Dockerfile | 4 ++-- docker/bootstrap/debian-7/Dockerfile | 4 ++-- docker/bootstrap/debian-8/Dockerfile | 4 ++-- docker/bootstrap/debian-9/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-12.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-14.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-15.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-15.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-16.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-16.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-17.04/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-17.10/Dockerfile | 4 ++-- docker/bootstrap/ubuntu-18.04/Dockerfile | 4 ++-- docker/php-official/5.6/Dockerfile | 4 ++-- docker/php-official/7.0/Dockerfile | 4 ++-- docker/php-official/7.1-alpine/Dockerfile | 4 ++-- docker/php-official/7.1/Dockerfile | 4 ++-- docker/php-official/7.2-alpine/Dockerfile | 4 ++-- docker/php-official/7.2/Dockerfile | 4 ++-- docker/php-official/7.3-alpine/Dockerfile | 4 ++-- docker/php-official/7.3/Dockerfile | 4 ++-- docker/php-official/7.4-alpine/Dockerfile | 4 ++-- docker/php-official/7.4/Dockerfile | 4 ++-- docker/php-official/8.0-alpine/Dockerfile | 4 ++-- docker/php-official/8.0/Dockerfile | 4 ++-- docker/php-official/8.1-alpine/Dockerfile | 4 ++-- docker/php-official/8.1/Dockerfile | 4 ++-- docker/samson-deployment/latest/Dockerfile | 4 ++-- docker/typo3-solr/3.1/Dockerfile | 4 ++-- docker/typo3-solr/5.0/Dockerfile | 4 ++-- docker/typo3-solr/6.0/Dockerfile | 4 ++-- docker/typo3-solr/6.1/Dockerfile | 4 ++-- docker/typo3-solr/6.5/Dockerfile | 4 ++-- docker/typo3-solr/7.0/Dockerfile | 4 ++-- docker/typo3-solr/7.5/Dockerfile | 4 ++-- docker/typo3-solr/8.0/Dockerfile | 4 ++-- docker/typo3-solr/8.1/Dockerfile | 4 ++-- template/Dockerfile/baselayout.jinja2 | 4 ++-- 40 files changed, 80 insertions(+), 80 deletions(-) diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 69cd714c3..14fd316e4 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 1e27496e7..6d7982802 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index 5ae54a278..5c0f63c18 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index a2d324e47..068565e44 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 9bd3aa3ff..022113636 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index d3e8875f8..830a992e7 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 51ac51f56..1a24ef8f0 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 8a016fc48..650cf25b5 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index dada2ef03..4178d4017 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 07ca4da0a..6adf492ce 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -17,8 +17,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index c60716033..0c4914030 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 2c5d1039e..92568a6f9 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 0c32cab34..2325fe087 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index 1e1fbf949..c2d59940e 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index 637377c2a..df04bcddb 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -19,8 +19,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 1bf9cb53a..e367ce679 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -29,8 +29,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 64a339b7e..e0f61e7dc 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -29,8 +29,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index deda82702..fe36228da 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -30,8 +30,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 07ef25299..eade0b64e 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -29,8 +29,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 5c2379cc9..557cfde39 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -30,8 +30,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 8dae85c8f..b55531846 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -29,8 +29,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 7f1d0efb9..39e27325b 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -30,8 +30,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index be8bded35..fd8b782d8 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -29,8 +29,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 06e3b3016..7cc7c5197 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -30,8 +30,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index f92af026a..b2320976f 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -29,8 +29,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index b03ad902c..fd7193b8c 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -30,8 +30,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 85ed09428..9f121ae01 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -29,8 +29,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index ccc1cd615..816372f1d 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -28,8 +28,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index e31ed6779..7088562de 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -27,8 +27,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index bb61ee4af..7e6ffd4be 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -26,8 +26,8 @@ ENV APPLICATION_USER=application \ # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN set -x \ # Init bootstrap diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 492bdc16d..3e9219277 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -23,8 +23,8 @@ COPY ./solr/ /tmp/solr # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && rm -rf /opt/solr/server \ diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 29699fa50..f9ac2209c 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -23,8 +23,8 @@ COPY ./solr/ /tmp/solr # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ WORKDIR / diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index b470594f1..c71a97c2f 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -21,8 +21,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 6d94421b3..5be406531 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -21,8 +21,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 695231165..4db910502 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -21,8 +21,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 93568ceac..0ab29b97b 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -21,8 +21,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 9c320b838..585235639 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -21,8 +21,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index c6569bf25..2db9e6285 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -21,8 +21,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 01c76985a..880af2a23 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -21,8 +21,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=FROM ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ RUN apt-update \ && apt-install net-tools \ diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index ba87e03d5..3989ef942 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -3,6 +3,6 @@ {% macro copy(flavor="buster") %} # Baselayout copy (from staged image) -COPY --from={{ docker.from("toolbox", flavor, user) }} /baselayout/sbin/* /sbin/ -COPY --from={{ docker.from("toolbox", flavor, user) }} /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from={{ docker.image("toolbox", flavor, user) }} /baselayout/sbin/* /sbin/ +COPY --from={{ docker.image("toolbox", flavor, user) }} /baselayout/usr/local/bin/* /usr/local/bin/ {%- endmacro %} From 8c20e6aaeb38f04e34835d41e3f9c370a325d75e Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 1 Dec 2022 10:15:31 -0800 Subject: [PATCH 102/123] catch and print path of dockerfile with no "from" statement --- bin/webdevops/DockerfileUtility.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/webdevops/DockerfileUtility.py b/bin/webdevops/DockerfileUtility.py index 009110a23..4b9e4136e 100644 --- a/bin/webdevops/DockerfileUtility.py +++ b/bin/webdevops/DockerfileUtility.py @@ -20,6 +20,7 @@ import os import re +import sys from pathlib import Path DOCKERFILE_STATEMENT_FROM_RE = re.compile(r'FROM\s+(?P--platform=\S+\s)?(?P[^\s:]+)(:(?P[^\s:]+))?(?!.*\s+AS)', re.MULTILINE) @@ -205,9 +206,14 @@ def parse_dockerfile_from_statement(path): """ with open(path, 'r') as fileInput: DockerfileContent = fileInput.read() - data = ([m.groupdict() for m in DOCKERFILE_STATEMENT_FROM_RE.finditer(DockerfileContent)])[0] - ret = create_imagename_from_regex_result(data) - return ret + + try: + data = ([m.groupdict() for m in DOCKERFILE_STATEMENT_FROM_RE.finditer(DockerfileContent)])[0] + ret = create_imagename_from_regex_result(data) + return ret + except IndexError as e: + print("failed to find docker from statement in %s" % path) + raise(e) def parse_dockerfile_multistage_images(path): """ From a4d9dcdccbfe73197b98df54062ba58c22cc26d3 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 1 Dec 2022 10:27:06 -0800 Subject: [PATCH 103/123] oops, add back from statement for ubuntu 15.10 --- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 ++ docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 6adf492ce..fa36cac95 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -3,6 +3,8 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ +FROM ubuntu:15.10 + ARG BUILDARCH ARG TARGETARCH diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 index 7396d867d..821dac074 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 @@ -1,3 +1,5 @@ +{{ docker.fromOfficial("ubuntu", "15.10") }} + {{ docker.platformArgs() }} {{ docker.version() }} From d6c53e0a7fe10d20f3c3f4c11c3d7b3abcefa463 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 1 Dec 2022 10:42:41 -0800 Subject: [PATCH 104/123] add goreplace and gosu in toolbox image --- docker/toolbox/alpine/Dockerfile | 17 +++++++++++++++++ docker/toolbox/alpine/Dockerfile.jinja2 | 5 +++++ docker/toolbox/buster/Dockerfile | 19 ++++++++++++++++++- docker/toolbox/buster/Dockerfile.jinja2 | 7 ++++++- 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/docker/toolbox/alpine/Dockerfile b/docker/toolbox/alpine/Dockerfile index b513c3271..b56c65205 100644 --- a/docker/toolbox/alpine/Dockerfile +++ b/docker/toolbox/alpine/Dockerfile @@ -34,3 +34,20 @@ RUN set -eux; \ git \ gnupg \ ; \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ + ## install go-replace + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; diff --git a/docker/toolbox/alpine/Dockerfile.jinja2 b/docker/toolbox/alpine/Dockerfile.jinja2 index d69ccf249..9800535cd 100644 --- a/docker/toolbox/alpine/Dockerfile.jinja2 +++ b/docker/toolbox/alpine/Dockerfile.jinja2 @@ -28,3 +28,8 @@ RUN set -eux; \ git \ gnupg \ ; \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ + {{ tools.goreplace(path="/baselayout/usr/local/bin") }} \ + {{ tools.gosu(path="/baselayout/sbin") }} diff --git a/docker/toolbox/buster/Dockerfile b/docker/toolbox/buster/Dockerfile index c1b0fa6f3..855eaad26 100644 --- a/docker/toolbox/buster/Dockerfile +++ b/docker/toolbox/buster/Dockerfile @@ -34,4 +34,21 @@ RUN set -eux; \ git \ gnupg \ ; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* ; \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ + ## install go-replace + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }') \ + && export grArch="$(echo $dpkgArch | sed s/amd64/64/g)" \ + && wget -O "/baselayout/usr/local/bin/go-replace-$dpkgArch" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-$grArch-linux" \ + && chmod +x "/baselayout/usr/local/bin/go-replace-$dpkgArch" \ + ## install gosu + && export dpkgArch=$(dpkg --print-architecture | awk -F- '{ print $NF }'); \ + wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch"; \ + wget -O "/baselayout/sbin/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$dpkgArch.asc"; \ + GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --verify /baselayout/sbin/gosu.asc "/baselayout/sbin/gosu"; \ + rm -rf "$GNUPGHOME"; \ + chmod +x "/baselayout/sbin/gosu"; diff --git a/docker/toolbox/buster/Dockerfile.jinja2 b/docker/toolbox/buster/Dockerfile.jinja2 index a7ec23eaa..00db25dd5 100644 --- a/docker/toolbox/buster/Dockerfile.jinja2 +++ b/docker/toolbox/buster/Dockerfile.jinja2 @@ -28,4 +28,9 @@ RUN set -eux; \ git \ gnupg \ ; \ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* ; \ + mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin \ + {{ tools.goreplace(path="/baselayout/usr/local/bin") }} \ + {{ tools.gosu(path="/baselayout/sbin") }} From be22319235dd6c0583d103e6f6d17346f439779d Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 1 Dec 2022 14:26:10 -0800 Subject: [PATCH 105/123] cleanup macro no longer leaves trailing newline --- template/Dockerfile/docker.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 246568e57..f7b4095de 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -55,7 +55,7 @@ ENTRYPOINT ["{{ command }}"] CMD ["{{ command }}"] {%- endmacro -%} -{%- macro cleanup() %} +{%- macro cleanup() -%} && docker-arch-info $TARGETARCH \ && docker-image-cleanup {%- endmacro -%} From dcac72440bb5b46dfb4933939afc3bdd680b5efb Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 1 Dec 2022 14:27:00 -0800 Subject: [PATCH 106/123] fix: php8.1 has missing docker.platformArgs() macro call --- docker/php-official/8.1-alpine/Dockerfile.jinja2 | 3 ++- docker/php-official/8.1/Dockerfile.jinja2 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/php-official/8.1-alpine/Dockerfile.jinja2 b/docker/php-official/8.1-alpine/Dockerfile.jinja2 index d909efffd..8c4c5aa5f 100644 --- a/docker/php-official/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.1-alpine/Dockerfile.jinja2 @@ -1,6 +1,7 @@ - {{ docker.fromOfficial("php", "8.1-fpm-alpine") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/8.1/Dockerfile.jinja2 b/docker/php-official/8.1/Dockerfile.jinja2 index d116bbc4a..8f6f1e9c5 100644 --- a/docker/php-official/8.1/Dockerfile.jinja2 +++ b/docker/php-official/8.1/Dockerfile.jinja2 @@ -1,6 +1,7 @@ - {{ docker.fromOfficial("php", "8.1-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} From 3a2da0dc51dc11adc5591b5cf18c89669f5e5f3a Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 1 Dec 2022 14:27:23 -0800 Subject: [PATCH 107/123] feat: update dockerfiles --- docker/ansible/alpine/Dockerfile | 1 - docker/ansible/centos-7/Dockerfile | 1 - docker/ansible/debian-7/Dockerfile | 1 - docker/ansible/debian-8/Dockerfile | 1 - docker/ansible/debian-9/Dockerfile | 1 - docker/ansible/ubuntu-12.04/Dockerfile | 1 - docker/ansible/ubuntu-14.04/Dockerfile | 1 - docker/ansible/ubuntu-15.04/Dockerfile | 1 - docker/ansible/ubuntu-15.10/Dockerfile | 1 - docker/ansible/ubuntu-16.04/Dockerfile | 1 - docker/ansible/ubuntu-17.04/Dockerfile | 1 - docker/apache-dev/alpine/Dockerfile | 1 - docker/apache-dev/centos-7/Dockerfile | 1 - docker/apache-dev/debian-10/Dockerfile | 1 - docker/apache-dev/debian-7/Dockerfile | 1 - docker/apache-dev/debian-8/Dockerfile | 1 - docker/apache-dev/debian-9/Dockerfile | 1 - docker/apache-dev/ubuntu-12.04/Dockerfile | 1 - docker/apache-dev/ubuntu-14.04/Dockerfile | 1 - docker/apache-dev/ubuntu-15.04/Dockerfile | 1 - docker/apache-dev/ubuntu-15.10/Dockerfile | 1 - docker/apache-dev/ubuntu-16.04/Dockerfile | 1 - docker/apache-dev/ubuntu-16.10/Dockerfile | 1 - docker/apache-dev/ubuntu-17.04/Dockerfile | 1 - docker/apache-dev/ubuntu-17.10/Dockerfile | 1 - docker/apache-dev/ubuntu-18.04/Dockerfile | 1 - docker/apache/alpine/Dockerfile | 1 - docker/apache/centos-7/Dockerfile | 1 - docker/apache/debian-10/Dockerfile | 1 - docker/apache/debian-7/Dockerfile | 2 -- docker/apache/debian-8/Dockerfile | 2 -- docker/apache/debian-9/Dockerfile | 1 - docker/apache/ubuntu-12.04/Dockerfile | 1 - docker/apache/ubuntu-14.04/Dockerfile | 1 - docker/apache/ubuntu-15.04/Dockerfile | 1 - docker/apache/ubuntu-15.10/Dockerfile | 1 - docker/apache/ubuntu-16.04/Dockerfile | 1 - docker/apache/ubuntu-16.10/Dockerfile | 1 - docker/apache/ubuntu-17.04/Dockerfile | 1 - docker/apache/ubuntu-17.10/Dockerfile | 1 - docker/apache/ubuntu-18.04/Dockerfile | 1 - docker/base-app/alpine/Dockerfile | 1 - docker/base-app/centos-7/Dockerfile | 1 - docker/base-app/debian-10/Dockerfile | 1 - docker/base-app/debian-7/Dockerfile | 1 - docker/base-app/debian-8/Dockerfile | 1 - docker/base-app/debian-9/Dockerfile | 1 - docker/base-app/ubuntu-12.04/Dockerfile | 1 - docker/base-app/ubuntu-14.04/Dockerfile | 1 - docker/base-app/ubuntu-15.04/Dockerfile | 1 - docker/base-app/ubuntu-15.10/Dockerfile | 1 - docker/base-app/ubuntu-16.04/Dockerfile | 1 - docker/base-app/ubuntu-16.10/Dockerfile | 1 - docker/base-app/ubuntu-17.04/Dockerfile | 1 - docker/base-app/ubuntu-17.10/Dockerfile | 1 - docker/base-app/ubuntu-18.04/Dockerfile | 1 - docker/base/alpine/Dockerfile | 1 - docker/base/centos-7/Dockerfile | 1 - docker/base/debian-10/Dockerfile | 1 - docker/base/debian-7/Dockerfile | 1 - docker/base/debian-8/Dockerfile | 1 - docker/base/debian-9/Dockerfile | 1 - docker/base/ubuntu-12.04/Dockerfile | 1 - docker/base/ubuntu-14.04/Dockerfile | 1 - docker/base/ubuntu-15.04/Dockerfile | 1 - docker/base/ubuntu-15.10/Dockerfile | 1 - docker/base/ubuntu-16.04/Dockerfile | 1 - docker/base/ubuntu-16.10/Dockerfile | 1 - docker/base/ubuntu-17.04/Dockerfile | 1 - docker/base/ubuntu-17.10/Dockerfile | 1 - docker/base/ubuntu-18.04/Dockerfile | 1 - docker/bootstrap/alpine/Dockerfile | 1 - docker/bootstrap/centos-7/Dockerfile | 1 - docker/bootstrap/ubuntu-12.04/Dockerfile | 1 - docker/bootstrap/ubuntu-14.04/Dockerfile | 1 - docker/bootstrap/ubuntu-15.04/Dockerfile | 1 - docker/bootstrap/ubuntu-15.10/Dockerfile | 1 - docker/bootstrap/ubuntu-16.04/Dockerfile | 1 - docker/bootstrap/ubuntu-16.10/Dockerfile | 1 - docker/bootstrap/ubuntu-17.04/Dockerfile | 1 - docker/bootstrap/ubuntu-17.10/Dockerfile | 1 - docker/bootstrap/ubuntu-18.04/Dockerfile | 1 - docker/certbot/latest/Dockerfile | 1 - docker/dockerfile-build-env/latest/Dockerfile | 1 - docker/liquidsoap/latest/Dockerfile | 1 - docker/mail-sandbox/latest/Dockerfile | 1 - docker/nginx/alpine/Dockerfile | 1 - docker/nginx/centos-7/Dockerfile | 1 - docker/nginx/debian-10/Dockerfile | 1 - docker/nginx/debian-7/Dockerfile | 1 - docker/nginx/debian-8/Dockerfile | 1 - docker/nginx/debian-9/Dockerfile | 1 - docker/nginx/ubuntu-12.04/Dockerfile | 1 - docker/nginx/ubuntu-14.04/Dockerfile | 1 - docker/nginx/ubuntu-15.04/Dockerfile | 1 - docker/nginx/ubuntu-15.10/Dockerfile | 1 - docker/nginx/ubuntu-16.04/Dockerfile | 1 - docker/nginx/ubuntu-16.10/Dockerfile | 1 - docker/nginx/ubuntu-17.04/Dockerfile | 1 - docker/nginx/ubuntu-17.10/Dockerfile | 1 - docker/nginx/ubuntu-18.04/Dockerfile | 1 - docker/php-apache-dev/5.6/Dockerfile | 1 - docker/php-apache-dev/7.0/Dockerfile | 1 - docker/php-apache-dev/7.1-alpine/Dockerfile | 1 - docker/php-apache-dev/7.1/Dockerfile | 1 - docker/php-apache-dev/7.2-alpine/Dockerfile | 1 - docker/php-apache-dev/7.2/Dockerfile | 1 - docker/php-apache-dev/7.3-alpine/Dockerfile | 1 - docker/php-apache-dev/7.3/Dockerfile | 1 - docker/php-apache-dev/7.4-alpine/Dockerfile | 1 - docker/php-apache-dev/7.4/Dockerfile | 1 - docker/php-apache-dev/8.0-alpine/Dockerfile | 1 - docker/php-apache-dev/8.0/Dockerfile | 1 - docker/php-apache-dev/8.1-alpine/Dockerfile | 1 - docker/php-apache-dev/8.1/Dockerfile | 1 - docker/php-apache-dev/centos-7-php56/Dockerfile | 1 - docker/php-apache-dev/centos-7-php7/Dockerfile | 1 - docker/php-apache-dev/centos-7/Dockerfile | 1 - docker/php-apache-dev/debian-10/Dockerfile | 1 - docker/php-apache-dev/debian-7/Dockerfile | 1 - docker/php-apache-dev/debian-8-php7/Dockerfile | 1 - docker/php-apache-dev/debian-8/Dockerfile | 1 - docker/php-apache-dev/debian-9/Dockerfile | 1 - docker/php-apache-dev/ubuntu-12.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-14.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-15.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-15.10/Dockerfile | 1 - docker/php-apache-dev/ubuntu-16.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-16.10/Dockerfile | 1 - docker/php-apache-dev/ubuntu-17.04/Dockerfile | 1 - docker/php-apache-dev/ubuntu-17.10/Dockerfile | 1 - docker/php-apache-dev/ubuntu-18.04/Dockerfile | 1 - docker/php-apache/5.6/Dockerfile | 1 - docker/php-apache/7.0/Dockerfile | 1 - docker/php-apache/7.1-alpine/Dockerfile | 1 - docker/php-apache/7.1/Dockerfile | 1 - docker/php-apache/7.2-alpine/Dockerfile | 1 - docker/php-apache/7.2/Dockerfile | 1 - docker/php-apache/7.3-alpine/Dockerfile | 1 - docker/php-apache/7.3/Dockerfile | 1 - docker/php-apache/7.4-alpine/Dockerfile | 1 - docker/php-apache/7.4/Dockerfile | 1 - docker/php-apache/8.0-alpine/Dockerfile | 1 - docker/php-apache/8.0/Dockerfile | 1 - docker/php-apache/8.1-alpine/Dockerfile | 1 - docker/php-apache/8.1/Dockerfile | 1 - docker/php-apache/centos-7-php56/Dockerfile | 1 - docker/php-apache/centos-7-php7/Dockerfile | 1 - docker/php-apache/centos-7/Dockerfile | 1 - docker/php-apache/debian-10/Dockerfile | 1 - 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 | 1 - docker/php-apache/ubuntu-12.04/Dockerfile | 1 - docker/php-apache/ubuntu-14.04/Dockerfile | 1 - docker/php-apache/ubuntu-15.04/Dockerfile | 1 - docker/php-apache/ubuntu-15.10/Dockerfile | 1 - docker/php-apache/ubuntu-16.04/Dockerfile | 1 - docker/php-apache/ubuntu-16.10/Dockerfile | 1 - docker/php-apache/ubuntu-17.04/Dockerfile | 1 - docker/php-apache/ubuntu-17.10/Dockerfile | 1 - docker/php-apache/ubuntu-18.04/Dockerfile | 1 - docker/php-dev/5.6/Dockerfile | 1 - docker/php-dev/7.0/Dockerfile | 1 - docker/php-dev/7.1-alpine/Dockerfile | 1 - docker/php-dev/7.1/Dockerfile | 1 - docker/php-dev/7.2-alpine/Dockerfile | 1 - docker/php-dev/7.2/Dockerfile | 1 - docker/php-dev/7.3-alpine/Dockerfile | 1 - docker/php-dev/7.3/Dockerfile | 1 - docker/php-dev/7.4-alpine/Dockerfile | 1 - docker/php-dev/7.4/Dockerfile | 1 - docker/php-dev/8.0-alpine/Dockerfile | 1 - docker/php-dev/8.0/Dockerfile | 1 - docker/php-dev/8.1-alpine/Dockerfile | 1 - docker/php-dev/8.1/Dockerfile | 1 - docker/php-dev/centos-7-php56/Dockerfile | 1 - docker/php-dev/centos-7-php7/Dockerfile | 1 - docker/php-dev/centos-7/Dockerfile | 1 - docker/php-dev/debian-10/Dockerfile | 1 - docker/php-dev/debian-7/Dockerfile | 1 - docker/php-dev/debian-8-php7/Dockerfile | 1 - docker/php-dev/debian-8/Dockerfile | 1 - docker/php-dev/debian-9/Dockerfile | 1 - docker/php-dev/ubuntu-12.04/Dockerfile | 1 - docker/php-dev/ubuntu-14.04/Dockerfile | 1 - docker/php-dev/ubuntu-15.04/Dockerfile | 1 - docker/php-dev/ubuntu-15.10/Dockerfile | 1 - docker/php-dev/ubuntu-16.04/Dockerfile | 1 - docker/php-dev/ubuntu-16.10/Dockerfile | 1 - docker/php-dev/ubuntu-17.04/Dockerfile | 1 - docker/php-dev/ubuntu-17.10/Dockerfile | 1 - docker/php-dev/ubuntu-18.04/Dockerfile | 1 - docker/php-nginx-dev/5.6/Dockerfile | 1 - docker/php-nginx-dev/7.0/Dockerfile | 1 - docker/php-nginx-dev/7.1-alpine/Dockerfile | 1 - docker/php-nginx-dev/7.1/Dockerfile | 1 - docker/php-nginx-dev/7.2-alpine/Dockerfile | 1 - docker/php-nginx-dev/7.2/Dockerfile | 1 - docker/php-nginx-dev/7.3-alpine/Dockerfile | 1 - docker/php-nginx-dev/7.3/Dockerfile | 1 - docker/php-nginx-dev/7.4-alpine/Dockerfile | 1 - docker/php-nginx-dev/7.4/Dockerfile | 1 - docker/php-nginx-dev/8.0-alpine/Dockerfile | 1 - docker/php-nginx-dev/8.0/Dockerfile | 1 - docker/php-nginx-dev/8.1-alpine/Dockerfile | 1 - docker/php-nginx-dev/8.1/Dockerfile | 1 - docker/php-nginx-dev/centos-7-php56/Dockerfile | 1 - docker/php-nginx-dev/centos-7-php7/Dockerfile | 1 - docker/php-nginx-dev/centos-7/Dockerfile | 1 - docker/php-nginx-dev/debian-10/Dockerfile | 1 - docker/php-nginx-dev/debian-7/Dockerfile | 1 - docker/php-nginx-dev/debian-8-php7/Dockerfile | 1 - docker/php-nginx-dev/debian-8/Dockerfile | 1 - docker/php-nginx-dev/debian-9/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-17.04/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-17.10/Dockerfile | 1 - docker/php-nginx-dev/ubuntu-18.04/Dockerfile | 1 - docker/php-nginx/5.6/Dockerfile | 1 - docker/php-nginx/7.0/Dockerfile | 1 - docker/php-nginx/7.1-alpine/Dockerfile | 1 - docker/php-nginx/7.1/Dockerfile | 1 - docker/php-nginx/7.2-alpine/Dockerfile | 1 - docker/php-nginx/7.2/Dockerfile | 1 - docker/php-nginx/7.3-alpine/Dockerfile | 1 - docker/php-nginx/7.3/Dockerfile | 1 - docker/php-nginx/7.4-alpine/Dockerfile | 1 - docker/php-nginx/7.4/Dockerfile | 1 - docker/php-nginx/8.0-alpine/Dockerfile | 1 - docker/php-nginx/8.0/Dockerfile | 1 - docker/php-nginx/8.1-alpine/Dockerfile | 1 - docker/php-nginx/8.1/Dockerfile | 1 - docker/php-nginx/centos-7-php56/Dockerfile | 1 - docker/php-nginx/centos-7-php7/Dockerfile | 1 - docker/php-nginx/centos-7/Dockerfile | 1 - docker/php-nginx/debian-10/Dockerfile | 1 - docker/php-nginx/debian-7/Dockerfile | 1 - docker/php-nginx/debian-8-php7/Dockerfile | 1 - docker/php-nginx/debian-8/Dockerfile | 1 - docker/php-nginx/debian-9/Dockerfile | 1 - docker/php-nginx/ubuntu-12.04/Dockerfile | 1 - docker/php-nginx/ubuntu-14.04/Dockerfile | 1 - docker/php-nginx/ubuntu-15.04/Dockerfile | 1 - docker/php-nginx/ubuntu-15.10/Dockerfile | 1 - docker/php-nginx/ubuntu-16.04/Dockerfile | 1 - docker/php-nginx/ubuntu-16.10/Dockerfile | 1 - docker/php-nginx/ubuntu-17.04/Dockerfile | 1 - docker/php-nginx/ubuntu-17.10/Dockerfile | 1 - docker/php-nginx/ubuntu-18.04/Dockerfile | 1 - docker/php-official/5.6/Dockerfile | 3 --- docker/php-official/7.0/Dockerfile | 3 --- docker/php-official/7.1-alpine/Dockerfile | 3 --- docker/php-official/7.1/Dockerfile | 3 --- docker/php-official/7.2-alpine/Dockerfile | 3 --- docker/php-official/7.2/Dockerfile | 3 --- docker/php-official/7.3-alpine/Dockerfile | 3 --- docker/php-official/7.3/Dockerfile | 3 --- docker/php-official/7.4-alpine/Dockerfile | 3 --- docker/php-official/7.4/Dockerfile | 3 --- docker/php-official/8.0-alpine/Dockerfile | 3 --- docker/php-official/8.0/Dockerfile | 3 --- docker/php-official/8.1-alpine/Dockerfile | 7 +++---- docker/php-official/8.1/Dockerfile | 7 +++---- docker/php/centos-7-php56/Dockerfile | 1 - docker/php/centos-7-php7/Dockerfile | 1 - docker/php/centos-7/Dockerfile | 1 - docker/php/debian-10/Dockerfile | 1 - docker/php/debian-7/Dockerfile | 1 - docker/php/debian-8-php7/Dockerfile | 1 - docker/php/debian-8/Dockerfile | 1 - docker/php/debian-9/Dockerfile | 1 - docker/php/ubuntu-12.04/Dockerfile | 1 - docker/php/ubuntu-14.04/Dockerfile | 1 - docker/php/ubuntu-15.04/Dockerfile | 1 - docker/php/ubuntu-15.10/Dockerfile | 1 - docker/php/ubuntu-16.04/Dockerfile | 1 - docker/php/ubuntu-16.10/Dockerfile | 1 - docker/php/ubuntu-17.04/Dockerfile | 1 - docker/php/ubuntu-17.10/Dockerfile | 1 - docker/php/ubuntu-18.04/Dockerfile | 1 - docker/piwik/latest/Dockerfile | 1 - docker/postfix/latest/Dockerfile | 1 - docker/samson-deployment/latest/Dockerfile | 8 -------- docker/sphinx/latest/Dockerfile | 1 - docker/ssh/latest/Dockerfile | 1 - docker/typo3-solr/5.0/Dockerfile | 1 - docker/typo3-solr/6.0/Dockerfile | 1 - docker/typo3-solr/6.1/Dockerfile | 1 - docker/typo3-solr/6.5/Dockerfile | 1 - docker/typo3-solr/7.0/Dockerfile | 1 - docker/typo3-solr/7.5/Dockerfile | 1 - docker/typo3-solr/8.0/Dockerfile | 1 - docker/typo3-solr/8.1/Dockerfile | 1 - docker/varnish/latest/Dockerfile | 1 - docker/vsftp/latest/Dockerfile | 1 - 302 files changed, 6 insertions(+), 344 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index 946cf415d..bfca256dd 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && apk del python-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 5853f8190..328d46879 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && yum erase -y python-devel \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index e285853b0..b89eee8df 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -34,6 +34,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 896415167..54dd350f2 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -34,6 +34,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index be4829461..24a5861f8 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -34,6 +34,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index a30d5df8f..9122bc984 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index a56ed34cf..1273719e1 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index f8b64b8a4..9880d55e7 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 39e46f2fe..3e86d3271 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 8df58946d..4cebe0f03 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index ae559ef5b..6ed8f46d8 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ libffi-dev \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 4e1701d2c..0f8079a03 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index ca1958491..f33daa1bb 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index e50d15f88..e0132f9f3 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 9077f6e62..df68cbc92 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 05bc517d9..5dc3ea485 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index ecf479a79..818370789 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 3fc7e7833..653187da2 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 8e7ea5299..7fec58aa0 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 848313ee4..222fd7c26 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index cf8b6308f..7fee24627 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 995daf6af..896d40c18 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 736b20eb1..dc72cdcd4 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index 65faac769..97253f08e 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index 74582fc3f..9fa33c68c 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index b90a39137..d8828194f 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -16,7 +16,6 @@ RUN set -x \ \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index 7156203c2..4ac94e8f3 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -32,7 +32,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index e2412f8a8..d2114e822 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index 9155e7e54..17c87444c 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index a3a10ad61..16cdc7e30 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -30,12 +30,10 @@ RUN set -x \ && a2enmod actions fastcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 3535c6178..08e9d0cec 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -29,12 +29,10 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index b929f002c..2dd1dbaeb 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 2da9f5b25..2310116a2 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -31,7 +31,6 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 28f2ff539..5717316bc 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -31,7 +31,6 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index c04df48fa..19c74c604 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 1975e966e..58affe8a7 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 050382bd5..80f987025 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index 0362d4fc1..fe11925dc 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index 702821d28..93fbd35fd 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index 9004a849b..19dd5d97f 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index 61e94944a..7b5c36a63 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index a2a13d5e5..7cbed3fde 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index dbead417a..038d8ed4c 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index fdddefa11..a7b34e291 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 16467c11c..698751a43 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 16e40aaf8..c4b62ee7e 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index c64ace292..08500d3a3 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 5231d9a46..e0652064f 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 34a5f4109..bbf3dde7f 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 9a3ac4eff..efe3060d6 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index e8d77d1b0..dede9f575 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index ecbc3d102..112618dc2 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index e44c91f3a..bb1ff1267 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index 8bb20d03f..9c18dbfa9 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index 7d225fb19..2a62e97bc 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index f29bc579c..048b89a3c 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 9e8130737..14d25ec9a 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index cad12e9ac..0fb7d1e56 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index cf338c27f..0678ce2d7 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index c4adb86df..012c84649 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index e32c36424..f7d41e1fa 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 42eba689f..d089e730e 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 29d9ad433..ec2781487 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 93bdd4da3..ea0b2f835 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 2438d3c6d..f10a3aed5 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index b6e5abba9..006c81e71 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 8d0eed32d..0db46ae6e 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index b26fd52bd..a953091b7 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index c41c6cf66..c7c6c8a46 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index bb392a0c5..3eb1defed 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index 04d7ff470..ebfa46deb 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 14fd316e4..f747b7d66 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && echo 'auth sufficient pam_rootok.so' >> /etc/pam.d/su \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 6d7982802..44437daf4 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -31,6 +31,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 1a24ef8f0..2c9940a79 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -41,6 +41,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 650cf25b5..e0cca2d87 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -36,6 +36,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 4178d4017..6f1b88791 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -41,6 +41,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index fa36cac95..e682ac33a 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -41,6 +41,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 0c4914030..d716373c7 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -36,6 +36,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 92568a6f9..a776d0e8d 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -41,6 +41,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 2325fe087..09abe3305 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -41,6 +41,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index c2d59940e..abb7c2938 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -36,6 +36,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index df04bcddb..fe98ccb0f 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -36,6 +36,5 @@ RUN set -x \ && /usr/local/bin/generate-dockerimage-info \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 48a35456f..68db2fa39 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -24,6 +24,5 @@ RUN set -x \ && pip install certbot \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index a7ac3b338..065f2a7e7 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -36,7 +36,6 @@ RUN apt-install \ && git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \ && cd /tmp/Dockerfile \ && make setup \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index 25abd18c8..2de98787b 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -17,7 +17,6 @@ RUN /usr/local/bin/apt-install \ gstreamer1.0-plugins-good \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 148447c10..360241d1d 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -22,7 +22,6 @@ RUN set -x \ && docker-service enable dovecot \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index 9b1c346e4..eace734c4 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index adc4a57fc..b31ddf252 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index 45630d492..c581ad97e 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 94de7b12d..27a524aa0 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index e5f042721..6ca74b9d3 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index f27d2517b..69613a5d8 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -27,7 +27,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 88095994f..a225e7923 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 6455cb1aa..e62070f25 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 04a83940b..3b5a7f1d1 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index db8e41e44..20877a613 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 22d1cb78b..7549e7519 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 10c56f094..034af14da 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index 1c86ef77d..36e175007 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index 8c13bc394..8b984b7aa 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index eb4d6a48a..2c05bc074 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index 62d894de8..f25fa69e6 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 134edbfcb..61043c239 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1-alpine/Dockerfile b/docker/php-apache-dev/7.1-alpine/Dockerfile index f0de4ede7..5d89a2ed1 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index 94291a3fe..e83c90c2f 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2-alpine/Dockerfile b/docker/php-apache-dev/7.2-alpine/Dockerfile index a961980f8..daf1858fb 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.2/Dockerfile b/docker/php-apache-dev/7.2/Dockerfile index a838906d9..d5090a750 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3-alpine/Dockerfile b/docker/php-apache-dev/7.3-alpine/Dockerfile index 3836e5cba..21119ebf5 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile index 183ab5c96..2082cae70 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4-alpine/Dockerfile b/docker/php-apache-dev/7.4-alpine/Dockerfile index 812dcdf32..c3ad4834b 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/7.4/Dockerfile b/docker/php-apache-dev/7.4/Dockerfile index 276c6981c..864dbd5d8 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 27c3d337f..487467e90 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index dfa15ea3b..fef955002 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index 577ec0044..7926ba2a4 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.1/Dockerfile b/docker/php-apache-dev/8.1/Dockerfile index d31e621c9..51c0c2b45 100644 --- a/docker/php-apache-dev/8.1/Dockerfile +++ b/docker/php-apache-dev/8.1/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 8b54bcdda..4cb5a17ea 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -36,6 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index ec5dccccd..d027cf839 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -36,6 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 364a725d2..fc445aaed 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -37,6 +37,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-10/Dockerfile b/docker/php-apache-dev/debian-10/Dockerfile index 228dc7f60..e51d93c2a 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index d834c8a75..94cf54939 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 263d3f7da..847b89413 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 2d76a5694..de70a7351 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index a79461141..e041e8f55 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index fae7740da..4eb976513 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 7d6ee8fa2..63841e831 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 2c4658a62..b517ece03 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index dd9a7f575..04fc6a5f3 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 64198f12a..1691faf2f 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index e334e42de..d6d4ccd7c 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.04/Dockerfile b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index 7f17fb22a..8f6c82494 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-17.10/Dockerfile b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index 39ecf90da..84a8a3204 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/ubuntu-18.04/Dockerfile b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index 643df03e5..1665f8303 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index 6f49e52f2..8b7d213dd 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index dbb1bd0ea..d4e182b6a 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index 4751384ce..ac7c0b7ad 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index a7af7a827..31bb14492 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index fbc52889d..45eb7ef64 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index c06e4a628..922d5d5da 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index b767c7690..8ddb6b4a4 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index c518a9622..9b906ead2 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index 34718b618..95b349d1b 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index 26bcdb1c7..51e4993ad 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 418a35df9..63fccc090 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -33,7 +33,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index 22f27e91e..77d3282c5 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile index 52375d32c..dd0f4913a 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile +++ b/docker/php-apache/8.1-alpine/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ ' /etc/apache2/httpd.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/8.1/Dockerfile b/docker/php-apache/8.1/Dockerfile index 7e7f6db5a..94b7781d3 100644 --- a/docker/php-apache/8.1/Dockerfile +++ b/docker/php-apache/8.1/Dockerfile @@ -26,7 +26,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 9203cae4d..ab6598c77 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 0e6805dde..869d016e1 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 831c34057..c9ac5e070 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index 30d066e36..d2bf8d581 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 14f69c315..4649facf8 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -31,12 +31,10 @@ RUN set -x \ && a2enmod actions fastcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index b96ca0400..545c3433d 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -30,12 +30,10 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 9e5875a08..b32b076c4 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -30,12 +30,10 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 9f9e8300b..fea96be26 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -29,7 +29,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index e927f9c11..db7e27da6 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -32,7 +32,6 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 2b857605f..ce1d1123f 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -32,7 +32,6 @@ RUN set -x \ && mkdir -p /var/lock/apache2 \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index fe6990d5e..de302ca63 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 6b7a6573c..c076f8dae 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 8cfc0d0d7..1872cad33 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index a2ee76c56..dfd217899 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index 7f736bd69..608a41685 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index 41baa7161..a85cc5b49 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index cb4ef71ee..af5588097 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -30,7 +30,6 @@ RUN set -x \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index 837ef0eef..18f72fb17 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 36e057929..e787a1f81 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index 69141b4c8..4358df8b6 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -34,6 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 11a1840b2..5d8d5cdef 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index 5e95d8454..1162c753c 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -34,6 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index a46bad5fe..1bcba2454 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index e49727e20..dc86a34f1 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -34,6 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 3dd9df287..161536a68 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index 9b7706b21..c210d4892 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -34,6 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 7a0860ff6..d9edf3795 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 6443ba41b..25728db92 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -34,6 +34,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 5e98bc98d..4150a696e 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index 17a0933f3..1d92cb165 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.1/Dockerfile b/docker/php-dev/8.1/Dockerfile index ff78a3f50..c8ac8dc3c 100644 --- a/docker/php-dev/8.1/Dockerfile +++ b/docker/php-dev/8.1/Dockerfile @@ -17,6 +17,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index f5612c20a..8577440b8 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -28,6 +28,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index 142d2176b..e5d70d0a6 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -28,6 +28,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index efbb9c432..7aeaf786c 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -29,6 +29,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index 3b876a42a..7e1e07e32 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 09544d01d..81dcdcfbe 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 91011552c..00073771e 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index cec07fe63..3fc5d447b 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 58f7c456a..2b570afac 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 9f6c1d13e..4418c41d3 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 96f65d150..ec323385f 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index afd337406..7f4cfffe8 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index f98836760..e5ddbd62c 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 1e3264c51..d90450b3f 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 398561085..775ca2af8 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index a9113a1d7..e8964facb 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index dde1ba454..1b53f0c6d 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index 4f92b366d..22ec4e5cd 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -32,6 +32,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index a3c288c47..1b17604ec 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index cc59aee47..dd26eadfe 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1-alpine/Dockerfile b/docker/php-nginx-dev/7.1-alpine/Dockerfile index a1d631fb8..2c389fe99 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 138294fad..1c47638a3 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2-alpine/Dockerfile b/docker/php-nginx-dev/7.2-alpine/Dockerfile index e12b6b527..9bb40133f 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.2/Dockerfile b/docker/php-nginx-dev/7.2/Dockerfile index cd01db045..c94f994b7 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3-alpine/Dockerfile b/docker/php-nginx-dev/7.3-alpine/Dockerfile index 782ebdb4f..277ada141 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile index fb5a82ff5..5f00a59aa 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4-alpine/Dockerfile b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 285f5d6e5..570c6d5c5 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/7.4/Dockerfile b/docker/php-nginx-dev/7.4/Dockerfile index b0729bd79..3035c7e3e 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index da107583c..477c1bbe1 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -42,6 +42,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index daaf3b653..0601a92dd 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index 8ee243f08..a9ea990a3 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -33,6 +33,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.1/Dockerfile b/docker/php-nginx-dev/8.1/Dockerfile index ff6216d4e..0a90bdc68 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile +++ b/docker/php-nginx-dev/8.1/Dockerfile @@ -25,6 +25,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index dd7a24aee..db79ec198 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -36,6 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index f72d80728..d4e5a894c 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -36,6 +36,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 490320330..ac210a4c8 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -37,6 +37,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-10/Dockerfile b/docker/php-nginx-dev/debian-10/Dockerfile index e124f890b..be2076355 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 5f4dd8cb6..b1bcf499d 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -40,7 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 9ba4d7ea3..3dda33557 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 78b71193e..a96eb630a 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index 18ac9bd95..0ab467869 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 5a443c75a..c43c19253 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -40,7 +40,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index b3580e7ba..ea341f4c2 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index cf8c4dbf2..4fb54b414 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 5b4ed6c7c..4aef07cb5 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 80cc37627..d28830fec 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 9bccbe06a..9fc47bb9a 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index 7d1219242..2201e4467 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index 7056bcd1d..6265552bf 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index 2cb9845ba..f9ff549c8 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -40,6 +40,5 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index d2d42ae98..41ae10d7e 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index 13e717c69..29d05e2fa 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.1-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index 6ee3360df..2cb41a21e 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 9994fe28b..0ecdee98d 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.2-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index 9c062460e..0c4f77caf 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index 2a547da15..25b7e468c 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.3-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index da968f048..41fd7a4fb 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index 6645b42f3..f17b06996 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.4-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index 8c67581c5..43766c0ff 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index 2632e3609..1243f5a75 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index c140b116b..7c97c116c 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index f834ad331..b5c8d35d8 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile index 577ae8027..9ffbec691 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile +++ b/docker/php-nginx/8.1-alpine/Dockerfile @@ -21,7 +21,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/8.1/Dockerfile b/docker/php-nginx/8.1/Dockerfile index 590b09a1f..54ff56372 100644 --- a/docker/php-nginx/8.1/Dockerfile +++ b/docker/php-nginx/8.1/Dockerfile @@ -25,7 +25,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index c189e1c0e..9ed1c7a4b 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index a1ed95cd0..a0e7923b4 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 00bce439b..cd12b3f9b 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index 9a4f58527..2bd9ec818 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 4f082dacb..21d1b85d1 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 4c0374a69..f32a5585f 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 975d47e27..e61ea959b 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 75f5352bf..471255e2e 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 171345276..2c6fb9ef1 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 9add0a8b4..9b8691258 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 6713c6a35..5c8184473 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 043139c75..7aa54217b 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index ab1a5eabd..55cb6b8e2 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 2fbc020b6..372729739 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index b879393c0..d584ea747 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index 8a346b2c5..753774015 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index cc288981c..c2906e8fa 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ nginx \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index e367ce679..999fef8a2 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -63,7 +63,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -83,7 +82,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -216,7 +214,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index e0f61e7dc..2f99a93dc 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -63,7 +63,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -83,7 +82,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -221,7 +219,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index fe36228da..ead7e938e 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -66,7 +66,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -87,7 +86,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -238,7 +236,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index eade0b64e..1ac17334c 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -63,7 +63,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -83,7 +82,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -221,7 +219,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index 557cfde39..91ae45e90 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -66,7 +66,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -87,7 +86,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -242,7 +240,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index b55531846..add9f5bca 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -63,7 +63,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -83,7 +82,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -220,7 +218,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index 39e27325b..f1f3fc471 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -66,7 +66,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -87,7 +86,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -242,7 +240,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index fd8b782d8..572924673 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -63,7 +63,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -83,7 +82,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -220,7 +218,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 7cc7c5197..9753c9b8b 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -66,7 +66,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -87,7 +86,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -245,7 +243,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index b2320976f..6b2654b51 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -63,7 +63,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -83,7 +82,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -219,7 +217,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index fd7193b8c..a576a2908 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -66,7 +66,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -87,7 +86,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -244,7 +242,6 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 9f121ae01..fb52d98b5 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -63,7 +63,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -83,7 +82,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -219,7 +217,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 816372f1d..b62d168ba 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -3,9 +3,11 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - FROM php:8.1-fpm-alpine +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -64,7 +66,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -85,7 +86,6 @@ RUN set -x \ git \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -242,7 +242,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 7088562de..7e1e0957b 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -3,9 +3,11 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ - FROM php:8.1-fpm-buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -61,7 +63,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -81,7 +82,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -216,7 +216,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 08c17ea84..62504d46e 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -66,7 +66,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index b5b8433eb..cd4826359 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -70,7 +70,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index b27e49bd9..0f7481ef9 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -71,7 +71,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile index 27b35f982..10579b185 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -67,7 +67,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 13f2b5ed2..152a0b73a 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -60,7 +60,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 755d4653f..c18231cb5 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -78,7 +78,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 1849b25d1..7c8f39f7e 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -61,7 +61,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 1695e07ab..8513c2269 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 36c17b982..fe5be1816 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -61,7 +61,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index e35e6bb20..dff0b910f 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -62,7 +62,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 8b423415b..94bd3d081 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -62,7 +62,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index c67750502..ce69655ed 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -62,7 +62,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index c8e2768ba..3ae6b3900 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index bf32b62aa..5493aec93 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile index 575536198..15b5fcb59 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile index a4ff90672..1614f8d02 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -69,7 +69,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php/ubuntu-18.04/Dockerfile b/docker/php/ubuntu-18.04/Dockerfile index 3b624f907..a0931972b 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -68,7 +68,6 @@ RUN set -x \ && docker-service enable cron \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index 1c62ed2f8..e5ff70d45 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -23,7 +23,6 @@ RUN set -x \ && find /app/ -type f -exec chmod 0644 {} \; \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 0e7786d89..df2c2db2d 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -15,7 +15,6 @@ RUN set -x \ && docker-service enable postfix \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 7e6ffd4be..a0caa3cd5 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -44,7 +44,6 @@ RUN set -x \ ca-certificates \ locales \ gnupg \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -78,7 +77,6 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -95,7 +93,6 @@ RUN set -x \ && chmod +s /sbin/gosu \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -119,7 +116,6 @@ RUN set -x \ && /usr/local/bin/generate-locales \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -159,7 +155,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \ ## Enable ansible for deployment user && chmod 755 /usr/local/bin/ansible* \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -170,7 +165,6 @@ RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \ && npm install -g grunt-cli \ && npm install -g bower \ && npm install -g npm-cache \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -188,7 +182,6 @@ RUN set -x \ && chmod +x /usr/local/bin/dep \ # Deployer: capistrano (http://capistranorb.com/) && gem install capistrano \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup @@ -204,7 +197,6 @@ RUN rake assets:precompile \ && /opt/docker/bin/bootstrap.sh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 1a77e4ee2..d8b030d10 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -37,6 +37,5 @@ RUN set -x \ && pip install t3targets \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 53fd64782..0ac10e2b1 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -12,7 +12,6 @@ RUN set -x \ && docker-service enable ssh \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index f9ac2209c..44db92838 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -40,7 +40,6 @@ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && mkdir -p /opt/solr/server/solr/data \ && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ && chown -R solr:solr /opt/solr/server/solr/ \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index c71a97c2f..b957f5da7 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -37,7 +37,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 5be406531..8a55445ed 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -37,7 +37,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 4db910502..233bf3e8b 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -37,7 +37,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 0ab29b97b..40c1088ae 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -37,7 +37,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index 585235639..1f5a2fdf4 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -37,7 +37,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index 2db9e6285..28a7be3ca 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -37,7 +37,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 880af2a23..6b6dc223e 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -37,7 +37,6 @@ RUN apt-update \ && chown -R solr:solr /opt/solr/server/solr \ && chmod 755 /opt/solr/server/solr \ && rm -rf /tmp/solr \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 7eae95085..275a2242a 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -24,7 +24,6 @@ RUN set -x \ varnish \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index ca567cbad..24d978576 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -26,7 +26,6 @@ RUN set -x \ /var/log/supervisor \ && docker-arch-info $BUILDARCH $TARGETARCH \ && docker-run-bootstrap \ - && docker-arch-info $TARGETARCH \ && docker-image-cleanup From 6a976482c4b3a2d6c00fcec39ba2b75cab3024a1 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Fri, 2 Dec 2022 09:59:23 -0800 Subject: [PATCH 108/123] feat: install xmlrpc rc3 for 8.1 --- docker/php-official/8.1-alpine/Dockerfile | 1 + template/Dockerfile/images/php.jinja2 | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index b62d168ba..ec78740d1 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -197,6 +197,7 @@ RUN set -x \ && pecl install yaml \ && pecl install redis \ && pecl install mongodb \ + && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ vips \ diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 4e06a6215..fb78bca89 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -313,9 +313,7 @@ && pecl install yaml \ && pecl install redis \ && pecl install mongodb \ - {%- if version != '8.1' %} && pecl install xmlrpc-1.0.0RC3 \ - {%- endif %} && docker-php-ext-enable \ apcu \ vips \ From 3c65c36e4dd6dbe859ceccaddf08b978a731a8b2 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 23 Mar 2023 15:19:29 -0700 Subject: [PATCH 109/123] chore: activate github action workflow on port-php8.2 branch --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cef4ad2c7..2e5fac496 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,7 +4,7 @@ on: push: branches: - 'main' - - 'port-php8.1' + - 'port-php8.2' concurrency: group: "${{ github.ref }}" From 28d0a7e7fd676afadfdbd1da81094af4e1e60b97 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 27 Mar 2023 13:31:46 -0700 Subject: [PATCH 110/123] feat: update php 8.1 and 8.2 images with our prefix --- docker/php-apache-dev/8.1-alpine/Dockerfile | 2 +- docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache-dev/8.1/Dockerfile | 2 +- docker/php-apache-dev/8.1/Dockerfile.jinja2 | 2 +- docker/php-apache-dev/8.2-alpine/Dockerfile | 2 +- docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache-dev/8.2/Dockerfile | 2 +- docker/php-apache-dev/8.2/Dockerfile.jinja2 | 2 +- docker/php-apache/8.1-alpine/Dockerfile | 2 +- docker/php-apache/8.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache/8.1/Dockerfile | 2 +- docker/php-apache/8.1/Dockerfile.jinja2 | 2 +- docker/php-apache/8.2-alpine/Dockerfile | 2 +- docker/php-apache/8.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-apache/8.2/Dockerfile | 2 +- docker/php-apache/8.2/Dockerfile.jinja2 | 2 +- docker/php-dev/8.1-alpine/Dockerfile | 2 +- docker/php-dev/8.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-dev/8.1/Dockerfile | 2 +- docker/php-dev/8.1/Dockerfile.jinja2 | 2 +- docker/php-dev/8.2-alpine/Dockerfile | 2 +- docker/php-dev/8.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-dev/8.2/Dockerfile | 2 +- docker/php-dev/8.2/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/8.1-alpine/Dockerfile | 2 +- docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/8.1/Dockerfile | 2 +- docker/php-nginx-dev/8.1/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/8.2-alpine/Dockerfile | 2 +- docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/8.2/Dockerfile | 2 +- docker/php-nginx-dev/8.2/Dockerfile.jinja2 | 2 +- docker/php-nginx/8.1-alpine/Dockerfile | 2 +- docker/php-nginx/8.1-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx/8.1/Dockerfile | 2 +- docker/php-nginx/8.1/Dockerfile.jinja2 | 2 +- docker/php-nginx/8.2-alpine/Dockerfile | 2 +- docker/php-nginx/8.2-alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx/8.2/Dockerfile | 2 +- docker/php-nginx/8.2/Dockerfile.jinja2 | 2 +- docker/php-official/8.1/Dockerfile | 5 +++++ 41 files changed, 45 insertions(+), 40 deletions(-) diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index a073c59c8..e0a7ad0a1 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 index 7abed43e5..3eb89438d 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-apache", "8.1-alpine") }} +{{ docker.from("php-apache", "8.1-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/8.1/Dockerfile b/docker/php-apache-dev/8.1/Dockerfile index 406df8bf1..cc6a69295 100644 --- a/docker/php-apache-dev/8.1/Dockerfile +++ b/docker/php-apache-dev/8.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.1 +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/8.1/Dockerfile.jinja2 b/docker/php-apache-dev/8.1/Dockerfile.jinja2 index 797fe355c..ce6a8e029 100644 --- a/docker/php-apache-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.1/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-apache", "8.1") }} +{{ docker.from("php-apache", "8.1", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile b/docker/php-apache-dev/8.2-alpine/Dockerfile index 1f24c8f86..9f4eb7452 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 index 8277c3a77..370839351 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-apache", "8.2-alpine") }} +{{ docker.from("php-apache", "8.2-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/8.2/Dockerfile b/docker/php-apache-dev/8.2/Dockerfile index 2fa2c20c0..5086246dd 100644 --- a/docker/php-apache-dev/8.2/Dockerfile +++ b/docker/php-apache-dev/8.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.2 +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/8.2/Dockerfile.jinja2 b/docker/php-apache-dev/8.2/Dockerfile.jinja2 index 90a2b69c5..352f88cb7 100644 --- a/docker/php-apache-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.2/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-apache", "8.2") }} +{{ docker.from("php-apache", "8.2", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile index dd0f4913a..0a9e318db 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile +++ b/docker/php-apache/8.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 index 11c65544c..24b503815 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.1-alpine") }} +{{ docker.from("php", "8.1-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.1/Dockerfile b/docker/php-apache/8.1/Dockerfile index 94b7781d3..67149d7a3 100644 --- a/docker/php-apache/8.1/Dockerfile +++ b/docker/php-apache/8.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1 +FROM ghcr.io/cocoastorm/webdevops/php:8.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/8.1/Dockerfile.jinja2 b/docker/php-apache/8.1/Dockerfile.jinja2 index d8302f97f..8fd009574 100644 --- a/docker/php-apache/8.1/Dockerfile.jinja2 +++ b/docker/php-apache/8.1/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.1") }} +{{ docker.from("php", "8.1", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.2-alpine/Dockerfile b/docker/php-apache/8.2-alpine/Dockerfile index daf0ab7ac..0fc174b7a 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile +++ b/docker/php-apache/8.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 index c358fef80..cf9a81630 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.2-alpine") }} +{{ docker.from("php", "8.2-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.2/Dockerfile b/docker/php-apache/8.2/Dockerfile index 3d7b078c2..fb149715b 100644 --- a/docker/php-apache/8.2/Dockerfile +++ b/docker/php-apache/8.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2 +FROM ghcr.io/cocoastorm/webdevops/php:8.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/8.2/Dockerfile.jinja2 b/docker/php-apache/8.2/Dockerfile.jinja2 index 5542d2e07..f975279e0 100644 --- a/docker/php-apache/8.2/Dockerfile.jinja2 +++ b/docker/php-apache/8.2/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.2") }} +{{ docker.from("php", "8.2", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index 3bff4e5a8..aab68ab41 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 index 1357fad41..79949f1fa 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.1-alpine") }} +{{ docker.from("php", "8.1-alpine", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.1/Dockerfile b/docker/php-dev/8.1/Dockerfile index 047f161be..04f5830b1 100644 --- a/docker/php-dev/8.1/Dockerfile +++ b/docker/php-dev/8.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1 +FROM ghcr.io/cocoastorm/webdevops/php:8.1 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/8.1/Dockerfile.jinja2 b/docker/php-dev/8.1/Dockerfile.jinja2 index f216cf16d..b485d0d81 100644 --- a/docker/php-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-dev/8.1/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.1") }} +{{ docker.from("php", "8.1", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.2-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile index 456c61faa..70a0d56dc 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile +++ b/docker/php-dev/8.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 index 1e8ba3c32..73ac998dc 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.2-alpine") }} +{{ docker.from("php", "8.2-alpine", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.2/Dockerfile b/docker/php-dev/8.2/Dockerfile index 6e077b3c1..641a483cf 100644 --- a/docker/php-dev/8.2/Dockerfile +++ b/docker/php-dev/8.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2 +FROM ghcr.io/cocoastorm/webdevops/php:8.2 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/8.2/Dockerfile.jinja2 b/docker/php-dev/8.2/Dockerfile.jinja2 index 7a18a592b..3a1ce7cae 100644 --- a/docker/php-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-dev/8.2/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.2") }} +{{ docker.from("php", "8.2", user) }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index b0f33ca72..ee1f26dc5 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 index d3bd5d756..52e3228e8 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-nginx", "8.1-alpine") }} +{{ docker.from("php-nginx", "8.1-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/8.1/Dockerfile b/docker/php-nginx-dev/8.1/Dockerfile index b7a5b89d5..69283d3ed 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile +++ b/docker/php-nginx-dev/8.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.1 +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 index 29b063c47..2426f464f 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-nginx", "8.1") }} +{{ docker.from("php-nginx", "8.1", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile b/docker/php-nginx-dev/8.2-alpine/Dockerfile index 6b61a4c84..8734c938f 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 index e2a5982ff..e0af1ded7 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-nginx", "8.2-alpine") }} +{{ docker.from("php-nginx", "8.2-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/8.2/Dockerfile b/docker/php-nginx-dev/8.2/Dockerfile index 71432b5c9..b259f3585 100644 --- a/docker/php-nginx-dev/8.2/Dockerfile +++ b/docker/php-nginx-dev/8.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.2 +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/8.2/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2/Dockerfile.jinja2 index 073b58cc7..44ccc4af5 100644 --- a/docker/php-nginx-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.2/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-nginx", "8.2") }} +{{ docker.from("php-nginx", "8.2", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile index 9ffbec691..205a06e05 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile +++ b/docker/php-nginx/8.1-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 index 35b37682f..b4dda70cf 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.1-alpine") }} +{{ docker.from("php", "8.1-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.1/Dockerfile b/docker/php-nginx/8.1/Dockerfile index 54ff56372..72572f7a5 100644 --- a/docker/php-nginx/8.1/Dockerfile +++ b/docker/php-nginx/8.1/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1 +FROM ghcr.io/cocoastorm/webdevops/php:8.1 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/8.1/Dockerfile.jinja2 b/docker/php-nginx/8.1/Dockerfile.jinja2 index 4c3912db2..15d7fa07d 100644 --- a/docker/php-nginx/8.1/Dockerfile.jinja2 +++ b/docker/php-nginx/8.1/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.1") }} +{{ docker.from("php", "8.1", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.2-alpine/Dockerfile b/docker/php-nginx/8.2-alpine/Dockerfile index 3d437e61d..d17221a22 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile +++ b/docker/php-nginx/8.2-alpine/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 index 63235633a..6817f9253 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.2-alpine") }} +{{ docker.from("php", "8.2-alpine", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.2/Dockerfile b/docker/php-nginx/8.2/Dockerfile index 1444f3454..198009805 100644 --- a/docker/php-nginx/8.2/Dockerfile +++ b/docker/php-nginx/8.2/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2 +FROM ghcr.io/cocoastorm/webdevops/php:8.2 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/8.2/Dockerfile.jinja2 b/docker/php-nginx/8.2/Dockerfile.jinja2 index 14e0efc61..82879b77f 100644 --- a/docker/php-nginx/8.2/Dockerfile.jinja2 +++ b/docker/php-nginx/8.2/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "8.2") }} +{{ docker.from("php", "8.2", user) }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 7ddb6c002..220881ed1 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -3,10 +3,15 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ +<<<<<<< HEAD FROM php:8.1-fpm-buster ARG BUILDARCH ARG TARGETARCH +======= + +FROM php:8.1-fpm-buster +>>>>>>> upstream/php-ci LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ From a54c8ca368e1cc741610267488adcd9af5c8c0c9 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 27 Mar 2023 13:34:57 -0700 Subject: [PATCH 111/123] feat: should_ignore is part of the class --- bin/webdevops/DockerfileFilter.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bin/webdevops/DockerfileFilter.py b/bin/webdevops/DockerfileFilter.py index 76201951e..51ea95abd 100644 --- a/bin/webdevops/DockerfileFilter.py +++ b/bin/webdevops/DockerfileFilter.py @@ -3,12 +3,6 @@ import json -def should_be_ignored(name, ignore_list): - for ignore_term in ignore_list: - if ignore_term in name: - return True - return False - class MatrixBuilder(): cache = {} @@ -28,6 +22,13 @@ def __init__(self, dockerfile_blocks, my_image_prefix="webdevops"): self.image_prefix = my_image_prefix self.dockerfile_blocks = dockerfile_blocks + def should_ignore(self, name): + for term in self.ignore: + if term in name: + return True + + return False + def __add_to_cache(self, dockerfile_block): image_name = dockerfile_block['image']['fullname'] self.cache[image_name] = dockerfile_block @@ -36,7 +37,7 @@ def __add_to_base_images_list(self, dockerfile_block): dockerfile_image = dockerfile_block['image'] image_from = dockerfile_image['from'] - if self.image_prefix in image_from and should_be_ignored(image_from, self.ignore): + if self.image_prefix in image_from and self.should_ignore(image_from): self.base_images.append(dockerfile_block) def __add_to_dependency_graph(self, dockerfile_block): @@ -49,7 +50,7 @@ def __add_to_dependency_graph(self, dockerfile_block): if self.image_prefix not in image_from: return - if should_be_ignored(image_from, self.ignore): + if self.should_ignore(image_from): return image_deps = [dockerfile_image['from']] @@ -60,7 +61,7 @@ def __add_to_dependency_graph(self, dockerfile_block): self.__add_to_cache(dockerfile_block) for image_dep in image_deps: - if should_be_ignored(image_dep, self.ignore): + if self.should_ignore(image_dep): continue graph_list = self.graph.get(image_dep) From 269132b00f8cc1e10e4a7c2aa0e6dbb2d7b80ed5 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 27 Mar 2023 13:35:33 -0700 Subject: [PATCH 112/123] feat: migrate to using GITHUB_OUTPUT instead --- .../generate_gh_action_matrix_command.py | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index 936eab460..c7388ea34 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import base64 import json import os import sys @@ -74,11 +75,7 @@ def run_task(self, configuration): # matrix: base images base_images = [self.process_dockerfile(file) for file in matrix.get_base_images()] output_base_file = os.path.join(output_path, 'gh_matrix-base-images.json') - - self.line("\n\n") - base_matrix = self.fmt_github_output("matrix-base", json.dumps(base_images)) - print(base_matrix) - self.line("\n\n") + self.fmt_github_output("matrix-base", json.dumps(base_images)) with open(output_base_file, 'w') as f: json.dump(base_images, f, indent=2) @@ -86,11 +83,7 @@ def run_task(self, configuration): # matrix: multiservice images multiservice_images = [self.process_dockerfile(file) for file in matrix.get_multiservice_images()] output_multiservice_file = os.path.join(output_path, 'gh_matrix-multiservice-images.json') - - self.line("\n\n") - multi_matrix = self.fmt_github_output("matrix-multi", json.dumps(multiservice_images)) - print(multi_matrix) - self.line("\n\n") + self.fmt_github_output("matrix-multi", json.dumps(multiservice_images)) with open(output_multiservice_file, 'w') as fm: json.dump(multiservice_images, fm, indent=2) @@ -98,23 +91,22 @@ def run_task(self, configuration): # matrix: development images development_images = [self.process_dockerfile(file) for file in matrix.get_development_images()] output_development_file = os.path.join(output_path, 'gh_matrix-development-images.json') - - self.line("\n\n") - dev_matrix = self.fmt_github_output("matrix-dev", json.dumps(development_images)) - print(dev_matrix) - self.line("\n\n") + self.fmt_github_output("matrix-dev", json.dumps(development_images)) with open(output_development_file, 'w') as fd: json.dump(development_images, fd, indent=2) - def fmt_github_output(self, name, output): - text = output - - text = text.replace("%", "%25") - text = text.replace("\n", "%0A") - text = text.replace("\r", "%0D") - - return "::set-output name=%s::%s" % (name, text) + def fmt_github_output(self, name, value): + eof = os.environ['EOF'] + + if eof is None: + urandom = os.urandom(15) + eof = base64.b64encode(urandom).decode('ascii') + + with open(os.environ['GITHUB_OUTPUT'], 'a') as fh: + print(f'{name}<<{eof}', file=fh) + print(value, file=fh) + print(eof, file=fh) def fmt_tags(self, image, tag): if self.image_user: From 2a561a46ea87176ad6b733a771fa381016c55368 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 27 Mar 2023 13:36:24 -0700 Subject: [PATCH 113/123] feat: only build php 8.2 images for now --- .github/workflows/docker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2e5fac496..d2890ee79 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -63,7 +63,9 @@ jobs: - name: Generate Matrix id: generate-matrix - run: python bin/console generate:gh-action-matrix --whitelist='php*/8.*/*' --blacklist='php-official/*/**' + run: | + EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) + python bin/console generate:gh-action-matrix --whitelist='php*/8.2*/*' --blacklist='php-official/*/**' build-base-images: needs: From 63944dc43e6f42569d0095a3ee7a2d8cf7e90e2a Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 27 Mar 2023 14:00:10 -0700 Subject: [PATCH 114/123] fix: remove extraneous symlink --- docker/php-official/8.1/8.1 | 1 - 1 file changed, 1 deletion(-) delete mode 120000 docker/php-official/8.1/8.1 diff --git a/docker/php-official/8.1/8.1 b/docker/php-official/8.1/8.1 deleted file mode 120000 index 8d1eec65a..000000000 --- a/docker/php-official/8.1/8.1 +++ /dev/null @@ -1 +0,0 @@ -8.1 \ No newline at end of file From 9c961662c22522e199b5fb979f5f740c01131749 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Mon, 27 Mar 2023 16:05:29 -0700 Subject: [PATCH 115/123] fix: temp workaround for $EOF --- bin/command/generate_gh_action_matrix_command.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/command/generate_gh_action_matrix_command.py b/bin/command/generate_gh_action_matrix_command.py index c7388ea34..d9d7af38a 100644 --- a/bin/command/generate_gh_action_matrix_command.py +++ b/bin/command/generate_gh_action_matrix_command.py @@ -97,7 +97,7 @@ def run_task(self, configuration): json.dump(development_images, fd, indent=2) def fmt_github_output(self, name, value): - eof = os.environ['EOF'] + eof = os.getenv('EOF') if eof is None: urandom = os.urandom(15) From ade0e812f7ac42970739cda6c5a48e8fbf4ac31f Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 28 Mar 2023 10:46:21 -0700 Subject: [PATCH 116/123] feat: add missing platform args in dockerfile jinja2 templates --- docker/php-apache-dev/8.1-alpine/Dockerfile | 3 +++ docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/8.1/Dockerfile | 3 +++ docker/php-apache-dev/8.1/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/8.2-alpine/Dockerfile | 3 +++ docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache-dev/8.2/Dockerfile | 3 +++ docker/php-apache-dev/8.2/Dockerfile.jinja2 | 2 ++ docker/php-apache/8.1-alpine/Dockerfile | 3 +++ docker/php-apache/8.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-apache/8.1/Dockerfile | 3 +++ docker/php-apache/8.1/Dockerfile.jinja2 | 2 ++ docker/php-apache/8.2/Dockerfile | 3 +++ docker/php-apache/8.2/Dockerfile.jinja2 | 2 ++ docker/php-dev/8.1-alpine/Dockerfile | 3 +++ docker/php-dev/8.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-dev/8.1/Dockerfile | 3 +++ docker/php-dev/8.1/Dockerfile.jinja2 | 2 ++ docker/php-dev/8.2-alpine/Dockerfile | 3 +++ docker/php-dev/8.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-dev/8.2/Dockerfile | 3 +++ docker/php-dev/8.2/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/8.1-alpine/Dockerfile | 3 +++ docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/8.1/Dockerfile | 3 +++ docker/php-nginx-dev/8.1/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/8.2-alpine/Dockerfile | 3 +++ docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx-dev/8.2/Dockerfile | 3 +++ docker/php-nginx-dev/8.2/Dockerfile.jinja2 | 2 ++ docker/php-nginx/8.1-alpine/Dockerfile | 3 +++ docker/php-nginx/8.1-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx/8.1/Dockerfile | 3 +++ docker/php-nginx/8.1/Dockerfile.jinja2 | 2 ++ docker/php-nginx/8.2-alpine/Dockerfile | 3 +++ docker/php-nginx/8.2-alpine/Dockerfile.jinja2 | 2 ++ docker/php-nginx/8.2/Dockerfile | 3 +++ docker/php-nginx/8.2/Dockerfile.jinja2 | 2 ++ docker/php-official/8.1/Dockerfile | 6 +----- docker/php-official/8.1/Dockerfile.jinja2 | 6 +----- docker/php-official/8.2-alpine/Dockerfile | 7 +++++-- docker/php-official/8.2-alpine/Dockerfile.jinja2 | 4 +++- docker/php-official/8.2/Dockerfile | 3 +++ docker/php-official/8.2/Dockerfile.jinja2 | 2 ++ 44 files changed, 110 insertions(+), 13 deletions(-) diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index e0a7ad0a1..c19a14366 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php-apache:8.1-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 index 3eb89438d..26125e1cc 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "8.1-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/8.1/Dockerfile b/docker/php-apache-dev/8.1/Dockerfile index cc6a69295..cd237470f 100644 --- a/docker/php-apache-dev/8.1/Dockerfile +++ b/docker/php-apache-dev/8.1/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php-apache:8.1 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/8.1/Dockerfile.jinja2 b/docker/php-apache-dev/8.1/Dockerfile.jinja2 index ce6a8e029..765f7d051 100644 --- a/docker/php-apache-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "8.1", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile b/docker/php-apache-dev/8.2-alpine/Dockerfile index 9f4eb7452..20f4e61aa 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php-apache:8.2-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 index 370839351..e6fd7ac4d 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "8.2-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/8.2/Dockerfile b/docker/php-apache-dev/8.2/Dockerfile index 5086246dd..ff7d85677 100644 --- a/docker/php-apache-dev/8.2/Dockerfile +++ b/docker/php-apache-dev/8.2/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php-apache:8.2 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache-dev/8.2/Dockerfile.jinja2 b/docker/php-apache-dev/8.2/Dockerfile.jinja2 index 352f88cb7..386b3ab07 100644 --- a/docker/php-apache-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-apache", "8.2", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile index 0a9e318db..fb45517b0 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile +++ b/docker/php-apache/8.1-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 index 24b503815..cbbbbe4e9 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.1-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.1/Dockerfile b/docker/php-apache/8.1/Dockerfile index 67149d7a3..a1e54f706 100644 --- a/docker/php-apache/8.1/Dockerfile +++ b/docker/php-apache/8.1/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.1 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/8.1/Dockerfile.jinja2 b/docker/php-apache/8.1/Dockerfile.jinja2 index 8fd009574..f30906e96 100644 --- a/docker/php-apache/8.1/Dockerfile.jinja2 +++ b/docker/php-apache/8.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.1", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.2/Dockerfile b/docker/php-apache/8.2/Dockerfile index fb149715b..2a99956bd 100644 --- a/docker/php-apache/8.2/Dockerfile +++ b/docker/php-apache/8.2/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.2 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/8.2/Dockerfile.jinja2 b/docker/php-apache/8.2/Dockerfile.jinja2 index f975279e0..d78ad0c6c 100644 --- a/docker/php-apache/8.2/Dockerfile.jinja2 +++ b/docker/php-apache/8.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.2", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index aab68ab41..1cb6cba92 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine +ARG BUILDARCH +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 index 79949f1fa..91c2bed53 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.1-alpine", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/8.1/Dockerfile b/docker/php-dev/8.1/Dockerfile index 04f5830b1..c68f32767 100644 --- a/docker/php-dev/8.1/Dockerfile +++ b/docker/php-dev/8.1/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.1 +ARG BUILDARCH +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/8.1/Dockerfile.jinja2 b/docker/php-dev/8.1/Dockerfile.jinja2 index b485d0d81..59bebaf31 100644 --- a/docker/php-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-dev/8.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.1", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/8.2-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile index 70a0d56dc..39e6f5665 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile +++ b/docker/php-dev/8.2-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine +ARG BUILDARCH +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 index 73ac998dc..71fc56d03 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.2-alpine", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-dev/8.2/Dockerfile b/docker/php-dev/8.2/Dockerfile index 641a483cf..a84193f8a 100644 --- a/docker/php-dev/8.2/Dockerfile +++ b/docker/php-dev/8.2/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.2 +ARG BUILDARCH +ARG TARGETARCH + COPY conf/ /opt/docker/ RUN set -x \ diff --git a/docker/php-dev/8.2/Dockerfile.jinja2 b/docker/php-dev/8.2/Dockerfile.jinja2 index 3a1ce7cae..8fc64e2fc 100644 --- a/docker/php-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-dev/8.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.2", user) }} +{{ docker.platformArgs() }} + {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index ee1f26dc5..0a2c98433 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.1-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 index 52e3228e8..d7a07887b 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "8.1-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/8.1/Dockerfile b/docker/php-nginx-dev/8.1/Dockerfile index 69283d3ed..23752902f 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile +++ b/docker/php-nginx-dev/8.1/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.1 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 index 2426f464f..2e6d1fc0f 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "8.1", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile b/docker/php-nginx-dev/8.2-alpine/Dockerfile index 8734c938f..13bc9f56c 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.2-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 index e0af1ded7..197895cfe 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "8.2-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/8.2/Dockerfile b/docker/php-nginx-dev/8.2/Dockerfile index b259f3585..b53852010 100644 --- a/docker/php-nginx-dev/8.2/Dockerfile +++ b/docker/php-nginx-dev/8.2/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.2 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx-dev/8.2/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2/Dockerfile.jinja2 index 44ccc4af5..c3f8d6f1e 100644 --- a/docker/php-nginx-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "8.2", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile index 205a06e05..3df8b0532 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile +++ b/docker/php-nginx/8.1-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 index b4dda70cf..f79eac1df 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.1-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/8.1/Dockerfile b/docker/php-nginx/8.1/Dockerfile index 72572f7a5..a350ff421 100644 --- a/docker/php-nginx/8.1/Dockerfile +++ b/docker/php-nginx/8.1/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.1 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/8.1/Dockerfile.jinja2 b/docker/php-nginx/8.1/Dockerfile.jinja2 index 15d7fa07d..8e1894662 100644 --- a/docker/php-nginx/8.1/Dockerfile.jinja2 +++ b/docker/php-nginx/8.1/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.1", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/8.2-alpine/Dockerfile b/docker/php-nginx/8.2-alpine/Dockerfile index d17221a22..083ef8b3f 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile +++ b/docker/php-nginx/8.2-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 index 6817f9253..a5b1b4235 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.2-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-nginx/8.2/Dockerfile b/docker/php-nginx/8.2/Dockerfile index 198009805..d96fe1f79 100644 --- a/docker/php-nginx/8.2/Dockerfile +++ b/docker/php-nginx/8.2/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.2 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-nginx/8.2/Dockerfile.jinja2 b/docker/php-nginx/8.2/Dockerfile.jinja2 index 82879b77f..142378fb5 100644 --- a/docker/php-nginx/8.2/Dockerfile.jinja2 +++ b/docker/php-nginx/8.2/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.2", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} {{ environment.nginx() }} diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 220881ed1..205ec6b36 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -3,15 +3,11 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -<<<<<<< HEAD + FROM php:8.1-fpm-buster ARG BUILDARCH ARG TARGETARCH -======= - -FROM php:8.1-fpm-buster ->>>>>>> upstream/php-ci LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ diff --git a/docker/php-official/8.1/Dockerfile.jinja2 b/docker/php-official/8.1/Dockerfile.jinja2 index aabbbc496..522e9cfd8 100644 --- a/docker/php-official/8.1/Dockerfile.jinja2 +++ b/docker/php-official/8.1/Dockerfile.jinja2 @@ -1,11 +1,7 @@ -<<<<<<< HEAD + {{ docker.fromOfficial("php", "8.1-fpm-buster") }} {{ docker.platformArgs() }} -======= - -{{ docker.fromOfficial("php", "8.1-fpm-buster") }} ->>>>>>> upstream/php-ci {{ docker.version() }} diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index dff78e0fe..84d658638 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -6,6 +6,9 @@ FROM php:8.2-rc-fpm-alpine +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -28,8 +31,8 @@ ENV COMPOSER_VERSION="2" # Baselayout copy (from staged image) -COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/sbin/* /sbin/ -COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:buster /baselayout/usr/local/bin/* /usr/local/bin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/sbin/* /sbin/ +COPY --from=ghcr.io/cocoastorm/webdevops/toolbox:alpine /baselayout/usr/local/bin/* /usr/local/bin/ COPY conf/ /opt/docker/ diff --git a/docker/php-official/8.2-alpine/Dockerfile.jinja2 b/docker/php-official/8.2-alpine/Dockerfile.jinja2 index 101c138a7..6b2edf937 100644 --- a/docker/php-official/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.2-alpine/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "8.2-rc-fpm-alpine") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} @@ -10,7 +12,7 @@ {{ environment.phpAlpineIconvWorkaround() }} {{ environment.phpComposerVersion() }} -{{ baselayout.copy() }} +{{ baselayout.copy('alpine') }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index e718b33d9..a4a493b3a 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -6,6 +6,9 @@ FROM php:8.2-rc-fpm-buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ diff --git a/docker/php-official/8.2/Dockerfile.jinja2 b/docker/php-official/8.2/Dockerfile.jinja2 index 4c5817e5c..71c91a21c 100644 --- a/docker/php-official/8.2/Dockerfile.jinja2 +++ b/docker/php-official/8.2/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "8.2-rc-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} From e3d230b30ab5c5d25965d212dc6dcfa03fb3f033 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 28 Mar 2023 10:46:49 -0700 Subject: [PATCH 117/123] feat: try to also run on self hosted runner --- .github/workflows/docker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d2890ee79..4aec16d71 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ concurrency: jobs: build-baselayout-image: - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-latest] steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -27,7 +27,7 @@ jobs: build-toolbox-image: needs: build-baselayout-image - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-latest] strategy: matrix: flavor: ["alpine", "buster"] @@ -45,7 +45,7 @@ jobs: image-tags: "ghcr.io/cocoastorm/webdevops/toolbox:${{ matrix.flavor }}" generate-matrix: - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-latest] outputs: base: ${{ steps.generate-matrix.outputs.matrix-base }} multi: ${{ steps.generate-matrix.outputs.matrix-multi }} @@ -71,7 +71,7 @@ jobs: needs: - generate-matrix - build-toolbox-image - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-latest] strategy: max-parallel: 2 matrix: @@ -93,7 +93,7 @@ jobs: needs: - generate-matrix - build-base-images - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-latest] strategy: max-parallel: 2 matrix: @@ -115,7 +115,7 @@ jobs: needs: - generate-matrix - build-multi-images - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-latest] strategy: max-parallel: 2 matrix: From b6bbc86a14b44b764e39fa49d0573ce48ef9bfda Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 28 Mar 2023 11:03:48 -0700 Subject: [PATCH 118/123] try again with self-hosted runners --- .github/workflows/docker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4aec16d71..180383e59 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ concurrency: jobs: build-baselayout-image: - runs-on: [self-hosted, ubuntu-latest] + runs-on: [self-hosted, Linux] steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -27,7 +27,7 @@ jobs: build-toolbox-image: needs: build-baselayout-image - runs-on: [self-hosted, ubuntu-latest] + runs-on: [self-hosted, Linux] strategy: matrix: flavor: ["alpine", "buster"] @@ -45,7 +45,7 @@ jobs: image-tags: "ghcr.io/cocoastorm/webdevops/toolbox:${{ matrix.flavor }}" generate-matrix: - runs-on: [self-hosted, ubuntu-latest] + runs-on: [self-hosted, Linux] outputs: base: ${{ steps.generate-matrix.outputs.matrix-base }} multi: ${{ steps.generate-matrix.outputs.matrix-multi }} @@ -71,7 +71,7 @@ jobs: needs: - generate-matrix - build-toolbox-image - runs-on: [self-hosted, ubuntu-latest] + runs-on: [self-hosted, Linux] strategy: max-parallel: 2 matrix: @@ -93,7 +93,7 @@ jobs: needs: - generate-matrix - build-base-images - runs-on: [self-hosted, ubuntu-latest] + runs-on: [self-hosted, Linux] strategy: max-parallel: 2 matrix: @@ -115,7 +115,7 @@ jobs: needs: - generate-matrix - build-multi-images - runs-on: [self-hosted, ubuntu-latest] + runs-on: [self-hosted, Linux] strategy: max-parallel: 2 matrix: From d344a693dd469e2c3646bbd651354055b65fc457 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Tue, 28 Mar 2023 11:22:06 -0700 Subject: [PATCH 119/123] feat: workaround python by using a docker container/image --- .github/workflows/docker.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 180383e59..c5b236e3d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -46,6 +46,7 @@ jobs: generate-matrix: runs-on: [self-hosted, Linux] + container: python:3.9 outputs: base: ${{ steps.generate-matrix.outputs.matrix-base }} multi: ${{ steps.generate-matrix.outputs.matrix-multi }} @@ -54,11 +55,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.9' - cache: 'pip' - - run: pip install -r bin/requirements.txt - name: Generate Matrix From 00e2b2d08eb7d3e588972ee96871653f1760b986 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 29 Mar 2023 09:21:28 -0700 Subject: [PATCH 120/123] feat: run github action workflow on 'main' branch --- .github/workflows/docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c5b236e3d..e03d4f7a3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,8 +3,7 @@ name: docker images on: push: branches: - - 'main' - - 'port-php8.2' + - main concurrency: group: "${{ github.ref }}" From 9516029edda6817170dde66b19697b6f7d36efcf Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Wed, 29 Mar 2023 09:22:04 -0700 Subject: [PATCH 121/123] gitignore generated matrix json files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 11acfa541..9e8f1f938 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /tests/serverspec/vendor /tests/serverspec/.bundle/ /tests/serverspec/Dockerfile* +gh_matrix*.json /BLACKLIST /venv *.log From 522f780fc0a00ec72eb1524e3450dea0d1f62153 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 30 Mar 2023 11:12:34 -0700 Subject: [PATCH 122/123] fix: add missing platform args for php-apache:8.2-alpine --- docker/php-apache/8.2-alpine/Dockerfile | 3 +++ docker/php-apache/8.2-alpine/Dockerfile.jinja2 | 2 ++ 2 files changed, 5 insertions(+) diff --git a/docker/php-apache/8.2-alpine/Dockerfile b/docker/php-apache/8.2-alpine/Dockerfile index 0fc174b7a..806ac26ff 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile +++ b/docker/php-apache/8.2-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ diff --git a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 index cf9a81630..9eecdef6f 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php", "8.2-alpine", user) }} +{{ docker.platformArgs() }} + {{ environment.web() }} {{ environment.webPhp() }} From 6cb1bec047cee0ff6c4caabaea6ac2f4095cc415 Mon Sep 17 00:00:00 2001 From: Khoa Nguyen Date: Thu, 1 Feb 2024 11:38:33 -0800 Subject: [PATCH 123/123] fix: docker-arch-info nofail --- .github/workflows/docker.yml | 12 ++++++------ .../general/usr/local/bin/docker-arch-info | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e03d4f7a3..e65c8c6d2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,7 +10,7 @@ concurrency: jobs: build-baselayout-image: - runs-on: [self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -26,7 +26,7 @@ jobs: build-toolbox-image: needs: build-baselayout-image - runs-on: [self-hosted, Linux] + runs-on: ubuntu-latest strategy: matrix: flavor: ["alpine", "buster"] @@ -44,7 +44,7 @@ jobs: image-tags: "ghcr.io/cocoastorm/webdevops/toolbox:${{ matrix.flavor }}" generate-matrix: - runs-on: [self-hosted, Linux] + runs-on: ubuntu-latest container: python:3.9 outputs: base: ${{ steps.generate-matrix.outputs.matrix-base }} @@ -66,7 +66,7 @@ jobs: needs: - generate-matrix - build-toolbox-image - runs-on: [self-hosted, Linux] + runs-on: ubuntu-latest strategy: max-parallel: 2 matrix: @@ -88,7 +88,7 @@ jobs: needs: - generate-matrix - build-base-images - runs-on: [self-hosted, Linux] + runs-on: ubuntu-latest strategy: max-parallel: 2 matrix: @@ -110,7 +110,7 @@ jobs: needs: - generate-matrix - build-multi-images - runs-on: [self-hosted, Linux] + runs-on: ubuntu-latest strategy: max-parallel: 2 matrix: diff --git a/provisioning/base-layout/general/usr/local/bin/docker-arch-info b/provisioning/base-layout/general/usr/local/bin/docker-arch-info index 73abf5bbd..25a948995 100755 --- a/provisioning/base-layout/general/usr/local/bin/docker-arch-info +++ b/provisioning/base-layout/general/usr/local/bin/docker-arch-info @@ -11,13 +11,11 @@ printUsage() { echo "BUILDARCH" "architecture of docker host/builder" echo "TARGETARCH" "architecture of the final docker image" echo "" - - exit 1 } if [ $# -lt 1 ]; then printUsage - exit 2 + exit 0 # don't do anything fi if [ $# -eq 1 ]; then