From 73def89f3b7c1866c6097a345b95c8383a437274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 7 Mar 2020 03:55:36 +0100 Subject: [PATCH 1/2] fixed indentation (#144) --- containers/zammad/docker-entrypoint.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 9b9b42f..aa0a073 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -52,18 +52,18 @@ if [ "$1" = 'zammad-init' ]; then # check if database exists / update to new version echo "initialising / updating database..." if ! (bundle exec rails r 'puts User.any?' 2> /dev/null | grep -q true); then - if [ "${POSTGRESQL_DB_CREATE}" == "true" ]; then - bundle exec rake db:create - fi - bundle exec rake db:migrate - bundle exec rake db:seed + if [ "${POSTGRESQL_DB_CREATE}" == "true" ]; then + bundle exec rake db:create + fi + bundle exec rake db:migrate + bundle exec rake db:seed - # create autowizard.json on first install - if [ -n "${AUTOWIZARD_JSON}" ]; then - echo "${AUTOWIZARD_JSON}" | base64 -d > auto_wizard.json - fi + # create autowizard.json on first install + if [ -n "${AUTOWIZARD_JSON}" ]; then + echo "${AUTOWIZARD_JSON}" | base64 -d > auto_wizard.json + fi else - bundle exec rake db:migrate + bundle exec rake db:migrate fi # es config From 8e57219902a53370f70ea16f69c5988cdd106a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 7 Mar 2020 04:19:55 +0100 Subject: [PATCH 2/2] added docker-compose.yml lint (#145) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fixed indentation * added docker-compose lint Signed-off-by: André Bauer --- .github/workflows/ci.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e77198b..c9dbcc3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,10 +32,19 @@ jobs: with: dockerfile: containers/zammad-postgresql/Dockerfile + lint-docker-compose-file: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + - name: lint zammad docker-compose file + run: docker-compose config + build-and-run-docker-compose: needs: - lint-bash-scripts - lint-docker-files + - lint-docker-compose-file timeout-minutes: 30 runs-on: ubuntu-latest steps: