From 1599cd97131ec04c2bb5018d9e13d1e944822eed Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Tue, 12 Jul 2022 13:45:01 +0300 Subject: [PATCH] Make docker setup work consistently cross-platform --- .gitattributes | 2 ++ docker/php/init/docker-entrypoint.sh | 2 +- docker/php/init/init.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..d2f18e0107 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Normalize EOL for all files that Git considers text files +* text=auto eol=lf diff --git a/docker/php/init/docker-entrypoint.sh b/docker/php/init/docker-entrypoint.sh index 97ecce5dde..3c64249394 100644 --- a/docker/php/init/docker-entrypoint.sh +++ b/docker/php/init/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash echo "Checking if MariaDB is reachable..." exec wait-for-it.sh mariadb:3306 -s -t 30 -- init.sh diff --git a/docker/php/init/init.sh b/docker/php/init/init.sh index f04561af31..40be5ab942 100644 --- a/docker/php/init/init.sh +++ b/docker/php/init/init.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Only do this once. CONTAINER_ALREADY_STARTED="/tmp/CONTAINER_ALREADY_STARTED"