James Cole 11e537810a Merge branch 'develop' into v480 ...

* develop:
  Update Docker files slightly (yes I am a nitpicker).
  - Fixed copying Dockerfile.amd64 to Dockerfile.arm in the 2nd last commit
  entrypoint.sh: Wait for DB to start up
  Misc Optimizations: Changes on Dockerfile*

# Conflicts:
#	.deploy/docker/entrypoint.sh

2019-03-24 14:56:08 +01:00

..

.env.docker

Fix for #2128

2019-03-02 14:33:46 +01:00

apache2.conf

Update Docker files.

2018-12-27 06:04:49 +01:00

apache-firefly.conf

Move docker files, include kubernetes files.

2018-03-11 18:27:30 +01:00

build-amd64.sh

Slight change in build script.

2019-02-16 19:33:33 +01:00

build-arm.sh

Fix build script.

2019-02-16 14:02:04 +01:00

cacert.pem

Code for #1698

2018-10-10 06:09:25 +02:00

entrypoint.sh

Merge branch 'develop' into v480

2019-03-24 14:56:08 +01:00

manifest.sh

Experiment with manifest code.

2019-02-12 17:27:56 +01:00

vhost.conf

New experimental Dockerfile #1464

2018-08-11 07:22:17 +02:00

wait-for-it.sh

entrypoint.sh: Wait for DB to start up

2019-03-24 18:00:25 +08:00