diff --git a/.github/actions/composite-docker/action.yml b/.github/actions/composite-docker/action.yml new file mode 100644 index 000000000..3c57444f5 --- /dev/null +++ b/.github/actions/composite-docker/action.yml @@ -0,0 +1,61 @@ +name: Docker 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 + + 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 + + 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: + - 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: ${{ inputs.registry-user }} + password: ${{ inputs.registry-secret }} + + - name: Build ${{ inputs.image-name }} + uses: docker/build-push-action@v3 + with: + context: ${{ inputs.image-context }} + platforms: ${{ inputs.image-platforms }} + push: ${{ inputs.image-push }} + pull: ${{ inputs.image-pull }} + tags: ${{ inputs.image-tags }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 000000000..e65c8c6d2 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,129 @@ +name: docker images + +on: + push: + branches: + - main + +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 }} + 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" + + build-toolbox-image: + needs: build-baselayout-image + runs-on: ubuntu-latest + strategy: + matrix: + flavor: ["alpine", "buster"] + 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/${{ matrix.flavor }}" + image-tags: "ghcr.io/cocoastorm/webdevops/toolbox:${{ matrix.flavor }}" + + generate-matrix: + runs-on: ubuntu-latest + container: python:3.9 + 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 + + - run: pip install -r bin/requirements.txt + + - name: Generate Matrix + id: generate-matrix + 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: + - generate-matrix + - build-toolbox-image + runs-on: ubuntu-latest + strategy: + max-parallel: 2 + matrix: + include: ${{ fromJson(needs.generate-matrix.outputs.base) }} + steps: + - name: Check out repository + 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 }} + + build-multi-images: + needs: + - generate-matrix + - build-base-images + runs-on: ubuntu-latest + strategy: + max-parallel: 2 + matrix: + include: ${{ fromJson(needs.generate-matrix.outputs.multi) }} + 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 }} + + 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 }} diff --git a/.gitignore b/.gitignore index d64af3b3b..9e8f1f938 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,10 @@ /tests/serverspec/vendor /tests/serverspec/.bundle/ /tests/serverspec/Dockerfile* +gh_matrix*.json /BLACKLIST +/venv *.log *.pyc +*.DS_Store .doit.db diff --git a/Makefile b/Makefile index 781d8a4cf..ae5c21253 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` @@ -40,6 +40,19 @@ requirements: cd tests/serverspec && bundle install --path=vendor test: + bin/console test:serverspec --threads=auto -v + +provision: + bin/console generate:dockerfile + bin/console generate:provision + +push: + bin/console docker:push --threads=auto + +graph: + bin/console generate:graph + +graph-full: python2 bin/console test:serverspec --threads=auto -v structure-test: 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..aaf4437a2 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 @@ -65,6 +65,12 @@ def run_task(self, configuration): trim_blocks=False ) + 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 new file mode 100644 index 000000000..d9d7af38a --- /dev/null +++ b/bin/command/generate_gh_action_matrix_command.py @@ -0,0 +1,137 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import base64 +import json +import os +import sys +from cleo import Output +from webdevops import DockerfileUtility +from webdevops.DockerfileFilter import MatrixBuilder +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_user = '' + image_prefix = '' + dockerfile_path = '' + + def run_task(self, configuration): + 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') + + whitelist = self.get_whitelist() + blacklist = self.get_blacklist() + + self.image_user = image_user + 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, + # ) + + 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=user_image_prefix, + whitelist=whitelist, blacklist=blacklist, + ) + + matrix = MatrixBuilder(dockerfiles, user_image_prefix) + matrix.build() + + output_path = os.path.split(dockerfile_path)[0] + + # 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.fmt_github_output("matrix-base", json.dumps(base_images)) + + with open(output_base_file, 'w') as f: + json.dump(base_images, f, 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.fmt_github_output("matrix-multi", json.dumps(multiservice_images)) + + 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.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, value): + eof = os.getenv('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: + return f"{self.image_user}/{self.image_prefix}/{image}:{tag}" + else: + return f"{self.image_prefix}/{image}:{tag}" + + 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)) + 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': dockerfile['image']['fullname'], + } + + 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_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..00efba6a3 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,11 +22,11 @@ import yaml import yamlordereddictloader import time -import Queue +import queue 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): @@ -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..c6fde4ecb 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 @@ -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_gh_action_matrix_command import GenerateGHActionMatrixCommand if __name__ == '__main__': # Generate common paths @@ -43,19 +44,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 @@ -100,5 +101,6 @@ if __name__ == '__main__': application.add(GenerateDockerfileCommand(configuration=configuration)) application.add(GenerateGraphCommand(configuration=configuration)) application.add(GenerateProvisionCommand(configuration=configuration)) + application.add(GenerateGHActionMatrixCommand(configuration=configuration)) application.run() 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/bin/requirements.txt b/bin/requirements.txt index 0a1be6eca..148b26b43 100644 --- a/bin/requirements.txt +++ b/bin/requirements.txt @@ -1,27 +1,22 @@ -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 +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.1.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 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..19021c950 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 @@ -43,8 +43,9 @@ 'docker': { 'imagePrefix': '', + 'imageUser': '', '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 +84,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 +102,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 +117,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 +130,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/DockerfileFilter.py b/bin/webdevops/DockerfileFilter.py new file mode 100644 index 000000000..51ea95abd --- /dev/null +++ b/bin/webdevops/DockerfileFilter.py @@ -0,0 +1,114 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +import json + +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 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 + + 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 self.should_ignore(image_from): + 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 self.should_ignore(image_from): + 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 self.should_ignore(image_dep): + 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())) diff --git a/bin/webdevops/DockerfileUtility.py b/bin/webdevops/DockerfileUtility.py index 32b32a966..4b9e4136e 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 @@ -20,9 +20,11 @@ import os import re +import sys +from pathlib import Path -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--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): """ @@ -60,11 +62,17 @@ 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: 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 @@ -109,7 +117,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, @@ -132,20 +140,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 = filter(lambda x: term not in x['image']['fullname'], dockerfile_list) + 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): @@ -179,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): """ 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..916f3cf64 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,12 @@ 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) + self.line('') + if self.output.is_verbose(): + if exitcode == 0: + self.line("> finished execution in %s successfully" % duration) + else: + self.line("> finished execution in %s with errors (exitcode %s)" % (duration, exitcode)) def build_configuration(self): """ @@ -207,7 +208,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/build.sh b/build.sh new file mode 100644 index 000000000..cd6d07fea --- /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.2-alpine' +docker build -t webdevops/php:8.2-alpine -f ./docker/php/8.2-alpine/Dockerfile ./docker/php/8.2-alpine +docker tag webdevops/php:8.2-alpine ghcr.io/cocoastorm/webdevops/php:8.2-alpine + +echo 'building webdevops/php-nginx:8.2-alpine' +docker build -t webdevops/php-nginx:8.2-alpine -f ./docker/php-nginx/8.2-alpine/Dockerfile ./docker/php-nginx/8.2-alpine +docker tag webdevops/php-nginx:8.2-alpine ghcr.io/cocoastorm/webdevops/php-nginx:8.2-alpine + +# echo 'building webdevops/php-nginx-dev:8.2-alpine' +# docker build -t webdevops/php-nginx-dev:8.2-alpine -f ./docker/php-nginx-dev/8.2-alpine/Dockerfile ./docker/php-nginx-dev/8.2-alpine +# docker tag webdevops/php-nginx-dev:8.2-alpine ghcr.io/cocoastorm/webdevops/php-nginx-dev:8.2-alpine diff --git a/conf/console.yml b/conf/console.yml index 085c6fc5c..1adc8baf8 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -5,6 +5,7 @@ templatePath: 'template' provisionPath: 'provisioning' imagePath: 'documentation/docs/resources/images/' baselayoutPath: 'baselayout' +githubActionsPath: '.github/workflows' testinfraPath: 'tests/testinfra' serverspecPath: 'tests/serverspec' testDockerfilePath: 'tests/dockerfile' @@ -12,6 +13,7 @@ blacklistFile: 'BLACKLIST' docker: imagePrefix: 'webdevops' + imageUser: 'ghcr.io/cocoastorm' autoLatestTag: 'ubuntu-20.04' pathRegex: '/(?P[^/]+)/(?P[^/]+)/Dockerfile$' autoPull: True 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/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index 601786552..bfca256dd 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/alpine/Dockerfile.jinja2 b/docker/ansible/alpine/Dockerfile.jinja2 index d11f9c10e..5b3a55a0d 100644 --- a/docker/ansible/alpine/Dockerfile.jinja2 +++ b/docker/ansible/alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "alpine") }} +{{ docker.from("bootstrap", "alpine", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.alpine() }} \ diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 62cba7cd4..328d46879 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:centos-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile.jinja2 b/docker/ansible/centos-7/Dockerfile.jinja2 index 5703e349c..0bacfec0c 100644 --- a/docker/ansible/centos-7/Dockerfile.jinja2 +++ b/docker/ansible/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "centos-7") }} +{{ docker.from("bootstrap", "centos-7", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.centos() }} \ diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index a2be6ee10..b89eee8df 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -29,5 +32,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile.jinja2 b/docker/ansible/debian-7/Dockerfile.jinja2 index 7ef6b31ce..385e34165 100644 --- a/docker/ansible/debian-7/Dockerfile.jinja2 +++ b/docker/ansible/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "debian-7") }} +{{ docker.from("bootstrap", "debian-7", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.debian() }} \ diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index c9d29c961..54dd350f2 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-8 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -29,5 +32,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile.jinja2 b/docker/ansible/debian-8/Dockerfile.jinja2 index d12c259a4..36633ed19 100644 --- a/docker/ansible/debian-8/Dockerfile.jinja2 +++ b/docker/ansible/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "debian-8") }} +{{ docker.from("bootstrap", "debian-8", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.debian() }} \ diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 7a594f906..24a5861f8 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-9 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -29,5 +32,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile.jinja2 b/docker/ansible/debian-9/Dockerfile.jinja2 index 89164b59a..86e308c84 100644 --- a/docker/ansible/debian-9/Dockerfile.jinja2 +++ b/docker/ansible/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "debian-9") }} +{{ docker.from("bootstrap", "debian-9", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.debian() }} \ diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index c4e5b9d59..9122bc984 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -28,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 index d5be32a63..53781cacc 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-12.04") }} +{{ docker.from("bootstrap", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index bbb77a70d..1273719e1 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -28,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 index e5c6701e8..e237f2e90 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-14.04") }} +{{ docker.from("bootstrap", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 691901e86..9880d55e7 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -28,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 index 0558e6f27..51069a98c 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-15.04") }} +{{ docker.from("bootstrap", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index dd2aa7d5b..3e86d3271 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -28,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 index 652d0057b..439007fc6 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-15.10") }} +{{ docker.from("bootstrap", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index f1930aa51..4cebe0f03 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -28,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 index 6ecc0c715..eee0c29e8 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-16.04") }} +{{ docker.from("bootstrap", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/ansible/ubuntu-17.04/Dockerfile b/docker/ansible/ubuntu-17.04/Dockerfile index ba70d8506..6ed8f46d8 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile +++ b/docker/ansible/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ # Install ansible @@ -28,5 +31,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 index 4a6bcf6e1..5e5d33dc3 100644 --- a/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-17.04") }} +{{ docker.from("bootstrap", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ ansible.ubuntu() }} \ diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index a707b5c5e..0f8079a03 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:alpine +FROM ghcr.io/cocoastorm/webdevops/apache:alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/alpine/Dockerfile.jinja2 b/docker/apache-dev/alpine/Dockerfile.jinja2 index 57d43de6d..4ae6e6490 100644 --- a/docker/apache-dev/alpine/Dockerfile.jinja2 +++ b/docker/apache-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "alpine") }} +{{ docker.from("apache", "alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 78dc860d1..f33daa1bb 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:centos-7 +FROM ghcr.io/cocoastorm/webdevops/apache:centos-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/centos-7/Dockerfile.jinja2 b/docker/apache-dev/centos-7/Dockerfile.jinja2 index 3f5cf95c0..a912b03b9 100644 --- a/docker/apache-dev/centos-7/Dockerfile.jinja2 +++ b/docker/apache-dev/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "centos-7") }} +{{ docker.from("apache", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/debian-10/Dockerfile b/docker/apache-dev/debian-10/Dockerfile index 8bbf1842b..e0132f9f3 100644 --- a/docker/apache-dev/debian-10/Dockerfile +++ b/docker/apache-dev/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:debian-10 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/debian-10/Dockerfile.jinja2 b/docker/apache-dev/debian-10/Dockerfile.jinja2 index 2fc8fb790..b451d068c 100644 --- a/docker/apache-dev/debian-10/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "debian-10") }} +{{ docker.from("apache", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 417169433..df68cbc92 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:debian-7 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/debian-7/Dockerfile.jinja2 b/docker/apache-dev/debian-7/Dockerfile.jinja2 index da7813eb4..b15801e5c 100644 --- a/docker/apache-dev/debian-7/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "debian-7") }} +{{ docker.from("apache", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 0cbc1c89a..5dc3ea485 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:debian-8 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-8 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/debian-8/Dockerfile.jinja2 b/docker/apache-dev/debian-8/Dockerfile.jinja2 index d0d1bf868..7479a78c8 100644 --- a/docker/apache-dev/debian-8/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "debian-8") }} +{{ docker.from("apache", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index eb55712d2..818370789 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:debian-9 +FROM ghcr.io/cocoastorm/webdevops/apache:debian-9 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/debian-9/Dockerfile.jinja2 b/docker/apache-dev/debian-9/Dockerfile.jinja2 index a8413123e..102aa7622 100644 --- a/docker/apache-dev/debian-9/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "debian-9") }} +{{ docker.from("apache", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index a89b36687..653187da2 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-12.04 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 index b5f87c92e..1970d348e 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-12.04") }} +{{ docker.from("apache", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 69978adbd..7fec58aa0 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-14.04 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 index 6c2a9fd10..1beccdac9 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-14.04") }} +{{ docker.from("apache", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 9b6f4095c..222fd7c26 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-15.04 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 index 42ccf09c2..18fb4edc6 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-15.04") }} +{{ docker.from("apache", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index df4f2e029..7fee24627 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-15.10 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 index dc283b259..8adae1013 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-15.10") }} +{{ docker.from("apache", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 87b4a71d0..896d40c18 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-16.04 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 index 53c1d465e..9808b050a 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-16.04") }} +{{ docker.from("apache", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 8e0a34bcd..dc72cdcd4 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-16.10 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 index 85982e937..f463c5d8a 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-16.10") }} +{{ docker.from("apache", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-17.04/Dockerfile b/docker/apache-dev/ubuntu-17.04/Dockerfile index 33b1d2e0b..97253f08e 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-17.04 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 index d325af421..3c60758f4 100644 --- a/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-17.04") }} +{{ docker.from("apache", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-17.10/Dockerfile b/docker/apache-dev/ubuntu-17.10/Dockerfile index d48b11685..9fa33c68c 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-17.10 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 index e59968e19..9a9b2a497 100644 --- a/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-17.10") }} +{{ docker.from("apache", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache-dev/ubuntu-18.04/Dockerfile b/docker/apache-dev/ubuntu-18.04/Dockerfile index 941e3dfb6..d8828194f 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:ubuntu-18.04 +FROM 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)$" @@ -11,7 +14,9 @@ COPY conf/ /opt/docker/ RUN set -x \ \ - && 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/apache-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 index ca767b906..9cd317c01 100644 --- a/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("apache", "ubuntu-18.04") }} +{{ docker.from("apache", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index 42bed117c..4ac94e8f3 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine/Dockerfile.jinja2 b/docker/apache/alpine/Dockerfile.jinja2 index 51384b363..6354eb04e 100644 --- a/docker/apache/alpine/Dockerfile.jinja2 +++ b/docker/apache/alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "alpine") }} +{{ docker.from("base", "alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 6978d398c..d2114e822 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -22,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/centos-7/Dockerfile.jinja2 b/docker/apache/centos-7/Dockerfile.jinja2 index cba7ef987..3a10bc45f 100644 --- a/docker/apache/centos-7/Dockerfile.jinja2 +++ b/docker/apache/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "centos-7") }} +{{ docker.from("base", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/debian-10/Dockerfile b/docker/apache/debian-10/Dockerfile index b9fd0a273..17c87444c 100644 --- a/docker/apache/debian-10/Dockerfile +++ b/docker/apache/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -23,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-10/Dockerfile.jinja2 b/docker/apache/debian-10/Dockerfile.jinja2 index 84d038765..e84d32bb3 100644 --- a/docker/apache/debian-10/Dockerfile.jinja2 +++ b/docker/apache/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-10") }} +{{ docker.from("base", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 2d6e23599..16cdc7e30 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ - && 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/apache/debian-7/Dockerfile.jinja2 b/docker/apache/debian-7/Dockerfile.jinja2 index 563c057f0..f15407a5d 100644 --- a/docker/apache/debian-7/Dockerfile.jinja2 +++ b/docker/apache/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-7") }} +{{ docker.from("base", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 22ffd0720..08e9d0cec 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ - && 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/apache/debian-8/Dockerfile.jinja2 b/docker/apache/debian-8/Dockerfile.jinja2 index 05c23a9a5..45b58a0f6 100644 --- a/docker/apache/debian-8/Dockerfile.jinja2 +++ b/docker/apache/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-8") }} +{{ docker.from("base", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 0808f4895..2dd1dbaeb 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -23,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-9/Dockerfile.jinja2 b/docker/apache/debian-9/Dockerfile.jinja2 index e66ee9f3c..b6f8e5006 100644 --- a/docker/apache/debian-9/Dockerfile.jinja2 +++ b/docker/apache/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-9") }} +{{ docker.from("base", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 7658551ea..2310116a2 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -26,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 index f0ff6eb5b..7b653a700 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-12.04") }} +{{ docker.from("base", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index cc8b83257..5717316bc 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -26,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 index 5f69ea7ac..aecf7dde6 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-14.04") }} +{{ docker.from("base", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 6355df749..19c74c604 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 index 53ae8079c..94f2caa81 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-15.04") }} +{{ docker.from("base", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index 0d3c5d063..58affe8a7 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 index dd2bf51ba..ff4ae2b29 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-15.10") }} +{{ docker.from("base", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 809104fc7..80f987025 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 index 25481003b..2d3d40c27 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-16.04") }} +{{ docker.from("base", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index a1b6dab7f..fe11925dc 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 index e0665f542..847085631 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-16.10") }} +{{ docker.from("base", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-17.04/Dockerfile b/docker/apache/ubuntu-17.04/Dockerfile index 7a51b4a60..93fbd35fd 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile +++ b/docker/apache/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.04/Dockerfile.jinja2 b/docker/apache/ubuntu-17.04/Dockerfile.jinja2 index 7a0ff4c89..c54db185e 100644 --- a/docker/apache/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-17.04") }} +{{ docker.from("base", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-17.10/Dockerfile b/docker/apache/ubuntu-17.10/Dockerfile index ee1de7a75..19dd5d97f 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile +++ b/docker/apache/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-17.10/Dockerfile.jinja2 b/docker/apache/ubuntu-17.10/Dockerfile.jinja2 index 53a22a864..f339061d0 100644 --- a/docker/apache/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-17.10") }} +{{ docker.from("base", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/apache/ubuntu-18.04/Dockerfile b/docker/apache/ubuntu-18.04/Dockerfile index da52ab023..7b5c36a63 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile +++ b/docker/apache/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-18.04/Dockerfile.jinja2 b/docker/apache/ubuntu-18.04/Dockerfile.jinja2 index d3bfc2bdc..8cf580ad6 100644 --- a/docker/apache/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-18.04") }} +{{ docker.from("base", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index bb16314bc..7cbed3fde 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -14,7 +17,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 \ @@ -26,5 +31,7 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/alpine/Dockerfile.jinja2 b/docker/base-app/alpine/Dockerfile.jinja2 index e0bac3426..2651c39ef 100644 --- a/docker/base-app/alpine/Dockerfile.jinja2 +++ b/docker/base-app/alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "alpine") }} +{{ docker.from("base", "alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 87904ce56..038d8ed4c 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -16,6 +19,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Install services && yum-install \ + dpkg \ # Install tools zip \ unzip \ @@ -27,5 +31,7 @@ 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 diff --git a/docker/base-app/centos-7/Dockerfile.jinja2 b/docker/base-app/centos-7/Dockerfile.jinja2 index 09229c21b..ae2b2c462 100644 --- a/docker/base-app/centos-7/Dockerfile.jinja2 +++ b/docker/base-app/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "centos-7") }} +{{ docker.from("base", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/debian-10/Dockerfile b/docker/base-app/debian-10/Dockerfile index 56fa490e2..a7b34e291 100644 --- a/docker/base-app/debian-10/Dockerfile +++ b/docker/base-app/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -27,5 +30,7 @@ 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 diff --git a/docker/base-app/debian-10/Dockerfile.jinja2 b/docker/base-app/debian-10/Dockerfile.jinja2 index adfaae607..27ab346f0 100644 --- a/docker/base-app/debian-10/Dockerfile.jinja2 +++ b/docker/base-app/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-10") }} +{{ docker.from("base", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 00031457f..698751a43 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -27,5 +30,7 @@ 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 diff --git a/docker/base-app/debian-7/Dockerfile.jinja2 b/docker/base-app/debian-7/Dockerfile.jinja2 index 452e0dabf..ec907d048 100644 --- a/docker/base-app/debian-7/Dockerfile.jinja2 +++ b/docker/base-app/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-7") }} +{{ docker.from("base", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 116ee2a35..c4b62ee7e 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -27,5 +30,7 @@ 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 diff --git a/docker/base-app/debian-8/Dockerfile.jinja2 b/docker/base-app/debian-8/Dockerfile.jinja2 index 82d2a7cf3..be2db5d68 100644 --- a/docker/base-app/debian-8/Dockerfile.jinja2 +++ b/docker/base-app/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-8") }} +{{ docker.from("base", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index a030db831..08500d3a3 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -27,5 +30,7 @@ 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 diff --git a/docker/base-app/debian-9/Dockerfile.jinja2 b/docker/base-app/debian-9/Dockerfile.jinja2 index e5818a7f6..c44b8787e 100644 --- a/docker/base-app/debian-9/Dockerfile.jinja2 +++ b/docker/base-app/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-9") }} +{{ docker.from("base", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 557714ef5..e0652064f 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 index a9a9ba06d..5b8176b41 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-12.04") }} +{{ docker.from("base", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index e5a33056c..bbf3dde7f 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 index 2e162697b..2c651b227 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-14.04") }} +{{ docker.from("base", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 83600e93a..efe3060d6 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 index 407f9cb81..4e5450c34 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-15.04") }} +{{ docker.from("base", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 5a9292671..dede9f575 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 index 868be405e..7cbb62d6a 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-15.10") }} +{{ docker.from("base", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index a7256d29d..112618dc2 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 index 96916b799..e713fd2d2 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-16.04") }} +{{ docker.from("base", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index ec821353e..bb1ff1267 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 index 1d5ae6a85..b89ba7309 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-16.10") }} +{{ docker.from("base", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-17.04/Dockerfile b/docker/base-app/ubuntu-17.04/Dockerfile index 255558f0e..9c18dbfa9 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile +++ b/docker/base-app/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 index 1bfafccfb..6ee636559 100644 --- a/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-17.04") }} +{{ docker.from("base", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-17.10/Dockerfile b/docker/base-app/ubuntu-17.10/Dockerfile index 1adf325f9..2a62e97bc 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile +++ b/docker/base-app/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 index cf23e552a..2da39ef1e 100644 --- a/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-17.10") }} +{{ docker.from("base", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-18.04/Dockerfile b/docker/base-app/ubuntu-18.04/Dockerfile index 88915ce6c..048b89a3c 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile +++ b/docker/base-app/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 + +ARG BUILDARCH +ARG TARGETARCH ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 index d1495dd24..5d22da728 100644 --- a/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-18.04") }} +{{ docker.from("base", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ environment.baseApp() }} diff --git a/docker/base-app/ubuntu-20.04/Dockerfile b/docker/base-app/ubuntu-20.04/Dockerfile index 58b93f0ff..6beba81e2 100644 --- a/docker/base-app/ubuntu-20.04/Dockerfile +++ b/docker/base-app/ubuntu-20.04/Dockerfile @@ -28,5 +28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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-arch-info b/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info new file mode 100755 index 000000000..73abf5bbd --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-arch-info @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +DOCKER_DIR="/opt/docker" +ARCH_FILE="/opt/docker/ARCH_INFO" + +printUsage() { + echo "Usage $0 " + echo "" + 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 +fi + +if [ $# -eq 1 ]; then + unset BUILDARCH + TARGETARCH="$1" +else + BUILDARCH="$1" + TARGETARCH="$2" +fi + +if [ ! -d "$DOCKER_DIR" ]; then + mkdir -p "$DOCKER_DIR" +fi + +echo "storing to $ARCH_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/docker-image-cleanup b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup new file mode 100755 index 000000000..92c179e48 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/docker-image-cleanup @@ -0,0 +1,37 @@ +#!/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 +set -x + +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..88734adad --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/go-replace @@ -0,0 +1,51 @@ +#!/bin/sh + +set -e + +ARCH_FILE="/opt/docker/ARCH_INFO" +VERSION="1.1.2" + +if command -v dpkg > /dev/null; then + ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" +fi + +download() { + /usr/local/bin/install-go-replace "$1" +} + +if [ -f "/opt/docker/ARCH_INFO" ]; then + while IFS="=" read -r key value; do + case "$key" in + "BUILDARCH") BUILDARCH="$value" ;; + "TARGETARCH") TARGETARCH="$value" ;; + esac + done < "$ARCH_FILE" +fi + +if [ ! -n "$BUILDARCH" ] && [ -n "$ARCH" ]; then + echo "$BUILDARCH missing, using `dpkg --print-architecture` to determine" +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 + echo "go-replace-$BUILDARCH" + exec "/usr/local/bin/go-replace-$BUILDARCH" "$@" +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/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 new file mode 100755 index 000000000..2287ef1c0 --- /dev/null +++ b/docker/base-layout/latest/conf/usr/local/bin/symlink-go-replace @@ -0,0 +1,43 @@ +#!/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 + +download() { + /usr/local/bin/install-go-replace "$1" +} + +symlinkBinary() { + symlink_target="/usr/local/bin/go-replace-$1" + + if [ ! -f "$symlink_target" ]; then + echo "$symlink_target not found, attempting to install:" + download "$1" + exit 2 + fi + + rm -f -- "$GO_REPLACE" + ln -sf "/usr/local/bin/go-replace-$1" "$GO_REPLACE" +} + +if [ ! -n "$TARGETARCH" ]; then + symlinkBinary "amd64" +else + symlinkBinary "$TARGETARCH" +fi 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/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 06ff90d5e..14d25ec9a 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -23,7 +26,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/alpine/Dockerfile.jinja2 b/docker/base/alpine/Dockerfile.jinja2 index 84af4cc8d..fc24ca48a 100644 --- a/docker/base/alpine/Dockerfile.jinja2 +++ b/docker/base/alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "alpine") }} +{{ docker.from("bootstrap", "alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 75f971b25..70c2d1cec 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:centos-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:centos-7 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -23,7 +26,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/centos-7/Dockerfile.jinja2 b/docker/base/centos-7/Dockerfile.jinja2 index fb5fe0aeb..d4dcc36d8 100644 --- a/docker/base/centos-7/Dockerfile.jinja2 +++ b/docker/base/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "centos-7") }} +{{ docker.from("bootstrap", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/debian-10/Dockerfile b/docker/base/debian-10/Dockerfile index dff6726d9..0678ce2d7 100644 --- a/docker/base/debian-10/Dockerfile +++ b/docker/base/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-10 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-10/Dockerfile.jinja2 b/docker/base/debian-10/Dockerfile.jinja2 index 92ef7fdf9..83ccaa5eb 100644 --- a/docker/base/debian-10/Dockerfile.jinja2 +++ b/docker/base/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "debian-10") }} +{{ docker.from("bootstrap", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 1a48cd5b0..012c84649 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-7 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-7 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-7/Dockerfile.jinja2 b/docker/base/debian-7/Dockerfile.jinja2 index c004fb6bf..9597c96ca 100644 --- a/docker/base/debian-7/Dockerfile.jinja2 +++ b/docker/base/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "debian-7") }} +{{ docker.from("bootstrap", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 2ff6a4938..f7d41e1fa 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-8 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-8 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-8/Dockerfile.jinja2 b/docker/base/debian-8/Dockerfile.jinja2 index 37487ef88..94e0c8d13 100644 --- a/docker/base/debian-8/Dockerfile.jinja2 +++ b/docker/base/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "debian-8") }} +{{ docker.from("bootstrap", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 7caa6d5ca..d089e730e 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:debian-9 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:debian-9 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/debian-9/Dockerfile.jinja2 b/docker/base/debian-9/Dockerfile.jinja2 index e24cf1bba..55e86fbc9 100644 --- a/docker/base/debian-9/Dockerfile.jinja2 +++ b/docker/base/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "debian-9") }} +{{ docker.from("bootstrap", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index f0a9d9ecf..ec2781487 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-12.04 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-12.04/Dockerfile.jinja2 index a38bce572..85cccd97c 100644 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-12.04") }} +{{ docker.from("bootstrap", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 74ab7c1e9..ea0b2f835 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-14.04 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-14.04/Dockerfile.jinja2 b/docker/base/ubuntu-14.04/Dockerfile.jinja2 index a56ac9a0e..a656fac9a 100644 --- a/docker/base/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-14.04") }} +{{ docker.from("bootstrap", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index d71eaa6d0..f10a3aed5 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.04 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-15.04/Dockerfile.jinja2 b/docker/base/ubuntu-15.04/Dockerfile.jinja2 index 7716af57d..3c6c4401f 100644 --- a/docker/base/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-15.04") }} +{{ docker.from("bootstrap", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 8739fe634..006c81e71 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-15.10 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-15.10/Dockerfile.jinja2 b/docker/base/ubuntu-15.10/Dockerfile.jinja2 index e7fe320db..47a322351 100644 --- a/docker/base/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-15.10") }} +{{ docker.from("bootstrap", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 0780227b0..0db46ae6e 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.04 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-16.04/Dockerfile.jinja2 b/docker/base/ubuntu-16.04/Dockerfile.jinja2 index 16d8d5012..11d2ff017 100644 --- a/docker/base/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-16.04") }} +{{ docker.from("bootstrap", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 9fab1b45e..a953091b7 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-16.10 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-16.10/Dockerfile.jinja2 b/docker/base/ubuntu-16.10/Dockerfile.jinja2 index 95bc15c40..49f4c94d8 100644 --- a/docker/base/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-16.10") }} +{{ docker.from("bootstrap", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-17.04/Dockerfile b/docker/base/ubuntu-17.04/Dockerfile index 9245a8d45..c7c6c8a46 100644 --- a/docker/base/ubuntu-17.04/Dockerfile +++ b/docker/base/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.04 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-17.04/Dockerfile.jinja2 b/docker/base/ubuntu-17.04/Dockerfile.jinja2 index 61666f0d0..e71f66bff 100644 --- a/docker/base/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-17.04") }} +{{ docker.from("bootstrap", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-17.10/Dockerfile b/docker/base/ubuntu-17.10/Dockerfile index a0c768394..3eb1defed 100644 --- a/docker/base/ubuntu-17.10/Dockerfile +++ b/docker/base/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-17.10 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-17.10/Dockerfile.jinja2 b/docker/base/ubuntu-17.10/Dockerfile.jinja2 index 4e4650dac..4921a119a 100644 --- a/docker/base/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-17.10") }} +{{ docker.from("bootstrap", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-18.04/Dockerfile b/docker/base/ubuntu-18.04/Dockerfile index 410d00291..ebfa46deb 100644 --- a/docker/base/ubuntu-18.04/Dockerfile +++ b/docker/base/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/bootstrap:ubuntu-18.04 + +ARG BUILDARCH +ARG TARGETARCH ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -22,7 +25,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/base/ubuntu-18.04/Dockerfile.jinja2 b/docker/base/ubuntu-18.04/Dockerfile.jinja2 index 8e38dfca8..e083e10de 100644 --- a/docker/base/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap", "ubuntu-18.04") }} +{{ docker.from("bootstrap", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ environment.base() }} diff --git a/docker/base/ubuntu-20.04/Dockerfile b/docker/base/ubuntu-20.04/Dockerfile index 132bfd87f..2d139df4e 100644 --- a/docker/base/ubuntu-20.04/Dockerfile +++ b/docker/base/ubuntu-20.04/Dockerfile @@ -22,7 +22,9 @@ 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 ENTRYPOINT ["/entrypoint"] diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 9f3f82f9f..521036ce9 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -3,9 +3,15 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ +<<<<<<< HEAD +======= +>>>>>>> upstream/php-ci FROM alpine:3.11 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +23,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -37,5 +42,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/alpine/Dockerfile.jinja2 b/docker/bootstrap/alpine/Dockerfile.jinja2 index d0279bf3b..fb5f0b064 100644 --- a/docker/bootstrap/alpine/Dockerfile.jinja2 +++ b/docker/bootstrap/alpine/Dockerfile.jinja2 @@ -1,6 +1,11 @@ +<<<<<<< HEAD +======= +>>>>>>> upstream/php-ci {{ docker.fromOfficial("alpine", "3.11") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 8d3e384c6..8e073955e 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -6,6 +6,9 @@ FROM centos:7 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -28,5 +30,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile.jinja2 b/docker/bootstrap/centos-7/Dockerfile.jinja2 index 1acbf52f0..d9d4e9a1f 100644 --- a/docker/bootstrap/centos-7/Dockerfile.jinja2 +++ b/docker/bootstrap/centos-7/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("centos", "7") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general(charset='en_US.utf8') }} diff --git a/docker/bootstrap/debian-10/Dockerfile b/docker/bootstrap/debian-10/Dockerfile index fa8b3b470..67dbdc446 100644 --- a/docker/bootstrap/debian-10/Dockerfile +++ b/docker/bootstrap/debian-10/Dockerfile @@ -6,6 +6,9 @@ FROM debian:buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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.jinja2 b/docker/bootstrap/debian-10/Dockerfile.jinja2 index b11f734d5..816b3f98f 100644 --- a/docker/bootstrap/debian-10/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-10/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("debian", "buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index e2b71aee5..298369ba3 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -6,6 +6,9 @@ FROM debian:7 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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.jinja2 b/docker/bootstrap/debian-7/Dockerfile.jinja2 index 22ec08b93..1258537df 100644 --- a/docker/bootstrap/debian-7/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-7/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("debian", "7") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 55928b256..de36ae20f 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -6,6 +6,9 @@ FROM debian:8 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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.jinja2 b/docker/bootstrap/debian-8/Dockerfile.jinja2 index 7d71728d3..b79decdab 100644 --- a/docker/bootstrap/debian-8/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-8/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("debian", "8") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 6b0f07426..8eea4f9c3 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -6,6 +6,9 @@ FROM debian:stretch +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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.jinja2 b/docker/bootstrap/debian-9/Dockerfile.jinja2 index 093d13a5e..7d7e20a8f 100644 --- a/docker/bootstrap/debian-9/Dockerfile.jinja2 +++ b/docker/bootstrap/debian-9/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("debian", "stretch") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 202de896e..0fa127235 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:12.04 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -38,5 +40,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 index 8b9c055d2..518e9b0b2 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "12.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 585be2d4c..060fcf0ef 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:14.04 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -33,5 +35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 index 1e0479517..97038dd67 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "14.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index d733dd059..f7e862bb6 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:15.04 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -38,5 +40,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 index 2cb91c510..70a8c0f49 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "15.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 4f0c293f6..40cd98a07 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:15.10 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -38,5 +40,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 index f956d0e04..6143ef5d5 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "15.10") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 5a936c1ce..9b55c68b2 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:16.04 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -33,5 +35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 index 0c5903841..ccfa29704 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "16.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 6952ffbb3..b13c7aa43 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:16.10 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -38,5 +40,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 index 2a5d6b667..7b6038245 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "16.10") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile b/docker/bootstrap/ubuntu-17.04/Dockerfile index 1a170c643..8841cda8f 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:17.04 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -38,5 +40,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 index c7372f34c..6bd204d86 100644 --- a/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-17.04/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "17.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile b/docker/bootstrap/ubuntu-17.10/Dockerfile index f62a83787..b8e975d46 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:17.10 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -33,5 +35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 index 8e0395e49..2a748b075 100644 --- a/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-17.10/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "17.10") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile b/docker/bootstrap/ubuntu-18.04/Dockerfile index ff145cedd..4f168a9fb 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile @@ -6,6 +6,9 @@ FROM ubuntu:18.04 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -17,9 +20,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -33,5 +35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 index 0fa56a8eb..f5c203cf2 100644 --- a/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/bootstrap/ubuntu-18.04/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("ubuntu", "18.04") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/bootstrap/ubuntu-20.04/Dockerfile b/docker/bootstrap/ubuntu-20.04/Dockerfile index 2da3d8318..6828db521 100644 --- a/docker/bootstrap/ubuntu-20.04/Dockerfile +++ b/docker/bootstrap/ubuntu-20.04/Dockerfile @@ -17,9 +17,8 @@ ENV TERM="xterm" \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -33,5 +32,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index acee06a0b..68db2fa39 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine + +ARG BUILDARCH +ARG TARGETARCH VOLUME /etc/letsencrypt VOLUME /var/www @@ -19,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/certbot/latest/Dockerfile.jinja2 b/docker/certbot/latest/Dockerfile.jinja2 index 7096f60cd..7e54a1648 100644 --- a/docker/certbot/latest/Dockerfile.jinja2 +++ b/docker/certbot/latest/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap","alpine") }} +{{ docker.from("bootstrap", "alpine", user) }} + +{{ docker.platformArgs() }} {{ docker.volume('/etc/letsencrypt') }} {{ docker.volume('/var/www') }} diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile index 3efe10a19..9ac4a4d3e 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-20.04 +ARG BUILDARCH +ARG TARGETARCH + RUN apt-install \ build-essential \ gpg-agent \ @@ -36,6 +39,7 @@ RUN apt-install \ && bundle update --bundler \ && cd /tmp/Dockerfile \ && make setup \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR /app diff --git a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 index b48088265..6be4cd5db 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-20.04") }} +{{ docker.platformArgs() }} + RUN apt-install \ build-essential \ gpg-agent \ 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/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index e56e4364b..34021c9e5 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -5,6 +5,9 @@ FROM openjdk:8 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ 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 b/docker/liquibase/mysql/Dockerfile index a2d11d00e..2b2b1e5df 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -5,6 +5,9 @@ FROM openjdk:8 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ 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 b/docker/liquibase/postgres/Dockerfile index 0d3fb9344..3ff61f948 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -5,6 +5,9 @@ FROM openjdk:8 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ 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 b/docker/liquidsoap/latest/Dockerfile index 237cc8067..2de98787b 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:latest +FROM ghcr.io/cocoastorm/webdevops/base:latest + +ARG BUILDARCH +ARG TARGETARCH # Install services RUN /usr/local/bin/apt-install \ @@ -12,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ENV LIQUIDSOAP_USER "liquidsoap" diff --git a/docker/liquidsoap/latest/Dockerfile.jinja2 b/docker/liquidsoap/latest/Dockerfile.jinja2 index 897b4433c..df78bb9a3 100644 --- a/docker/liquidsoap/latest/Dockerfile.jinja2 +++ b/docker/liquidsoap/latest/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base","latest") }} +{{ docker.from("base", "latest", user) }} + +{{ docker.platformArgs() }} # Install services RUN /usr/local/bin/apt-install \ diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index f52260237..360241d1d 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:latest +ARG BUILDARCH +ARG TARGETARCH + ENV MAILBOX_USERNAME="dev" \ MAILBOX_PASSWORD="dev" @@ -17,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ 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 b/docker/nginx-dev/alpine/Dockerfile index 566b4d7c7..1a5cb3ec3 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:alpine +FROM 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/alpine/Dockerfile.jinja2 b/docker/nginx-dev/alpine/Dockerfile.jinja2 index 8f52c5b94..25ed8c73b 100644 --- a/docker/nginx-dev/alpine/Dockerfile.jinja2 +++ b/docker/nginx-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "alpine") }} +{{ docker.from("nginx", "alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index a673b3511..b127ca4ff 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:centos-7 +FROM 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/centos-7/Dockerfile.jinja2 b/docker/nginx-dev/centos-7/Dockerfile.jinja2 index 2d8e5c132..48dac02a5 100644 --- a/docker/nginx-dev/centos-7/Dockerfile.jinja2 +++ b/docker/nginx-dev/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "centos-7") }} +{{ docker.from("nginx", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/debian-10/Dockerfile b/docker/nginx-dev/debian-10/Dockerfile index 2d25a5abc..aeb9ec33d 100644 --- a/docker/nginx-dev/debian-10/Dockerfile +++ b/docker/nginx-dev/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:debian-10 +FROM 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-10/Dockerfile.jinja2 b/docker/nginx-dev/debian-10/Dockerfile.jinja2 index f37f1ea7d..d700b50d8 100644 --- a/docker/nginx-dev/debian-10/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "debian-10") }} +{{ docker.from("nginx", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 1428b820d..2a142d663 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:debian-7 +FROM 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-7/Dockerfile.jinja2 b/docker/nginx-dev/debian-7/Dockerfile.jinja2 index 93312e20a..883c30e6f 100644 --- a/docker/nginx-dev/debian-7/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "debian-7") }} +{{ docker.from("nginx", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index b246149e8..00e07f532 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:debian-8 +FROM 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-8/Dockerfile.jinja2 b/docker/nginx-dev/debian-8/Dockerfile.jinja2 index 49ce203dc..93e1f0be4 100644 --- a/docker/nginx-dev/debian-8/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "debian-8") }} +{{ docker.from("nginx", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index ae8d42a78..e14acf84e 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:debian-9 +FROM 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/debian-9/Dockerfile.jinja2 b/docker/nginx-dev/debian-9/Dockerfile.jinja2 index 51d446f92..ce51d6087 100644 --- a/docker/nginx-dev/debian-9/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "debian-9") }} +{{ docker.from("nginx", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 1a243c9fc..ef6907501 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-12.04 +FROM 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-12.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 index 971727ada..ffbedfc45 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-12.04") }} +{{ docker.from("nginx", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index 9065f3404..b057c5c8a 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-14.04 +FROM 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-14.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 index da04d9517..46167e6c5 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-14.04") }} +{{ docker.from("nginx", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index afbe221a8..863adef0e 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-15.04 +FROM 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.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 index 7a21ddd99..95fb712f2 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-15.04") }} +{{ docker.from("nginx", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 7be31c871..5513bd168 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-15.10 +FROM 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-15.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 index 73633cffd..5556d42e3 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-15.10") }} +{{ docker.from("nginx", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 14318b16c..f8891b989 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-16.04 +FROM 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.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 index 2d43c04b1..115ba923f 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-16.04") }} +{{ docker.from("nginx", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 82ea50f4e..666060dff 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-16.10 +FROM 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-16.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 index cfb579db6..7ee2570b8 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-16.10") }} +{{ docker.from("nginx", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-17.04/Dockerfile b/docker/nginx-dev/ubuntu-17.04/Dockerfile index be1263480..9a9c32319 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-17.04 +FROM 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.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 index 91c5cb8d0..1576134c4 100644 --- a/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-17.04") }} +{{ docker.from("nginx", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-17.10/Dockerfile b/docker/nginx-dev/ubuntu-17.10/Dockerfile index 386e2f7ae..a803f1ec8 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-17.10 +FROM 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-17.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 index d4ac06702..ce85f8e29 100644 --- a/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-17.10") }} +{{ docker.from("nginx", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx-dev/ubuntu-18.04/Dockerfile b/docker/nginx-dev/ubuntu-18.04/Dockerfile index c6bb51b8e..36a318ab0 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:ubuntu-18.04 +FROM 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-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 index 366236b5e..4cbc1950c 100644 --- a/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("nginx", "ubuntu-18.04") }} +{{ docker.from("nginx", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ environment.webDevelopment() }} diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index 78e95b4a9..eace734c4 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ 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/nginx/alpine/Dockerfile.jinja2 b/docker/nginx/alpine/Dockerfile.jinja2 index c7033f9b9..da12c8533 100644 --- a/docker/nginx/alpine/Dockerfile.jinja2 +++ b/docker/nginx/alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "alpine") }} +{{ docker.from("base", "alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index e212ff808..b31ddf252 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:centos-7 +FROM ghcr.io/cocoastorm/webdevops/base:centos-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install tools && yum-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/nginx/centos-7/Dockerfile.jinja2 b/docker/nginx/centos-7/Dockerfile.jinja2 index 961199bb4..a0cf8eb1c 100644 --- a/docker/nginx/centos-7/Dockerfile.jinja2 +++ b/docker/nginx/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "centos-7") }} +{{ docker.from("base", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/debian-10/Dockerfile b/docker/nginx/debian-10/Dockerfile index 61bbdf3bb..c581ad97e 100644 --- a/docker/nginx/debian-10/Dockerfile +++ b/docker/nginx/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-10 +FROM ghcr.io/cocoastorm/webdevops/base:debian-10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -16,12 +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-run-bootstrap \ + && 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.jinja2 b/docker/nginx/debian-10/Dockerfile.jinja2 index 76014601d..46b93f89f 100644 --- a/docker/nginx/debian-10/Dockerfile.jinja2 +++ b/docker/nginx/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-10") }} +{{ docker.from("base", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} @@ -6,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 b/docker/nginx/debian-7/Dockerfile index 8662e4532..27a524aa0 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-7 +FROM ghcr.io/cocoastorm/webdevops/base:debian-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -16,12 +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-run-bootstrap \ + && 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.jinja2 b/docker/nginx/debian-7/Dockerfile.jinja2 index abb19cad8..ec654714a 100644 --- a/docker/nginx/debian-7/Dockerfile.jinja2 +++ b/docker/nginx/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-7") }} +{{ docker.from("base", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} @@ -6,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 b/docker/nginx/debian-8/Dockerfile index ac11cbda8..6ca74b9d3 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-8 +FROM ghcr.io/cocoastorm/webdevops/base:debian-8 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -16,12 +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-run-bootstrap \ + && 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.jinja2 b/docker/nginx/debian-8/Dockerfile.jinja2 index 546cadc59..6623f2a27 100644 --- a/docker/nginx/debian-8/Dockerfile.jinja2 +++ b/docker/nginx/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-8") }} +{{ docker.from("base", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} @@ -6,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 b/docker/nginx/debian-9/Dockerfile index 3a1e9be84..69613a5d8 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:debian-9 +FROM ghcr.io/cocoastorm/webdevops/base:debian-9 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -16,12 +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-run-bootstrap \ + && 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.jinja2 b/docker/nginx/debian-9/Dockerfile.jinja2 index 57ddf2971..929439161 100644 --- a/docker/nginx/debian-9/Dockerfile.jinja2 +++ b/docker/nginx/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "debian-9") }} +{{ docker.from("base", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} @@ -6,7 +8,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','stretch') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 891e6e55f..a225e7923 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-12.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 index 58d8dc0ba..fa97e3aa8 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-12.04") }} +{{ docker.from("base", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 6971cbe75..e62070f25 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-14.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 index df578015a..0597cb70b 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-14.04") }} +{{ docker.from("base", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 6b7050f59..3b5a7f1d1 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 index 7e7341d27..b94d3f5e4 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-15.04") }} +{{ docker.from("base", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 82068fc9e..20877a613 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-15.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 index 26a4d4448..54df0f415 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-15.10") }} +{{ docker.from("base", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index a0da6bc41..7549e7519 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 index 867a3badb..f06669cac 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-16.04") }} +{{ docker.from("base", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 4fe5e074c..034af14da 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-16.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 index 4b0dfd55a..deb93fce6 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-16.10") }} +{{ docker.from("base", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-17.04/Dockerfile b/docker/nginx/ubuntu-17.04/Dockerfile index 72490a06f..36e175007 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile +++ b/docker/nginx/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-17.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 index 4ef4cc124..11fe01f67 100644 --- a/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-17.04") }} +{{ docker.from("base", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-17.10/Dockerfile b/docker/nginx/ubuntu-17.10/Dockerfile index c7519ce21..8b984b7aa 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile +++ b/docker/nginx/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-17.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-17.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 index bfaa2244c..f6eb8e643 100644 --- a/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-17.10") }} +{{ docker.from("base", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/nginx/ubuntu-18.04/Dockerfile b/docker/nginx/ubuntu-18.04/Dockerfile index d3ffb08f0..2c05bc074 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile +++ b/docker/nginx/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/base:ubuntu-18.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -18,7 +21,9 @@ RUN set -x \ # Install nginx && apt-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/nginx/ubuntu-18.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 index 0dba66880..665376a3c 100644 --- a/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "ubuntu-18.04") }} +{{ docker.from("base", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.nginx() }} diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index 0f5e9ee54..cc8043f2d 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:5.6 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.0/Dockerfile index 9c892d6df..afb219aa1 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.0 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.1-alpine/Dockerfile index a6c0ab3f3..4492773a8 100644 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ b/docker/php-apache-dev/7.1-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.1-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.1/Dockerfile index 9213c8ad8..ddf958e8d 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.1 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.2-alpine/Dockerfile index 3aab3d76e..0eb53c36a 100644 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ b/docker/php-apache-dev/7.2-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.2-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.2/Dockerfile index c7b1552cc..20bf83290 100644 --- a/docker/php-apache-dev/7.2/Dockerfile +++ b/docker/php-apache-dev/7.2/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.2 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.3-alpine/Dockerfile index 2d2045354..3e7e6bb07 100644 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ b/docker/php-apache-dev/7.3-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.3-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.3/Dockerfile index 9f4b24b2a..45f00276f 100644 --- a/docker/php-apache-dev/7.3/Dockerfile +++ b/docker/php-apache-dev/7.3/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.3 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.4-alpine/Dockerfile index 47833d129..46ec0f808 100644 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ b/docker/php-apache-dev/7.4-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.4-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/7.4/Dockerfile index 57a0ebda2..83f095d6f 100644 --- a/docker/php-apache-dev/7.4/Dockerfile +++ b/docker/php-apache-dev/7.4/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:7.4 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/8.0-alpine/Dockerfile index c67d4479a..9ce8cf214 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.0-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 index 4c7c36014..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,6 @@ -{{ docker.from("php-apache", "8.0-alpine") }} +{{ docker.from("php-apache", "8.0-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile index 7277601d3..89865dada 100644 --- a/docker/php-apache-dev/8.0/Dockerfile +++ b/docker/php-apache-dev/8.0/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.0 +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.0 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.0/Dockerfile.jinja2 b/docker/php-apache-dev/8.0/Dockerfile.jinja2 index c326cb319..7b134a76e 100644 --- a/docker/php-apache-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.0/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-apache", "8.0") }} +{{ docker.from("php-apache", "8.0", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index 8784b61e7..c19a14366 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.1-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && 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 index 7abed43e5..26125e1cc 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-apache", "8.1-alpine") }} +{{ docker.from("php-apache", "8.1-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/8.1/Dockerfile b/docker/php-apache-dev/8.1/Dockerfile index 6d118bd97..cd237470f 100644 --- a/docker/php-apache-dev/8.1/Dockerfile +++ b/docker/php-apache-dev/8.1/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.1 +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.1 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.1/Dockerfile.jinja2 b/docker/php-apache-dev/8.1/Dockerfile.jinja2 index 797fe355c..765f7d051 100644 --- a/docker/php-apache-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.1/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-apache", "8.1") }} +{{ docker.from("php-apache", "8.1", user) }} + +{{ docker.platformArgs() }} {{ 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 aa6e765a1..20f4e61aa 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.2-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 index 8277c3a77..e6fd7ac4d 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-apache", "8.2-alpine") }} +{{ docker.from("php-apache", "8.2-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/8.2/Dockerfile b/docker/php-apache-dev/8.2/Dockerfile index 744f95562..ff7d85677 100644 --- a/docker/php-apache-dev/8.2/Dockerfile +++ b/docker/php-apache-dev/8.2/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-apache:8.2 +FROM ghcr.io/cocoastorm/webdevops/php-apache:8.2 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-apache-dev/8.2/Dockerfile.jinja2 b/docker/php-apache-dev/8.2/Dockerfile.jinja2 index 90a2b69c5..386b3ab07 100644 --- a/docker/php-apache-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.2/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-apache", "8.2") }} +{{ docker.from("php-apache", "8.2", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 79cf3428b..4cb5a17ea 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:centos-7-php56 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -31,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/centos-7-php7/Dockerfile index a9d6ddff7..d027cf839 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:centos-7-php7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -31,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/centos-7/Dockerfile index 52fc8a51f..fc445aaed 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:centos-7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -32,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/debian-10/Dockerfile index 13f3ae66c..e51d93c2a 100644 --- a/docker/php-apache-dev/debian-10/Dockerfile +++ b/docker/php-apache-dev/debian-10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:debian-10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/debian-7/Dockerfile index bffdc9062..94cf54939 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:debian-7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/debian-8-php7/Dockerfile index c40c6886b..847b89413 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:debian-8-php7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/debian-8/Dockerfile index ebbe4275d..de70a7351 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:debian-8 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/debian-9/Dockerfile index 6f29afbaa..e041e8f55 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:debian-9 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 521505f8a..4eb976513 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-12.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 0a4cb38c6..63841e831 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-14.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index e6433856c..b517ece03 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-15.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index b612158d8..04fc6a5f3 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-15.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 90a86b386..1691faf2f 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-16.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index f86a3d697..d6d4ccd7c 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-16.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-17.04/Dockerfile index ccbdde509..8f6c82494 100644 --- a/docker/php-apache-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-17.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-17.10/Dockerfile index ab75db046..84a8a3204 100644 --- a/docker/php-apache-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-17.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache-dev/ubuntu-18.04/Dockerfile index bee2acdcd..1665f8303 100644 --- a/docker/php-apache-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-apache:ubuntu-18.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-apache/5.6/Dockerfile index 814756aaf..8b7d213dd 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/5.6/Dockerfile.jinja2 b/docker/php-apache/5.6/Dockerfile.jinja2 index c5a340291..c2629c958 100644 --- a/docker/php-apache/5.6/Dockerfile.jinja2 +++ b/docker/php-apache/5.6/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "5.6") }} +{{ docker.from("php", "5.6", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index b64dd568a..d4e182b6a 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.0/Dockerfile.jinja2 b/docker/php-apache/7.0/Dockerfile.jinja2 index 4e656bcc4..48b9a6bc4 100644 --- a/docker/php-apache/7.0/Dockerfile.jinja2 +++ b/docker/php-apache/7.0/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.0") }} +{{ docker.from("php", "7.0", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.1-alpine/Dockerfile b/docker/php-apache/7.1-alpine/Dockerfile index 75b10d69a..ac7c0b7ad 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile +++ b/docker/php-apache/7.1-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 b/docker/php-apache/7.1-alpine/Dockerfile.jinja2 index b4b06a628..82766465e 100644 --- a/docker/php-apache/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.1-alpine") }} +{{ docker.from("php", "7.1-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index edf258c27..31bb14492 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1/Dockerfile.jinja2 b/docker/php-apache/7.1/Dockerfile.jinja2 index fdec6e0a6..4b349d0ff 100644 --- a/docker/php-apache/7.1/Dockerfile.jinja2 +++ b/docker/php-apache/7.1/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.1") }} +{{ docker.from("php", "7.1", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.2-alpine/Dockerfile b/docker/php-apache/7.2-alpine/Dockerfile index 331543c16..45eb7ef64 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile +++ b/docker/php-apache/7.2-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 b/docker/php-apache/7.2-alpine/Dockerfile.jinja2 index 9088053de..5a971df40 100644 --- a/docker/php-apache/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.2-alpine") }} +{{ docker.from("php", "7.2-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.2/Dockerfile b/docker/php-apache/7.2/Dockerfile index 97007693d..922d5d5da 100644 --- a/docker/php-apache/7.2/Dockerfile +++ b/docker/php-apache/7.2/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.2/Dockerfile.jinja2 b/docker/php-apache/7.2/Dockerfile.jinja2 index acc3b1cb5..733815558 100644 --- a/docker/php-apache/7.2/Dockerfile.jinja2 +++ b/docker/php-apache/7.2/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.2") }} +{{ docker.from("php", "7.2", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.3-alpine/Dockerfile b/docker/php-apache/7.3-alpine/Dockerfile index 91f909b3a..8ddb6b4a4 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile +++ b/docker/php-apache/7.3-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 b/docker/php-apache/7.3-alpine/Dockerfile.jinja2 index 0a5d39962..d94f16f05 100644 --- a/docker/php-apache/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.3-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.3-alpine") }} +{{ docker.from("php", "7.3-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.3/Dockerfile b/docker/php-apache/7.3/Dockerfile index fd714a495..9b906ead2 100644 --- a/docker/php-apache/7.3/Dockerfile +++ b/docker/php-apache/7.3/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.3/Dockerfile.jinja2 b/docker/php-apache/7.3/Dockerfile.jinja2 index d9056be53..7725b315d 100644 --- a/docker/php-apache/7.3/Dockerfile.jinja2 +++ b/docker/php-apache/7.3/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.3") }} +{{ docker.from("php", "7.3", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.4-alpine/Dockerfile b/docker/php-apache/7.4-alpine/Dockerfile index 8f408c631..95b349d1b 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile +++ b/docker/php-apache/7.4-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 b/docker/php-apache/7.4-alpine/Dockerfile.jinja2 index aec341e3e..3ea3bf7e9 100644 --- a/docker/php-apache/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/7.4-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.4-alpine") }} +{{ docker.from("php", "7.4-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.4/Dockerfile b/docker/php-apache/7.4/Dockerfile index 68581a393..51e4993ad 100644 --- a/docker/php-apache/7.4/Dockerfile +++ b/docker/php-apache/7.4/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.4/Dockerfile.jinja2 b/docker/php-apache/7.4/Dockerfile.jinja2 index c909b094e..b85564385 100644 --- a/docker/php-apache/7.4/Dockerfile.jinja2 +++ b/docker/php-apache/7.4/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.4") }} +{{ docker.from("php", "7.4", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 66ac95743..63fccc090 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 index 9c90154e7..4f0b50527 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.0-alpine") }} +{{ docker.from("php", "8.0-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.0/Dockerfile b/docker/php-apache/8.0/Dockerfile index 490718e17..77d3282c5 100644 --- a/docker/php-apache/8.0/Dockerfile +++ b/docker/php-apache/8.0/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.0/Dockerfile.jinja2 b/docker/php-apache/8.0/Dockerfile.jinja2 index 8b5669e52..07a6e7f42 100644 --- a/docker/php-apache/8.0/Dockerfile.jinja2 +++ b/docker/php-apache/8.0/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.0") }} +{{ docker.from("php", "8.0", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile index 9c6f00f7b..fb45517b0 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile +++ b/docker/php-apache/8.1-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && 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 index 11c65544c..cbbbbe4e9 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.1-alpine") }} +{{ 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 c25caa8c6..a1e54f706 100644 --- a/docker/php-apache/8.1/Dockerfile +++ b/docker/php-apache/8.1/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1 +FROM ghcr.io/cocoastorm/webdevops/php:8.1 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.1/Dockerfile.jinja2 b/docker/php-apache/8.1/Dockerfile.jinja2 index d8302f97f..f30906e96 100644 --- a/docker/php-apache/8.1/Dockerfile.jinja2 +++ b/docker/php-apache/8.1/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.1") }} +{{ docker.from("php", "8.1", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.2-alpine/Dockerfile b/docker/php-apache/8.2-alpine/Dockerfile index 6c061c99a..806ac26ff 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile +++ b/docker/php-apache/8.2-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 index c358fef80..9eecdef6f 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.2-alpine") }} +{{ docker.from("php", "8.2-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/8.2/Dockerfile b/docker/php-apache/8.2/Dockerfile index f22e868e5..2a99956bd 100644 --- a/docker/php-apache/8.2/Dockerfile +++ b/docker/php-apache/8.2/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2 +FROM ghcr.io/cocoastorm/webdevops/php:8.2 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/8.2/Dockerfile.jinja2 b/docker/php-apache/8.2/Dockerfile.jinja2 index 5542d2e07..d78ad0c6c 100644 --- a/docker/php-apache/8.2/Dockerfile.jinja2 +++ b/docker/php-apache/8.2/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.2") }} +{{ docker.from("php", "8.2", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index 9b8c54aa4..ab6598c77 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -23,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 index 0fee44954..353a85626 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7-php56") }} +{{ docker.from("php", "centos-7-php56", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 00ccd90bc..869d016e1 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -23,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 index 662be2fcf..f4ad3b365 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7-php7") }} +{{ docker.from("php", "centos-7-php7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 2b9a4dc7c..c9ac5e070 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -23,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7/Dockerfile.jinja2 b/docker/php-apache/centos-7/Dockerfile.jinja2 index 1d0c9c421..ca78b6aa5 100644 --- a/docker/php-apache/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7") }} +{{ docker.from("php", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-10/Dockerfile b/docker/php-apache/debian-10/Dockerfile index de913be0f..d2bf8d581 100644 --- a/docker/php-apache/debian-10/Dockerfile +++ b/docker/php-apache/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-10/Dockerfile.jinja2 b/docker/php-apache/debian-10/Dockerfile.jinja2 index ed56ca48a..906e2a856 100644 --- a/docker/php-apache/debian-10/Dockerfile.jinja2 +++ b/docker/php-apache/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-10") }} +{{ docker.from("php", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 9c1c8b31a..4649facf8 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -26,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ - && 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/debian-7/Dockerfile.jinja2 b/docker/php-apache/debian-7/Dockerfile.jinja2 index 34c188bdf..eb6932f4c 100644 --- a/docker/php-apache/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-7") }} +{{ docker.from("php", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 09ab61bf5..545c3433d 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ - && 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/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 index dd4392727..768aa908c 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-8-php7") }} +{{ docker.from("php", "debian-8-php7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index b52a2175a..b32b076c4 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup \ - && 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/debian-8/Dockerfile.jinja2 b/docker/php-apache/debian-8/Dockerfile.jinja2 index 86ddfa3b7..fdcfd0005 100644 --- a/docker/php-apache/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-8") }} +{{ docker.from("php", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 734d0d02e..fea96be26 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-9/Dockerfile.jinja2 b/docker/php-apache/debian-9/Dockerfile.jinja2 index ea8031e86..88e319bac 100644 --- a/docker/php-apache/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-9") }} +{{ docker.from("php", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index c7a6721a5..db7e27da6 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 index c14199870..d6d8a9e1d 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-12.04") }} +{{ docker.from("php", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 84fccd722..ce1d1123f 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 index 36fba97b0..90ca74e4d 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-14.04") }} +{{ docker.from("php", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 138411e39..de302ca63 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 index e90c50e36..002a55ff8 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-15.04") }} +{{ docker.from("php", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index e06e72579..c076f8dae 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 index 72f309781..d29bf064c 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-15.10") }} +{{ docker.from("php", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 651e01312..1872cad33 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 index 7439946f1..bf3521379 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-16.04") }} +{{ docker.from("php", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index d925aa216..dfd217899 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 index 294b0e545..66861e1ae 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-16.10") }} +{{ docker.from("php", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile b/docker/php-apache/ubuntu-17.04/Dockerfile index f1e61b697..608a41685 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile +++ b/docker/php-apache/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 index 819accab9..9aeafcf10 100644 --- a/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-17.04") }} +{{ docker.from("php", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile b/docker/php-apache/ubuntu-17.10/Dockerfile index 3bf5c65b6..a85cc5b49 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile +++ b/docker/php-apache/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 index be9266856..07c64e006 100644 --- a/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-17.10") }} +{{ docker.from("php", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile b/docker/php-apache/ubuntu-18.04/Dockerfile index 592c8f887..af5588097 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile +++ b/docker/php-apache/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -25,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 index 42a00a2d1..8cf8b4af9 100644 --- a/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-18.04") }} +{{ docker.from("php", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index a898438a8..0b82b0f4a 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/5.6/Dockerfile.jinja2 b/docker/php-dev/5.6/Dockerfile.jinja2 index 2784a4e3c..f9ec2bb38 100644 --- a/docker/php-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-dev/5.6/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "5.6") }} +{{ docker.from("php", "5.6", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 7d3295b42..d7123a86e 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.0/Dockerfile.jinja2 b/docker/php-dev/7.0/Dockerfile.jinja2 index d7a9901b7..a05f16d8c 100644 --- a/docker/php-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-dev/7.0/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.0") }} +{{ docker.from("php", "7.0", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.1-alpine/Dockerfile b/docker/php-dev/7.1-alpine/Dockerfile index d56dda9e2..68dcbc236 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ b/docker/php-dev/7.1-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 b/docker/php-dev/7.1-alpine/Dockerfile.jinja2 index 2e48ff0f9..6372730b8 100644 --- a/docker/php-dev/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.1-alpine") }} +{{ docker.from("php", "7.1-alpine", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 42d845f61..2e4fd5684 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.1/Dockerfile.jinja2 b/docker/php-dev/7.1/Dockerfile.jinja2 index 86f846804..80275a2b5 100644 --- a/docker/php-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-dev/7.1/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.1") }} +{{ docker.from("php", "7.1", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.2-alpine/Dockerfile b/docker/php-dev/7.2-alpine/Dockerfile index a2586ad85..166d4734b 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ b/docker/php-dev/7.2-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 b/docker/php-dev/7.2-alpine/Dockerfile.jinja2 index 7fd85c2c1..59c8dc70b 100644 --- a/docker/php-dev/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.2-alpine") }} +{{ docker.from("php", "7.2-alpine", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.2/Dockerfile b/docker/php-dev/7.2/Dockerfile index 9d5ce4a3b..0ae352cbe 100644 --- a/docker/php-dev/7.2/Dockerfile +++ b/docker/php-dev/7.2/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.2/Dockerfile.jinja2 b/docker/php-dev/7.2/Dockerfile.jinja2 index 7a89a2e2a..e5ad542f9 100644 --- a/docker/php-dev/7.2/Dockerfile.jinja2 +++ b/docker/php-dev/7.2/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.2") }} +{{ docker.from("php", "7.2", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.3-alpine/Dockerfile b/docker/php-dev/7.3-alpine/Dockerfile index 0164825ac..cdd35263d 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ b/docker/php-dev/7.3-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 b/docker/php-dev/7.3-alpine/Dockerfile.jinja2 index c67e711c0..cc2c0afea 100644 --- a/docker/php-dev/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.3-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.3-alpine") }} +{{ docker.from("php", "7.3-alpine", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile index 5c53a4cfa..b481bbf2a 100644 --- a/docker/php-dev/7.3/Dockerfile +++ b/docker/php-dev/7.3/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.3/Dockerfile.jinja2 b/docker/php-dev/7.3/Dockerfile.jinja2 index 54a1dcc8c..e9301e47d 100644 --- a/docker/php-dev/7.3/Dockerfile.jinja2 +++ b/docker/php-dev/7.3/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.3") }} +{{ docker.from("php", "7.3", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.4-alpine/Dockerfile b/docker/php-dev/7.4-alpine/Dockerfile index 33dd4f39b..e7697ab21 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ b/docker/php-dev/7.4-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 b/docker/php-dev/7.4-alpine/Dockerfile.jinja2 index 9724ff1e6..e5f71b16f 100644 --- a/docker/php-dev/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/7.4-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.4-alpine") }} +{{ docker.from("php", "7.4-alpine", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/7.4/Dockerfile b/docker/php-dev/7.4/Dockerfile index 6293b0ab4..55765d457 100644 --- a/docker/php-dev/7.4/Dockerfile +++ b/docker/php-dev/7.4/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/7.4/Dockerfile.jinja2 b/docker/php-dev/7.4/Dockerfile.jinja2 index c7a70850b..25852b2b0 100644 --- a/docker/php-dev/7.4/Dockerfile.jinja2 +++ b/docker/php-dev/7.4/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.4") }} +{{ docker.from("php", "7.4", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index 1d8cf4f16..3f7bf631c 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 index 99986a428..537bc8bfc 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.0-alpine") }} +{{ docker.from("php", "8.0-alpine", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile index 338aca88e..470390750 100644 --- a/docker/php-dev/8.0/Dockerfile +++ b/docker/php-dev/8.0/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.0/Dockerfile.jinja2 b/docker/php-dev/8.0/Dockerfile.jinja2 index f4c82a53c..4277f927c 100644 --- a/docker/php-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-dev/8.0/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.0") }} +{{ docker.from("php", "8.0", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index bec9c6118..1cb6cba92 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 index 1357fad41..91c2bed53 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.1-alpine") }} +{{ docker.from("php", "8.1-alpine", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.1/Dockerfile b/docker/php-dev/8.1/Dockerfile index e4d54a2a5..c68f32767 100644 --- a/docker/php-dev/8.1/Dockerfile +++ b/docker/php-dev/8.1/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1 +FROM ghcr.io/cocoastorm/webdevops/php:8.1 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.1/Dockerfile.jinja2 b/docker/php-dev/8.1/Dockerfile.jinja2 index f216cf16d..59bebaf31 100644 --- a/docker/php-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-dev/8.1/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.1") }} +{{ docker.from("php", "8.1", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.2-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile index 61fe7e220..39e6f5665 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile +++ b/docker/php-dev/8.2-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -25,5 +28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 index 1e8ba3c32..71fc56d03 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.2-alpine") }} +{{ docker.from("php", "8.2-alpine", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/8.2/Dockerfile b/docker/php-dev/8.2/Dockerfile index 8a150ce73..a84193f8a 100644 --- a/docker/php-dev/8.2/Dockerfile +++ b/docker/php-dev/8.2/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2 +FROM ghcr.io/cocoastorm/webdevops/php:8.2 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -20,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/8.2/Dockerfile.jinja2 b/docker/php-dev/8.2/Dockerfile.jinja2 index 7a18a592b..8fc64e2fc 100644 --- a/docker/php-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-dev/8.2/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.2") }} +{{ docker.from("php", "8.2", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 688e2cee3..8577440b8 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -23,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 index e039c4ec6..2f248d85d 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7-php56") }} +{{ docker.from("php", "centos-7-php56", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index 70a319bbf..e5d70d0a6 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -23,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 index ce1e84eff..527a4895c 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7-php7") }} +{{ docker.from("php", "centos-7-php7", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 3332c014c..7aeaf786c 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -24,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/centos-7/Dockerfile.jinja2 b/docker/php-dev/centos-7/Dockerfile.jinja2 index bf30efd47..2f7fd5b06 100644 --- a/docker/php-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7") }} +{{ docker.from("php", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-10/Dockerfile b/docker/php-dev/debian-10/Dockerfile index 229a4ad67..7e1e07e32 100644 --- a/docker/php-dev/debian-10/Dockerfile +++ b/docker/php-dev/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-10/Dockerfile.jinja2 b/docker/php-dev/debian-10/Dockerfile.jinja2 index 68c8e7f6c..2167d4575 100644 --- a/docker/php-dev/debian-10/Dockerfile.jinja2 +++ b/docker/php-dev/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-10") }} +{{ docker.from("php", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index c18141949..81dcdcfbe 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-7/Dockerfile.jinja2 b/docker/php-dev/debian-7/Dockerfile.jinja2 index 08ddcc85a..dfebc302f 100644 --- a/docker/php-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-dev/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-7") }} +{{ docker.from("php", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index d3c526994..00073771e 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 index 05ef2ed1f..2f9153d3f 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-8-php7") }} +{{ docker.from("php", "debian-8-php7", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 28279c0ac..3fc5d447b 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-8/Dockerfile.jinja2 b/docker/php-dev/debian-8/Dockerfile.jinja2 index b668f7401..bd82ec98a 100644 --- a/docker/php-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-dev/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-8") }} +{{ docker.from("php", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index bd9842099..2b570afac 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/debian-9/Dockerfile.jinja2 b/docker/php-dev/debian-9/Dockerfile.jinja2 index b1f16cece..b49994556 100644 --- a/docker/php-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-dev/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-9") }} +{{ docker.from("php", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index d121f5c46..4418c41d3 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 index 119ce01e3..1b9e049f4 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-12.04") }} +{{ docker.from("php", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 2cbd914d9..ec323385f 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 index 78bea4553..f5e1d4a6b 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-14.04") }} +{{ docker.from("php", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 2bc17f4ea..7f4cfffe8 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 index 43f9b2d82..4826a4f47 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-15.04") }} +{{ docker.from("php", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 1071eb532..e5ddbd62c 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 index f0f76b8dc..5b520c14b 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-15.10") }} +{{ docker.from("php", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 5397df672..d90450b3f 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 index 31260dbf8..804e2a300 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-16.04") }} +{{ docker.from("php", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index c839b5005..775ca2af8 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 index 23bb414f5..fbf5d3f62 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-16.10") }} +{{ docker.from("php", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile b/docker/php-dev/ubuntu-17.04/Dockerfile index a8eedfc41..e8964facb 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-dev/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 index 68e0f22b1..fad47138a 100644 --- a/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-17.04") }} +{{ docker.from("php", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile b/docker/php-dev/ubuntu-17.10/Dockerfile index f9ffc2105..1b53f0c6d 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-dev/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 index 0c0bd6853..d67a901db 100644 --- a/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-17.10") }} +{{ docker.from("php", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile b/docker/php-dev/ubuntu-18.04/Dockerfile index 92308e997..22ec4e5cd 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-dev/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 + +ARG BUILDARCH +ARG TARGETARCH COPY conf/ /opt/docker/ @@ -27,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 index f868ff2ff..0e3c7d15f 100644 --- a/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-18.04") }} +{{ docker.from("php", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 2e66059d1..508faf15a 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:5.6 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.0/Dockerfile index d2e934393..f4aeae260 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.0 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.1-alpine/Dockerfile index c437e9283..05bc5fcf1 100644 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.1-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.1-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.1/Dockerfile index 52749cecb..2cdea1f66 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.1 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.2-alpine/Dockerfile index bbbee499c..4d81f5a06 100644 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.2-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.2-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.2/Dockerfile index 962b2840c..6f2359343 100644 --- a/docker/php-nginx-dev/7.2/Dockerfile +++ b/docker/php-nginx-dev/7.2/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.2 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.3-alpine/Dockerfile index 1fd7fd7b8..858689d92 100644 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.3-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.3-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.3/Dockerfile index d850f59c1..305dbe05f 100644 --- a/docker/php-nginx-dev/7.3/Dockerfile +++ b/docker/php-nginx-dev/7.3/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.3 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.4-alpine/Dockerfile index 34dfb843c..e49139940 100644 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ b/docker/php-nginx-dev/7.4-alpine/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.4-alpine +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/7.4/Dockerfile index 802cf0af8..d91653873 100644 --- a/docker/php-nginx-dev/7.4/Dockerfile +++ b/docker/php-nginx-dev/7.4/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.4 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/8.0-alpine/Dockerfile index 2a2f8ec32..9379817af 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.0-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 index 15a0bcd4c..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,6 @@ -{{ docker.from("php-nginx", "8.0-alpine") }} +{{ docker.from("php-nginx", "8.0-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile index cf025157f..c4770be2d 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile +++ b/docker/php-nginx-dev/8.0/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.0 +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.0 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0/Dockerfile.jinja2 index 3ca36395d..e9c86d0ee 100644 --- a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.0/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-nginx", "8.0") }} +{{ docker.from("php-nginx", "8.0", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index 3e96d5a73..0a2c98433 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.1-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && 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 index d3bd5d756..d7a07887b 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-nginx", "8.1-alpine") }} +{{ docker.from("php-nginx", "8.1-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/8.1/Dockerfile b/docker/php-nginx-dev/8.1/Dockerfile index 5f215076e..23752902f 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile +++ b/docker/php-nginx-dev/8.1/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.1 +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.1 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 index 29b063c47..2e6d1fc0f 100644 --- a/docker/php-nginx-dev/8.1/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.1/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-nginx", "8.1") }} +{{ docker.from("php-nginx", "8.1", user) }} + +{{ docker.platformArgs() }} {{ 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 7c130a99f..13bc9f56c 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.2-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -33,5 +36,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 index e2a5982ff..197895cfe 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-nginx", "8.2-alpine") }} +{{ docker.from("php-nginx", "8.2-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/8.2/Dockerfile b/docker/php-nginx-dev/8.2/Dockerfile index 0445f5372..b53852010 100644 --- a/docker/php-nginx-dev/8.2/Dockerfile +++ b/docker/php-nginx-dev/8.2/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-nginx:8.2 +FROM ghcr.io/cocoastorm/webdevops/php-nginx:8.2 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -28,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/php-nginx-dev/8.2/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2/Dockerfile.jinja2 index 073b58cc7..c3f8d6f1e 100644 --- a/docker/php-nginx-dev/8.2/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.2/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php-nginx", "8.2") }} +{{ docker.from("php-nginx", "8.2", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 9e628f253..db79ec198 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:centos-7-php56 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -31,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/centos-7-php7/Dockerfile index 200f890eb..d4e5a894c 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:centos-7-php7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -31,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/centos-7/Dockerfile index 958178e90..ac210a4c8 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:centos-7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -32,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/debian-10/Dockerfile index 1c894dbe3..be2076355 100644 --- a/docker/php-nginx-dev/debian-10/Dockerfile +++ b/docker/php-nginx-dev/debian-10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:debian-10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/debian-7/Dockerfile index 5f9a3234a..b1bcf499d 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:debian-7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 802408826..3dda33557 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:debian-8-php7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/debian-8/Dockerfile index d6d8a1eae..a96eb630a 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:debian-8 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/debian-9/Dockerfile index 46deccdcc..0ab467869 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:debian-9 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index d4fb27a40..c43c19253 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-12.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 88f1a2589..ea341f4c2 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-14.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 17e52c8f6..4fb54b414 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-15.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 5270614f7..4aef07cb5 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-15.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index b5967e002..d28830fec 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-16.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 124549f78..9fc47bb9a 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-16.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile index fa3d5d7ef..2201e4467 100644 --- a/docker/php-nginx-dev/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-17.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile index 868f5bf6e..6265552bf 100644 --- a/docker/php-nginx-dev/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-17.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-17.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile index 500ff3bcd..f9ff549c8 100644 --- a/docker/php-nginx-dev/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-18.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:ubuntu-18.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -35,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup 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 b/docker/php-nginx/5.6/Dockerfile index ef79e5347..41ae10d7e 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:5.6 +FROM ghcr.io/cocoastorm/webdevops/php:5.6 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/5.6/Dockerfile.jinja2 b/docker/php-nginx/5.6/Dockerfile.jinja2 index 0093f5432..f17152cf6 100644 --- a/docker/php-nginx/5.6/Dockerfile.jinja2 +++ b/docker/php-nginx/5.6/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "5.6") }} +{{ docker.from("php", "5.6", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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 b/docker/php-nginx/7.0/Dockerfile index f75346d8e..29d05e2fa 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.0 +FROM ghcr.io/cocoastorm/webdevops/php:7.0 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/7.0/Dockerfile.jinja2 b/docker/php-nginx/7.0/Dockerfile.jinja2 index 39af76493..7018f5535 100644 --- a/docker/php-nginx/7.0/Dockerfile.jinja2 +++ b/docker/php-nginx/7.0/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.0") }} +{{ docker.from("php", "7.0", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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-alpine/Dockerfile b/docker/php-nginx/7.1-alpine/Dockerfile index 541e7747a..2cb41a21e 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile +++ b/docker/php-nginx/7.1-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.1-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ 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/7.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 index fd23f8f8a..c6837c237 100644 --- a/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.1-alpine") }} +{{ docker.from("php", "7.1-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index eb2376a9f..0ecdee98d 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.1 +FROM ghcr.io/cocoastorm/webdevops/php:7.1 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/7.1/Dockerfile.jinja2 b/docker/php-nginx/7.1/Dockerfile.jinja2 index 0d89f2e50..875606204 100644 --- a/docker/php-nginx/7.1/Dockerfile.jinja2 +++ b/docker/php-nginx/7.1/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.1") }} +{{ docker.from("php", "7.1", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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-alpine/Dockerfile b/docker/php-nginx/7.2-alpine/Dockerfile index 56cb3cf59..0c4f77caf 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile +++ b/docker/php-nginx/7.2-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.2-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ 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/7.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 index 6801b1d54..e44556cc1 100644 --- a/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.2-alpine") }} +{{ docker.from("php", "7.2-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.2/Dockerfile b/docker/php-nginx/7.2/Dockerfile index 2e77b6cfb..25b7e468c 100644 --- a/docker/php-nginx/7.2/Dockerfile +++ b/docker/php-nginx/7.2/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.2 +FROM ghcr.io/cocoastorm/webdevops/php:7.2 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/7.2/Dockerfile.jinja2 b/docker/php-nginx/7.2/Dockerfile.jinja2 index d977be809..0efd85bbc 100644 --- a/docker/php-nginx/7.2/Dockerfile.jinja2 +++ b/docker/php-nginx/7.2/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.2") }} +{{ docker.from("php", "7.2", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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-alpine/Dockerfile b/docker/php-nginx/7.3-alpine/Dockerfile index 34093bb49..41fd7a4fb 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile +++ b/docker/php-nginx/7.3-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.3-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ 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/7.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 index f15b17152..3bd1026c4 100644 --- a/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.3-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.3-alpine") }} +{{ docker.from("php", "7.3-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.3/Dockerfile b/docker/php-nginx/7.3/Dockerfile index 959f94d73..f17b06996 100644 --- a/docker/php-nginx/7.3/Dockerfile +++ b/docker/php-nginx/7.3/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.3 +FROM ghcr.io/cocoastorm/webdevops/php:7.3 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/7.3/Dockerfile.jinja2 b/docker/php-nginx/7.3/Dockerfile.jinja2 index e92b76797..6fc60a501 100644 --- a/docker/php-nginx/7.3/Dockerfile.jinja2 +++ b/docker/php-nginx/7.3/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.3") }} +{{ docker.from("php", "7.3", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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-alpine/Dockerfile b/docker/php-nginx/7.4-alpine/Dockerfile index e796d76ad..43766c0ff 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile +++ b/docker/php-nginx/7.4-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4-alpine +FROM ghcr.io/cocoastorm/webdevops/php:7.4-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ 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/7.4-alpine/Dockerfile.jinja2 b/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 index b698bdf63..1ef5df6f4 100644 --- a/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/7.4-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.4-alpine") }} +{{ docker.from("php", "7.4-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.4/Dockerfile b/docker/php-nginx/7.4/Dockerfile index f30b9c00c..1243f5a75 100644 --- a/docker/php-nginx/7.4/Dockerfile +++ b/docker/php-nginx/7.4/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:7.4 +FROM ghcr.io/cocoastorm/webdevops/php:7.4 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/7.4/Dockerfile.jinja2 b/docker/php-nginx/7.4/Dockerfile.jinja2 index 27fee4a33..b8317a181 100644 --- a/docker/php-nginx/7.4/Dockerfile.jinja2 +++ b/docker/php-nginx/7.4/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "7.4") }} +{{ docker.from("php", "7.4", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index ea2937ac3..7c97c116c 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.0-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ 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.0-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 index 6d867c42b..f5e877e64 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.0-alpine") }} +{{ docker.from("php", "8.0-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.0/Dockerfile b/docker/php-nginx/8.0/Dockerfile index d9a1e55b8..b5c8d35d8 100644 --- a/docker/php-nginx/8.0/Dockerfile +++ b/docker/php-nginx/8.0/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.0 +FROM ghcr.io/cocoastorm/webdevops/php:8.0 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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.0/Dockerfile.jinja2 b/docker/php-nginx/8.0/Dockerfile.jinja2 index 53801851b..5a5b06554 100644 --- a/docker/php-nginx/8.0/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.0") }} +{{ docker.from("php", "8.0", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile index 39e589994..3df8b0532 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile +++ b/docker/php-nginx/8.1-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.1-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ 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-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 index 35b37682f..f79eac1df 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.1-alpine") }} +{{ docker.from("php", "8.1-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.1/Dockerfile b/docker/php-nginx/8.1/Dockerfile index 18a6087b7..a350ff421 100644 --- a/docker/php-nginx/8.1/Dockerfile +++ b/docker/php-nginx/8.1/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.1 +FROM ghcr.io/cocoastorm/webdevops/php:8.1 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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.jinja2 b/docker/php-nginx/8.1/Dockerfile.jinja2 index 4c3912db2..8e1894662 100644 --- a/docker/php-nginx/8.1/Dockerfile.jinja2 +++ b/docker/php-nginx/8.1/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.1") }} +{{ docker.from("php", "8.1", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.2-alpine/Dockerfile b/docker/php-nginx/8.2-alpine/Dockerfile index 1295f85a3..083ef8b3f 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile +++ b/docker/php-nginx/8.2-alpine/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2-alpine +FROM ghcr.io/cocoastorm/webdevops/php:8.2-alpine + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ 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.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 index 63235633a..a5b1b4235 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.2-alpine") }} +{{ docker.from("php", "8.2-alpine", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/8.2/Dockerfile b/docker/php-nginx/8.2/Dockerfile index 0253c73ef..d96fe1f79 100644 --- a/docker/php-nginx/8.2/Dockerfile +++ b/docker/php-nginx/8.2/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:8.2 +FROM ghcr.io/cocoastorm/webdevops/php:8.2 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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.2/Dockerfile.jinja2 b/docker/php-nginx/8.2/Dockerfile.jinja2 index 14e0efc61..142378fb5 100644 --- a/docker/php-nginx/8.2/Dockerfile.jinja2 +++ b/docker/php-nginx/8.2/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "8.2") }} +{{ docker.from("php", "8.2", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 826f5fd51..9ed1c7a4b 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php56 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php56 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install tools && yum-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/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 index a478b9c38..5a631384c 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7-php56") }} +{{ docker.from("php", "centos-7-php56", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 036e4e150..a0e7923b4 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7-php7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7-php7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install tools && yum-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/centos-7-php7/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 index 36931d172..f1fabfa8e 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7-php7") }} +{{ docker.from("php", "centos-7-php7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 0be8bf753..cd12b3f9b 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:centos-7 +FROM ghcr.io/cocoastorm/webdevops/php:centos-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install tools && yum-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/centos-7/Dockerfile.jinja2 b/docker/php-nginx/centos-7/Dockerfile.jinja2 index cf6399370..56644aab8 100644 --- a/docker/php-nginx/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "centos-7") }} +{{ docker.from("php", "centos-7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-10/Dockerfile b/docker/php-nginx/debian-10/Dockerfile index fe02deade..2bd9ec818 100644 --- a/docker/php-nginx/debian-10/Dockerfile +++ b/docker/php-nginx/debian-10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-10 +FROM ghcr.io/cocoastorm/webdevops/php:debian-10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/debian-10/Dockerfile.jinja2 b/docker/php-nginx/debian-10/Dockerfile.jinja2 index 117abb6c7..d739d0f33 100644 --- a/docker/php-nginx/debian-10/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-10") }} +{{ docker.from("php", "debian-10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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 b/docker/php-nginx/debian-7/Dockerfile index 6a36e4414..21d1b85d1 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/debian-7/Dockerfile.jinja2 b/docker/php-nginx/debian-7/Dockerfile.jinja2 index 6d1327571..159733ef0 100644 --- a/docker/php-nginx/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-7") }} +{{ docker.from("php", "debian-7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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 b/docker/php-nginx/debian-8-php7/Dockerfile index 8d67a4595..f32a5585f 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8-php7 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8-php7 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 index 2cd5d9326..eabec4b82 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-8-php7") }} +{{ docker.from("php", "debian-8-php7", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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 b/docker/php-nginx/debian-8/Dockerfile index 33767d6bf..e61ea959b 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-8 +FROM ghcr.io/cocoastorm/webdevops/php:debian-8 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/debian-8/Dockerfile.jinja2 b/docker/php-nginx/debian-8/Dockerfile.jinja2 index bc075df69..22f35f116 100644 --- a/docker/php-nginx/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-8") }} +{{ docker.from("php", "debian-8", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,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 b/docker/php-nginx/debian-9/Dockerfile index e2b0311cc..471255e2e 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:debian-9 +FROM ghcr.io/cocoastorm/webdevops/php:debian-9 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -17,12 +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-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/debian-9/Dockerfile.jinja2 b/docker/php-nginx/debian-9/Dockerfile.jinja2 index cbcddf811..91462c7e4 100644 --- a/docker/php-nginx/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-9/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "debian-9") }} +{{ docker.from("php", "debian-9", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} @@ -7,7 +9,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ nginx.debian() }} \ + {{ nginx.debian('','stretch') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 60fee0b4d..2c6fb9ef1 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-12.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-12.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 index 893418fa5..d8048fe76 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-12.04") }} +{{ docker.from("php", "ubuntu-12.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 648f6baa1..9b8691258 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-14.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-14.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 index a55c4827d..bce764aba 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-14.04") }} +{{ docker.from("php", "ubuntu-14.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 5342b4d7d..5c8184473 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 index 2a6a21cc7..f3a2f0a8f 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-15.04") }} +{{ docker.from("php", "ubuntu-15.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index ec8108e43..7aa54217b 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-15.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-15.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 index fb951871c..5d911d8d2 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-15.10") }} +{{ docker.from("php", "ubuntu-15.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 6dd1e9c7b..55cb6b8e2 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 index 22b062520..435fba5cc 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-16.04") }} +{{ docker.from("php", "ubuntu-16.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 41f28c3df..372729739 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-16.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-16.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 index 5d3edb8f0..62e498643 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-16.10") }} +{{ docker.from("php", "ubuntu-16.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-17.04/Dockerfile b/docker/php-nginx/ubuntu-17.04/Dockerfile index 435561ec6..d584ea747 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-17.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 index 032a9934b..50f547419 100644 --- a/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-17.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-17.04") }} +{{ docker.from("php", "ubuntu-17.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-17.10/Dockerfile b/docker/php-nginx/ubuntu-17.10/Dockerfile index 612b33846..753774015 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-17.10 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-17.10 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-17.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 index 6d11cd573..c07ec39dd 100644 --- a/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-17.10/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-17.10") }} +{{ docker.from("php", "ubuntu-17.10", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-18.04/Dockerfile b/docker/php-nginx/ubuntu-18.04/Dockerfile index 8a583738b..c2906e8fa 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:ubuntu-18.04 +FROM ghcr.io/cocoastorm/webdevops/php:ubuntu-18.04 + +ARG BUILDARCH +ARG TARGETARCH ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ @@ -19,7 +22,9 @@ RUN set -x \ # Install nginx && apt-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/ubuntu-18.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 index 5a32a47aa..3cb77bfff 100644 --- a/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-18.04/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("php", "ubuntu-18.04") }} +{{ docker.from("php", "ubuntu-18.04", user) }} + +{{ docker.platformArgs() }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-20.04/Dockerfile b/docker/php-nginx/ubuntu-20.04/Dockerfile index f0f63c5d8..7c45309c8 100644 --- a/docker/php-nginx/ubuntu-20.04/Dockerfile +++ b/docker/php-nginx/ubuntu-20.04/Dockerfile @@ -19,7 +19,9 @@ RUN set -x \ # Install nginx && apt-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-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 0953a1976..d1d14ffdb 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -6,6 +6,9 @@ FROM php:5.6-fpm-stretch +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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 \ @@ -139,7 +145,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -207,7 +213,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/5.6/Dockerfile.jinja2 b/docker/php-official/5.6/Dockerfile.jinja2 index d2c709a84..79f8a0ad8 100644 --- a/docker/php-official/5.6/Dockerfile.jinja2 +++ b/docker/php-official/5.6/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "5.6-fpm-stretch") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 79021199d..82a273bfa 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.0-fpm-stretch +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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 \ @@ -139,7 +145,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -212,7 +218,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.0/Dockerfile.jinja2 b/docker/php-official/7.0/Dockerfile.jinja2 index bdaeba431..90a47635c 100644 --- a/docker/php-official/7.0/Dockerfile.jinja2 +++ b/docker/php-official/7.0/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.0-fpm-stretch") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile index e63d2bab0..c73203489 100644 --- a/docker/php-official/7.1-alpine/Dockerfile +++ b/docker/php-official/7.1-alpine/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.1-fpm-alpine +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -28,9 +31,8 @@ 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 --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/ @@ -63,11 +65,15 @@ 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 +85,9 @@ 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 \ @@ -162,7 +170,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ @@ -226,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1-alpine/Dockerfile.jinja2 b/docker/php-official/7.1-alpine/Dockerfile.jinja2 index bab695a85..d641f4980 100644 --- a/docker/php-official/7.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.1-alpine/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.1-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/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index a13ec5969..559fc896c 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.1-fpm-buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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 \ @@ -139,7 +145,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -212,7 +218,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1/Dockerfile.jinja2 b/docker/php-official/7.1/Dockerfile.jinja2 index e89ef35ca..46dbbfd8f 100644 --- a/docker/php-official/7.1/Dockerfile.jinja2 +++ b/docker/php-official/7.1/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.1-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile index f49243351..e9f261546 100644 --- a/docker/php-official/7.2-alpine/Dockerfile +++ b/docker/php-official/7.2-alpine/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.2-fpm-alpine +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -28,9 +31,8 @@ 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 --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/ @@ -63,11 +65,15 @@ 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 +85,9 @@ 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 \ @@ -162,7 +170,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ @@ -230,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.2-alpine/Dockerfile.jinja2 b/docker/php-official/7.2-alpine/Dockerfile.jinja2 index f79e75ed4..65eaa3bfa 100644 --- a/docker/php-official/7.2-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.2-alpine/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.2-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/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile index 71dd6d72d..65b949cd1 100644 --- a/docker/php-official/7.2/Dockerfile +++ b/docker/php-official/7.2/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.2-fpm-buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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 \ @@ -139,7 +145,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -211,7 +217,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.2/Dockerfile.jinja2 b/docker/php-official/7.2/Dockerfile.jinja2 index 9f8fc29f9..19cb27f16 100644 --- a/docker/php-official/7.2/Dockerfile.jinja2 +++ b/docker/php-official/7.2/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.2-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile index e6c9b320a..5e114e345 100644 --- a/docker/php-official/7.3-alpine/Dockerfile +++ b/docker/php-official/7.3-alpine/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.3-fpm-alpine +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -28,9 +31,8 @@ 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 --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/ @@ -63,11 +65,15 @@ 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 +85,9 @@ 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 \ @@ -162,7 +170,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ @@ -230,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.3-alpine/Dockerfile.jinja2 b/docker/php-official/7.3-alpine/Dockerfile.jinja2 index bbbfc0e00..dd76ac2f2 100644 --- a/docker/php-official/7.3-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.3-alpine/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.3-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/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile index b69a08538..8c59cd073 100644 --- a/docker/php-official/7.3/Dockerfile +++ b/docker/php-official/7.3/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.3-fpm-buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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 \ @@ -139,7 +145,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -211,7 +217,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.3/Dockerfile.jinja2 b/docker/php-official/7.3/Dockerfile.jinja2 index b0c9245e2..c4fd1103c 100644 --- a/docker/php-official/7.3/Dockerfile.jinja2 +++ b/docker/php-official/7.3/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.3-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile index 003b52fce..9bdd1223f 100644 --- a/docker/php-official/7.4-alpine/Dockerfile +++ b/docker/php-official/7.4-alpine/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.4-fpm-alpine +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -28,9 +31,8 @@ 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 --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/ @@ -63,11 +65,15 @@ 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 +85,9 @@ 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 \ @@ -167,7 +175,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ @@ -233,7 +241,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.4-alpine/Dockerfile.jinja2 b/docker/php-official/7.4-alpine/Dockerfile.jinja2 index 18b89a079..0ea27d0a5 100644 --- a/docker/php-official/7.4-alpine/Dockerfile.jinja2 +++ b/docker/php-official/7.4-alpine/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.4-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/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile index 96d9df76e..c155b3733 100644 --- a/docker/php-official/7.4/Dockerfile +++ b/docker/php-official/7.4/Dockerfile @@ -6,6 +6,9 @@ FROM php:7.4-fpm-buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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 \ @@ -139,7 +145,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -210,7 +216,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.4/Dockerfile.jinja2 b/docker/php-official/7.4/Dockerfile.jinja2 index 4c7aa284b..cb613880f 100644 --- a/docker/php-official/7.4/Dockerfile.jinja2 +++ b/docker/php-official/7.4/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "7.4-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile index e7f8519b2..e273935db 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -6,6 +6,9 @@ FROM php:8.0-fpm-alpine +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -28,9 +31,8 @@ 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 --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/ @@ -63,11 +65,15 @@ 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 +85,9 @@ 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 \ @@ -167,7 +175,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ tokenizer \ sysvmsg \ sysvsem \ @@ -233,7 +241,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ + && 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 f16042680..da0823f54 100644 --- a/docker/php-official/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.0-alpine/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "8.0-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/') }} @@ -29,7 +31,6 @@ RUN set -x \ RUN set -x \ {{ php.officialAlpine(version='8.0') }} \ - {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} {{ docker.workdir('/') }} diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 569eadf08..7fffa716e 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -6,6 +6,9 @@ FROM php:8.0-fpm-buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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,7 +148,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -210,7 +216,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.0/Dockerfile.jinja2 b/docker/php-official/8.0/Dockerfile.jinja2 index 70656d01e..d8294bd4a 100644 --- a/docker/php-official/8.0/Dockerfile.jinja2 +++ b/docker/php-official/8.0/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "8.0-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index 89879b3fa..a6a2fae67 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -6,6 +6,9 @@ FROM php:8.1-fpm-alpine +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -28,9 +31,8 @@ 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 --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/ @@ -63,11 +65,15 @@ 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 +85,9 @@ 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 \ @@ -232,7 +240,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.1-alpine/Dockerfile.jinja2 b/docker/php-official/8.1-alpine/Dockerfile.jinja2 index b5e4c40d0..a6566b979 100644 --- a/docker/php-official/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.1-alpine/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "8.1-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.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 diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index 9bdbdfcc6..205ec6b36 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -6,6 +6,9 @@ FROM php:8.1-fpm-buster +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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,7 +148,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -209,7 +215,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/8.1/Dockerfile.jinja2 b/docker/php-official/8.1/Dockerfile.jinja2 index d116bbc4a..522e9cfd8 100644 --- a/docker/php-official/8.1/Dockerfile.jinja2 +++ b/docker/php-official/8.1/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("php", "8.1-fpm-buster") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 3a4dc9c9f..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,9 +31,8 @@ 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 --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/ @@ -63,11 +65,15 @@ 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 +85,9 @@ 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 \ @@ -232,7 +240,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / 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 208ffed08..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 \ @@ -27,9 +30,8 @@ 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 --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/ @@ -60,7 +62,9 @@ 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 +81,9 @@ 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,7 +148,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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -209,7 +215,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup WORKDIR / 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() }} diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 283970fb5..62504d46e 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:centos-7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -61,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/centos-7-php7/Dockerfile index 2f1302db3..cd4826359 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:centos-7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -65,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/centos-7/Dockerfile index eec9aff56..0f7481ef9 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:centos-7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -66,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/debian-10/Dockerfile index 9a3194fd4..10579b185 100644 --- a/docker/php/debian-10/Dockerfile +++ b/docker/php/debian-10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:debian-10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -62,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/debian-7/Dockerfile index acab930e4..152a0b73a 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:debian-7 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -55,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/debian-8-php7/Dockerfile index 6976fe746..c18231cb5 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:debian-8 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -73,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/debian-8/Dockerfile index 1f8b75d67..7c8f39f7e 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:debian-8 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -56,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/debian-9/Dockerfile index 31b2f8e0b..8513c2269 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:debian-9 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -64,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-12.04/Dockerfile index 8500ff916..fe5be1816 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-12.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -56,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-14.04/Dockerfile index 7952a1121..dff0b910f 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-14.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -57,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-15.04/Dockerfile index b7041841d..94bd3d081 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-15.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -57,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-15.10/Dockerfile index aa1fe7caa..ce69655ed 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-15.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -57,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-16.04/Dockerfile index 042bb6f03..3ae6b3900 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-16.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -64,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-16.10/Dockerfile index 4f3133dc2..5493aec93 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-16.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -64,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-17.04/Dockerfile index dba18c285..15b5fcb59 100644 --- a/docker/php/ubuntu-17.04/Dockerfile +++ b/docker/php/ubuntu-17.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-17.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -64,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-17.10/Dockerfile index bd7c1755b..1614f8d02 100644 --- a/docker/php/ubuntu-17.10/Dockerfile +++ b/docker/php/ubuntu-17.10/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-17.10 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -64,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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 b/docker/php/ubuntu-18.04/Dockerfile index 093cad5f5..a0931972b 100644 --- a/docker/php/ubuntu-18.04/Dockerfile +++ b/docker/php/ubuntu-18.04/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/base-app:ubuntu-18.04 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm \ @@ -63,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 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/php/ubuntu-20.04/Dockerfile b/docker/php/ubuntu-20.04/Dockerfile index 399a43da1..40295ef35 100644 --- a/docker/php/ubuntu-20.04/Dockerfile +++ b/docker/php/ubuntu-20.04/Dockerfile @@ -63,7 +63,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 9000 diff --git a/docker/piwik/latest/Dockerfile b/docker/piwik/latest/Dockerfile index a8238fb01..3b8eb0492 100644 --- a/docker/piwik/latest/Dockerfile +++ b/docker/piwik/latest/Dockerfile @@ -5,6 +5,9 @@ FROM webdevops/php-nginx:7.4 +ARG BUILDARCH +ARG TARGETARCH + ENV WEB_DOCUMENT_ROOT /app/piwik/ ENV PIWIK_URL http://example.com/ @@ -18,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup VOLUME /app diff --git a/docker/piwik/latest/Dockerfile.jinja2 b/docker/piwik/latest/Dockerfile.jinja2 index 05ed73cf1..fe8c06018 100644 --- a/docker/piwik/latest/Dockerfile.jinja2 +++ b/docker/piwik/latest/Dockerfile.jinja2 @@ -1,5 +1,7 @@ {{ docker.from("php-nginx", "7.4") }} +{{ docker.platformArgs() }} + 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..df2c2db2d 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -5,12 +5,17 @@ FROM webdevops/base-app:latest +ARG BUILDARCH +ARG TARGETARCH + 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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 25 465 587 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 b/docker/samson-deployment/latest/Dockerfile index 48aeecc5e..00d486191 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -6,6 +6,9 @@ FROM zendesk/samson:latest +ARG BUILDARCH +ARG TARGETARCH + ENV TERM="xterm" \ LANG="C.UTF-8" \ LC_ALL="C.UTF-8" @@ -24,9 +27,8 @@ ENV APPLICATION_USER=application \ # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 @@ -43,6 +45,7 @@ RUN set -x \ ca-certificates \ locales \ gnupg \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup ############################################################################### @@ -75,6 +78,7 @@ RUN set -x \ build-essential \ libssl-dev \ libffi-dev \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup RUN set -x \ @@ -88,7 +92,9 @@ 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 ############################################################################### @@ -109,7 +115,9 @@ 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 ############################################################################### @@ -148,6 +156,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 @@ -157,6 +166,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 @@ -173,6 +183,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 @@ -185,7 +196,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 80 diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2 index 3710b20ac..bc4f61759 100644 --- a/docker/samson-deployment/latest/Dockerfile.jinja2 +++ b/docker/samson-deployment/latest/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.from("samson", user="zendesk") }} +{{ docker.platformArgs() }} + {{ environment.general() }} {{ environment.base() }} {{ environment.baseApp() }} diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index c0d0cbe1c..d8b030d10 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine +FROM ghcr.io/cocoastorm/webdevops/bootstrap:alpine + +ARG BUILDARCH +ARG TARGETARCH RUN set -x \ && apk-install \ @@ -32,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup diff --git a/docker/sphinx/latest/Dockerfile.jinja2 b/docker/sphinx/latest/Dockerfile.jinja2 index 6e2ad14bd..715acd88a 100644 --- a/docker/sphinx/latest/Dockerfile.jinja2 +++ b/docker/sphinx/latest/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("bootstrap","alpine") }} +{{ docker.from("bootstrap", "alpine", user) }} + +{{ docker.platformArgs() }} RUN set -x \ {{ sphinx.alpine() }} \ diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 87c7c50e1..0ac10e2b1 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -5,9 +5,14 @@ FROM 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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 22 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 b/docker/storage/latest/Dockerfile index ace1f12cf..713d57898 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -5,3 +5,6 @@ FROM alpine:latest +ARG BUILDARCH +ARG TARGETARCH + 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/alpine/Dockerfile b/docker/toolbox/alpine/Dockerfile new file mode 100644 index 000000000..b56c65205 --- /dev/null +++ b/docker/toolbox/alpine/Dockerfile @@ -0,0 +1,53 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/toolbox:alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM 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; \ + apk add --no-cache \ + ca-certificates \ + dpkg \ + openssl \ + curl \ + bash \ + sed \ + wget \ + zip \ + unzip \ + bzip2 \ + p7zip \ + drill \ + ldns \ + openssh-client \ + rsync \ + 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 new file mode 100644 index 000000000..9800535cd --- /dev/null +++ b/docker/toolbox/alpine/Dockerfile.jinja2 @@ -0,0 +1,35 @@ +{{ docker.fromOfficial("alpine") }} + +{{ docker.platformArgs() }} + +RUN mkdir -p \ + /baselayout/sbin \ + /baselayout/usr/local/bin + +{{ docker.copy("/baselayout", "/baselayout", docker.image("base-layout", user=user)) }} + +RUN set -eux; \ + apk add --no-cache \ + ca-certificates \ + dpkg \ + openssl \ + curl \ + bash \ + sed \ + wget \ + zip \ + unzip \ + bzip2 \ + p7zip \ + drill \ + ldns \ + openssh-client \ + rsync \ + 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 new file mode 100644 index 000000000..855eaad26 --- /dev/null +++ b/docker/toolbox/buster/Dockerfile @@ -0,0 +1,54 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/toolbox:buster +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM 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; \ + 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/* ; \ + 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 new file mode 100644 index 000000000..00db25dd5 --- /dev/null +++ b/docker/toolbox/buster/Dockerfile.jinja2 @@ -0,0 +1,36 @@ +{{ docker.fromOfficial("debian", "buster-slim") }} + +{{ docker.platformArgs() }} + +RUN mkdir -p \ + /baselayout/bin \ + /baselayout/usr/local/bin + +{{ 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/* ; \ + 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/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index a5cff009c..0676b30c2 100644 --- a/docker/toolbox/latest/Dockerfile +++ b/docker/toolbox/latest/Dockerfile @@ -28,17 +28,18 @@ RUN apk add --no-cache \ # 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 - && wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-64-linux" \ - && chmod +x "/baselayout/usr/local/bin/go-replace" \ - && "/baselayout/usr/local/bin/go-replace" --version \ + ## 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" \ && ln -s /baselayout/usr/local/bin/go-replace /usr/local/bin/ \ - # 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 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 + ## 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/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index 14ed6ab1e..f56cb3166 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -6,6 +6,9 @@ FROM guywithnose/solr:4.10.4 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -21,9 +24,8 @@ COPY ./solr/ /tmp/solr # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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/3.1/Dockerfile.jinja2 b/docker/typo3-solr/3.1/Dockerfile.jinja2 index 46c89bade..90293b2f6 100644 --- a/docker/typo3-solr/3.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/3.1/Dockerfile.jinja2 @@ -1,6 +1,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 b/docker/typo3-solr/5.0/Dockerfile index eb4a67e9d..81e272dd5 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -6,6 +6,9 @@ FROM guywithnose/solr:4.10.4 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -21,9 +24,8 @@ COPY ./solr/ /tmp/solr # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 / @@ -39,6 +41,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/5.0/Dockerfile.jinja2 b/docker/typo3-solr/5.0/Dockerfile.jinja2 index 8b4afe347..9a168c5ee 100644 --- a/docker/typo3-solr/5.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/5.0/Dockerfile.jinja2 @@ -1,6 +1,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 b/docker/typo3-solr/6.0/Dockerfile index 99fe9d15e..3d1be04f3 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -6,6 +6,9 @@ FROM solr:6.3.0 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -19,9 +22,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 \ @@ -36,6 +38,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.0/Dockerfile.jinja2 b/docker/typo3-solr/6.0/Dockerfile.jinja2 index c5a985735..cab7de45e 100644 --- a/docker/typo3-solr/6.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.0/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("solr", "6.3.0") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/6.1/Dockerfile b/docker/typo3-solr/6.1/Dockerfile index 81f6f617f..c7a161166 100644 --- a/docker/typo3-solr/6.1/Dockerfile +++ b/docker/typo3-solr/6.1/Dockerfile @@ -6,6 +6,9 @@ FROM solr:6.3.0 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -19,9 +22,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 \ @@ -36,6 +38,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.jinja2 b/docker/typo3-solr/6.1/Dockerfile.jinja2 index da2580340..06eb43b4a 100644 --- a/docker/typo3-solr/6.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.1/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("solr", "6.3.0") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/6.5/Dockerfile b/docker/typo3-solr/6.5/Dockerfile index 42bfb5c80..bdd9684bd 100644 --- a/docker/typo3-solr/6.5/Dockerfile +++ b/docker/typo3-solr/6.5/Dockerfile @@ -6,6 +6,9 @@ FROM solr:6.6.2 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -19,9 +22,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 \ @@ -36,6 +38,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.jinja2 b/docker/typo3-solr/6.5/Dockerfile.jinja2 index ac1f70ea9..2001ae408 100644 --- a/docker/typo3-solr/6.5/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.5/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("solr", "6.6.2") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/7.0/Dockerfile b/docker/typo3-solr/7.0/Dockerfile index 7ce835b86..1a5fd05ef 100644 --- a/docker/typo3-solr/7.0/Dockerfile +++ b/docker/typo3-solr/7.0/Dockerfile @@ -6,6 +6,9 @@ FROM solr:6.3.0 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -19,9 +22,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 \ @@ -36,6 +38,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.jinja2 b/docker/typo3-solr/7.0/Dockerfile.jinja2 index bc7e00d83..f029d53e7 100644 --- a/docker/typo3-solr/7.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/7.0/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("solr", "6.3.0") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/7.5/Dockerfile b/docker/typo3-solr/7.5/Dockerfile index b4d4c46b2..703076761 100644 --- a/docker/typo3-solr/7.5/Dockerfile +++ b/docker/typo3-solr/7.5/Dockerfile @@ -6,6 +6,9 @@ FROM solr:6.6.2 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -19,9 +22,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 \ @@ -36,6 +38,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.jinja2 b/docker/typo3-solr/7.5/Dockerfile.jinja2 index b8e31fe09..48e89e12f 100644 --- a/docker/typo3-solr/7.5/Dockerfile.jinja2 +++ b/docker/typo3-solr/7.5/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("solr", "6.6.2") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/8.0/Dockerfile b/docker/typo3-solr/8.0/Dockerfile index dceaf0569..e494409c3 100644 --- a/docker/typo3-solr/8.0/Dockerfile +++ b/docker/typo3-solr/8.0/Dockerfile @@ -6,6 +6,9 @@ FROM solr:6.6.2 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -19,9 +22,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 \ @@ -36,6 +38,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.jinja2 b/docker/typo3-solr/8.0/Dockerfile.jinja2 index 613d56aed..d42438115 100644 --- a/docker/typo3-solr/8.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/8.0/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("solr", "6.6.2") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/typo3-solr/8.1/Dockerfile b/docker/typo3-solr/8.1/Dockerfile index 9353baefc..6b59c9d52 100644 --- a/docker/typo3-solr/8.1/Dockerfile +++ b/docker/typo3-solr/8.1/Dockerfile @@ -6,6 +6,9 @@ FROM solr:6.6.3 +ARG BUILDARCH +ARG TARGETARCH + LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ io.webdevops.layout=8 \ @@ -19,9 +22,8 @@ USER root # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /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 \ @@ -36,6 +38,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.jinja2 b/docker/typo3-solr/8.1/Dockerfile.jinja2 index 31e80940c..2b9ba925c 100644 --- a/docker/typo3-solr/8.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/8.1/Dockerfile.jinja2 @@ -1,6 +1,8 @@ {{ docker.fromOfficial("solr", "6.6.3") }} +{{ docker.platformArgs() }} + {{ docker.version() }} {{ environment.general() }} diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index fb1d975b4..275a2242a 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine +FROM ghcr.io/cocoastorm/webdevops/base:alpine + +ARG BUILDARCH +ARG TARGETARCH ENV VARNISH_PORT 80 @@ -19,7 +22,9 @@ COPY conf/ /opt/docker/ RUN set -x \ && apk-install \ varnish \ - && docker-run-bootstrap \ + && docker-arch-info $BUILDARCH $TARGETARCH \ +&& docker-run-bootstrap \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup CMD ["varnishd"] diff --git a/docker/varnish/latest/Dockerfile.jinja2 b/docker/varnish/latest/Dockerfile.jinja2 index 23dd98c0f..a1bc04ade 100644 --- a/docker/varnish/latest/Dockerfile.jinja2 +++ b/docker/varnish/latest/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base","alpine") }} +{{ docker.from("base", "alpine", user) }} + +{{ docker.platformArgs() }} {{ varnish.env() }} diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index ff673ddd2..24d978576 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -3,7 +3,10 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:latest +FROM ghcr.io/cocoastorm/webdevops/base:latest + +ARG BUILDARCH +ARG TARGETARCH ENV FTP_USER=application \ FTP_PASSWORD=application \ @@ -21,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 \ + && docker-arch-info $TARGETARCH \ && docker-image-cleanup EXPOSE 20 21 12020 12021 12022 12023 12024 12025 diff --git a/docker/vsftp/latest/Dockerfile.jinja2 b/docker/vsftp/latest/Dockerfile.jinja2 index f0ae87634..e91de0240 100644 --- a/docker/vsftp/latest/Dockerfile.jinja2 +++ b/docker/vsftp/latest/Dockerfile.jinja2 @@ -1,4 +1,6 @@ -{{ docker.from("base", "latest") }} +{{ docker.from("base", "latest", user) }} + +{{ docker.platformArgs() }} {{ environment.ftp() }} 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-arch-info b/provisioning/base-layout/general/usr/local/bin/docker-arch-info new file mode 100755 index 000000000..25a948995 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/docker-arch-info @@ -0,0 +1,37 @@ +#!/bin/sh + +set -e + +DOCKER_DIR="/opt/docker" +ARCH_FILE="/opt/docker/ARCH_INFO" + +printUsage() { + echo "Usage $0 " + echo "" + echo "BUILDARCH" "architecture of docker host/builder" + echo "TARGETARCH" "architecture of the final docker image" + echo "" +} + +if [ $# -lt 1 ]; then + printUsage + exit 0 # don't do anything +fi + +if [ $# -eq 1 ]; then + unset BUILDARCH + TARGETARCH="$1" +else + BUILDARCH="$1" + TARGETARCH="$2" +fi + +if [ ! -d "$DOCKER_DIR" ]; then + mkdir -p "$DOCKER_DIR" +fi + +echo "storing to $ARCH_FILE" +{ + [ -n "$BUILDARCH" ] && echo "BUILDARCH=${BUILDARCH}"; \ + [ -n "$TARGETARCH" ] && echo "TARGETARCH=${TARGETARCH}"; \ +} | tee $ARCH_FILE 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..92c179e48 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/docker-image-cleanup @@ -0,0 +1,37 @@ +#!/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 +set -x + +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..88734adad --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/go-replace @@ -0,0 +1,51 @@ +#!/bin/sh + +set -e + +ARCH_FILE="/opt/docker/ARCH_INFO" +VERSION="1.1.2" + +if command -v dpkg > /dev/null; then + ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" +fi + +download() { + /usr/local/bin/install-go-replace "$1" +} + +if [ -f "/opt/docker/ARCH_INFO" ]; then + while IFS="=" read -r key value; do + case "$key" in + "BUILDARCH") BUILDARCH="$value" ;; + "TARGETARCH") TARGETARCH="$value" ;; + esac + done < "$ARCH_FILE" +fi + +if [ ! -n "$BUILDARCH" ] && [ -n "$ARCH" ]; then + echo "$BUILDARCH missing, using `dpkg --print-architecture` to determine" +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 + echo "go-replace-$BUILDARCH" + exec "/usr/local/bin/go-replace-$BUILDARCH" "$@" +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/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 new file mode 100755 index 000000000..2287ef1c0 --- /dev/null +++ b/provisioning/base-layout/general/usr/local/bin/symlink-go-replace @@ -0,0 +1,43 @@ +#!/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 + +download() { + /usr/local/bin/install-go-replace "$1" +} + +symlinkBinary() { + symlink_target="/usr/local/bin/go-replace-$1" + + if [ ! -f "$symlink_target" ]; then + echo "$symlink_target not found, attempting to install:" + download "$1" + exit 2 + fi + + rm -f -- "$GO_REPLACE" + ln -sf "/usr/local/bin/go-replace-$1" "$GO_REPLACE" +} + +if [ ! -n "$TARGETARCH" ]; then + symlinkBinary "amd64" +else + symlinkBinary "$TARGETARCH" +fi 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/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" } +] diff --git a/template/Dockerfile/baselayout.jinja2 b/template/Dockerfile/baselayout.jinja2 index 5bb4a1303..5012f5179 100644 --- a/template/Dockerfile/baselayout.jinja2 +++ b/template/Dockerfile/baselayout.jinja2 @@ -1,7 +1,9 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/tools.jinja2' as tools %} -{% macro copy() %} +{% macro copy(flavor="buster") %} # Baselayout copy (from staged image) -COPY --from=webdevops/toolbox /baselayout/sbin/* /sbin/ -COPY --from=webdevops/toolbox /baselayout/usr/local/bin/* /usr/local/bin/ -{% endmacro %} +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 %} + diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index dc17193b9..f7b4095de 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -6,6 +6,15 @@ FROM {{ user }}/{{ image }}:{{ tag }} FROM {{ image }}:{{ tag }} {%- endmacro %} +{% macro image(name, tag="latest", user="webdevops") -%} +{{ user }}/{{ name }}:{{ tag }} +{%- endmacro %} + +{% macro platformArgs() -%} +ARG BUILDARCH +ARG TARGETARCH +{%- endmacro %} + {% macro version() -%} LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ @@ -17,8 +26,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) -%} @@ -43,5 +56,6 @@ CMD ["{{ command }}"] {%- endmacro -%} {%- macro cleanup() -%} + && docker-arch-info $TARGETARCH \ && docker-image-cleanup {%- endmacro -%} 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/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 %} diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index c933adf4c..5993133be 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -71,7 +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 --with-libdir=lib/x86_64-linux-gnu/ \ + && docker-php-ext-configure ldap \ && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install \ bcmath \ @@ -279,7 +279,7 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' %} +{%- if version != '8.1' and version != '8.2' %} tokenizer \ {%- endif %} sysvmsg \ 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 %} 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 %} diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index dd4227588..6d01a5dda 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,18 +1,19 @@ {% 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" \ - && chmod +x "{{ path }}/go-replace" \ - && "{{ path }}/go-replace" --version + ## install go-replace + && 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", arch="amd64", 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" \ - && 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 +{% 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"; \ + 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 %} diff --git a/template/Github/docker_action.jinja2 b/template/Github/docker_action.jinja2 new file mode 100644 index 000000000..098b9681f --- /dev/null +++ b/template/Github/docker_action.jinja2 @@ -0,0 +1,40 @@ +{% import 'docker_img.jinja2' as docker -%} + +name: docker images + +on: + push: + branches: + - 'main' + +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 + + {% 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 %} 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 be0612c20..cf8513878 100644 --- a/tests/serverspec/Gemfile.lock +++ b/tests/serverspec/Gemfile.lock @@ -1,17 +1,48 @@ GEM remote: https://rubygems.org/ specs: +<<<<<<< HEAD + diff-lcs (1.5.0) + docker-api (2.2.0) + excon (>= 0.47.0) + multi_json + excon (0.92.3) + json (2.6.2) +======= diff-lcs (1.4.4) docker-api (2.1.0) excon (>= 0.47.0) multi_json excon (0.81.0) json (2.5.1) +>>>>>>> upstream/php-ci 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) +<<<<<<< HEAD + 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.11.0) + rspec-its (1.3.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.11.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-retry (0.6.2) + rspec-core (> 3.3) + rspec-support (3.11.0) + serverspec (2.42.0) +======= rake (13.0.3) rspec (3.10.0) rspec-core (~> 3.10.0) @@ -32,12 +63,17 @@ GEM rspec-core (> 3.3) rspec-support (3.10.2) serverspec (2.41.5) +>>>>>>> upstream/php-ci multi_json rspec (~> 3.0) rspec-its specinfra (~> 2.72) sfl (2.3) +<<<<<<< HEAD + specinfra (2.83.2) +======= specinfra (2.82.25) +>>>>>>> upstream/php-ci net-scp net-ssh (>= 2.7) net-telnet (= 0.1.1)