Skip to content

Commit

Permalink
Merge pull request #1496 from watchdogpolska/dev
Browse files Browse the repository at this point in the history
v1.2.07
  • Loading branch information
PiotrIw committed Apr 19, 2024
2 parents 1925068 + 9973c6f commit 69a47b7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .contrib/docker/Dockerfile.web.production
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ RUN git config --global --add safe.directory /code
COPY requirements/*.txt ./requirements/
RUN pip install --upgrade pip
RUN pip install --no-cache-dir -r requirements/production.txt
RUN ls -la
COPY . .
RUN ls -la
RUN mv .git_copy .git
RUN ls -la
RUN git status
RUN export DJANGO_SETTINGS_MODULE="config.settings.production" && \
export DJANGO_SECRET_KEY="fake_key" && \
export DJANGO_SERVER_EMAIL="fake_server" && \
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/web_image_buil_and_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PAT }}

- name: Display contents of code directory
run: ls -la

- name: Display contents of .git directory
run: ls -la .git

- name: Create git copy
run: cp -r .git .git_copy

- name: Show git status
run: git status

- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
Expand All @@ -53,3 +65,6 @@ jobs:
tags: |
${{ secrets.DOCKER_USERNAME }}/${{ vars.REPO_NAME }}:latest-${{ env.deployment }}
${{ secrets.DOCKER_USERNAME }}/${{ vars.REPO_NAME }}:${{ env.version }}-${{ env.deployment }}
- name: Remove git copy
run: rm -rf .git_copy
2 changes: 1 addition & 1 deletion poradnia/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.2.06"
__version__ = "1.2.07"


# Compatibility to eg. django-rest-framework
Expand Down

0 comments on commit 69a47b7

Please sign in to comment.