From 9c983211300d59c2312c2b3e8777adbfd031cd2e Mon Sep 17 00:00:00 2001 From: Amir Zarrinkafsh Date: Tue, 8 Feb 2022 16:09:45 +1100 Subject: [PATCH] fix(docker): fix bootstrap and dev docker image build (#2857) This reverts commit 380e6fccb6c3391a24f4f50a8785e9f60ad906ab. This change ensures that BUILDKIT is enabled to pick up the correct Dockerfile and .dockerignore files during the build process of the dev image. Fixes #2843. Closes #2844. --- .dockerignore | 25 ++----------------------- bootstrap.sh | 3 ++- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.dockerignore b/.dockerignore index 7ceb64a02..a3946b784 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,26 +1,5 @@ -# CI/Git Directories -.git -.cache -.buildkite -.github -coverage.txt -Dockerfile* - -# Node Modules Directories -**/node_modules - -# Documentation -docs -examples - -# Dot Files and Markdown -.* -*.md - -# Other -internal/server/public_html -authelia.service -bootstrap.sh +# Ignore All +* # Overrides !authelia-linux-* diff --git a/bootstrap.sh b/bootstrap.sh index 35b963fa4..21ad193ee 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -5,7 +5,8 @@ if [[ $(uname) == "Darwin" ]]; then exit fi -export PATH=$PATH:./cmd/authelia-scripts/:./.buildkite/steps/:$GOPATH/bin:./web/node_modules/.bin:/tmp +export PATH=$PATH:./cmd/authelia-scripts/:./.buildkite/steps/:$GOPATH/bin:./web/node_modules/.bin:/tmp \ +DOCKER_BUILDKIT=1 if [[ -z "$OLD_PS1" ]]; then OLD_PS1="$PS1"