diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-06-12 15:53:06 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-06-12 15:53:06 -0400 |
| commit | da6de035366bc8b39333fb4cd6e61f026f96ee4c (patch) | |
| tree | 54c097601c722bfc3ade4c14e1e269b9d4d90494 /docker | |
| parent | 5a6f39dae4ac00f6a8d322c862de995b09e56bd1 (diff) | |
| parent | 4ea6c4ad5d1cac14d63f758f8fa6909b77a0b758 (diff) | |
Merge branch 'build-optimizations' of https://yerbamate.dev/LemmyNet/lemmy into build-optimizations
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/dev/docker_update.sh | 4 | ||||
| -rwxr-xr-x | docker/dev/test_deploy.sh | 4 | ||||
| -rwxr-xr-x | docker/prod/deploy.sh | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/docker/dev/docker_update.sh b/docker/dev/docker_update.sh index 9d0f4542..21e92ba8 100755 --- a/docker/dev/docker_update.sh +++ b/docker/dev/docker_update.sh @@ -1,2 +1,6 @@ #!/bin/sh +set -e + +export COMPOSE_DOCKER_CLI_BUILD=1 +export DOCKER_BUILDKIT=1 docker-compose up -d --no-deps --build diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh index 1ae91f65..ce85f60c 100755 --- a/docker/dev/test_deploy.sh +++ b/docker/dev/test_deploy.sh @@ -1,4 +1,8 @@ #!/bin/sh +set -e + +export COMPOSE_DOCKER_CLI_BUILD=1 +export DOCKER_BUILDKIT=1 # Rebuilding dev docker docker-compose build diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh index e5f9a98e..0ad47bcd 100755 --- a/docker/prod/deploy.sh +++ b/docker/prod/deploy.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e git checkout master # Import translations @@ -32,6 +33,9 @@ git add ../../ansible/templates/docker-compose.yml git commit -m"Version $new_tag" git tag $new_tag +export COMPOSE_DOCKER_CLI_BUILD=1 +export DOCKER_BUILDKIT=1 + # Rebuilding docker docker-compose build docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag |