Skip to content

Commit

Permalink
recreate dockerfile branch with signed commits (#335)
Browse files Browse the repository at this point in the history
* recreate dockerfile branch with signed commits

* vulnerability fixes

* update pipfile.lock

* auto patch increment

* Revert "update pipfile.lock"

This reverts commit d76fa8b.

* more pipenv stuff

---------

Co-authored-by: ras-rm-pr-bot <rasrm.team@ons.gov.uk>
  • Loading branch information
anwilkie and ras-rm-pr-bot authored Aug 12, 2024
1 parent e223cb0 commit 1f1c796
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Build Docker Image
if: github.ref != 'refs/heads/main'
run: |
docker build -t "$REGISTRY_HOSTNAME"/"$HOST"/"$IMAGE":${{ env.pr_number }} .
docker build -t "$REGISTRY_HOSTNAME"/"$HOST"/"$IMAGE":${{ env.pr_number }} -f _infra/docker/Dockerfile .
- name: Push dev image
if: github.ref != 'refs/heads/main'
run: |
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
- name: Build Release Image
if: github.ref == 'refs/heads/main'
run: |
docker build -t "$REGISTRY_HOSTNAME"/"$RELEASE_HOST"/"$IMAGE":latest -t "$REGISTRY_HOSTNAME"/"$RELEASE_HOST"/"$IMAGE":${{ env.version }} .
docker build -f _infra/docker/Dockerfile -t "$REGISTRY_HOSTNAME"/"$RELEASE_HOST"/"$IMAGE":latest -t "$REGISTRY_HOSTNAME"/"$RELEASE_HOST"/"$IMAGE":${{ env.version }} .
- name: Push Release image
if: github.ref == 'refs/heads/main'
run: |
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ build-kubernetes:
docker build -f _infra/docker/Dockerfile .

lint:
# remove -i 70624 once flask-cors is updated beyond v4.0.1 to solve vulnerability
# remove -i 70612 once jinja2 is updated beyond v3.1.4 to solve vulnerability
pipenv check ./application ./tests -i 70612 -i 70624
pipenv run isort .
pipenv run black --line-length 120 .
Expand Down
9 changes: 5 additions & 4 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ services:

ras-collection-instrument:
container_name: ras-collection-instrument
build: ./
build:
context: .
dockerfile: _infra/docker/Dockerfile
restart: always
depends_on:
- db
Expand Down

0 comments on commit 1f1c796

Please sign in to comment.