From 7473ed103f6ce61c14b314aa772cdfb84ccf9a78 Mon Sep 17 00:00:00 2001 From: Thomas Burkhalter Date: Mon, 29 Aug 2022 14:29:29 +0200 Subject: [PATCH] Update Dockerfile --- .github/workflows/reusable-build.yaml | 2 +- .gitignore | 5 +++-- Dockerfile | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reusable-build.yaml b/.github/workflows/reusable-build.yaml index 56b90ff..4846969 100644 --- a/.github/workflows/reusable-build.yaml +++ b/.github/workflows/reusable-build.yaml @@ -34,4 +34,4 @@ jobs: with: file: Dockerfile push: true - tags: ${{ env.DECIDIM_IMAGE_REPO }}:latest \ No newline at end of file + tags: ${{ env.DECIDIM_IMAGE_REPO }}:latest diff --git a/.gitignore b/.gitignore index 647d19f..04323b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# See https://help.github.com/articles/ignoring-files for more about ignoring files. + # # If you find yourself ignoring temporary files generated by your text editor # or operating system, you probably want to add a global ignore instead: @@ -55,6 +55,7 @@ vendor/bundle /yarn-error.log yarn-debug.log* .yarn-integrity ->>>>>>> feature/upgrade-0.26.2 /.idea + +.bundle/config diff --git a/Dockerfile b/Dockerfile index e77f484..06984fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,9 +75,10 @@ COPY . /app-src WORKDIR /app-src # Run deployment -RUN touch "$BUNDLE_APP_CONFIG" \ - && chmod 777 "$BUNDLE_APP_CONFIG" \ - && bundle config set --local deployment 'true' \ +#RUN mkdir -p `dirname "${BUNDLE_APP_CONFIG}"` \ + # && touch "${BUNDLE_APP_CONFIG}" \ + # && chmod 777 "${BUNDLE_APP_CONFIG}" \ +RUN bundle config set --local deployment 'true' \ && bundle config set --local without ${BUNDLE_WITHOUT} \ && bundle package \ && bundle install \