From b30daebc96f0b855c7b2758ed4442d97be14f276 Mon Sep 17 00:00:00 2001 From: Thomas Burkhalter Date: Mon, 29 Aug 2022 14:29:29 +0200 Subject: [PATCH] Update Dockerfile Update Github build workflow --- .github/workflows/reusable-build.yaml | 14 +++++++++++++- Dockerfile | 8 +++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable-build.yaml b/.github/workflows/reusable-build.yaml index 56b90ff..d263ffc 100644 --- a/.github/workflows/reusable-build.yaml +++ b/.github/workflows/reusable-build.yaml @@ -23,15 +23,27 @@ jobs: uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + - name: Restore artifacts + uses: - name: Login to the puzzle registry uses: docker/login-action@v1 with: registry: registry.puzzle.ch username: ${{ secrets.PUZZLE_REGISTRY_USERNAME }} password: ${{ secrets.PUZZLE_REGISTRY_TOKEN }} + - name: Restore artifacts + uses: actions/download-artifact@v3 + with: + name: gems + path: /app-src/vendor/bundle - name: Build and push uses: docker/build-push-action@v2 with: file: Dockerfile push: true - tags: ${{ env.DECIDIM_IMAGE_REPO }}:latest \ No newline at end of file + tags: ${{ env.DECIDIM_IMAGE_REPO }}:latest + - name: Store artifacts + uses: actions/upload-artifact@v3 + with: + name: gems + path: /app-src/vendor/bundle diff --git a/Dockerfile b/Dockerfile index e77f484..1ebfa3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,9 +75,11 @@ 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 env +RUN bundle config set --local deployment 'true' \ && bundle config set --local without ${BUNDLE_WITHOUT} \ && bundle package \ && bundle install \