Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Switch again to RHEL base image | Matthew Lemon | 2024-06-03 | 1 | -6/+7 |
| | |||||
* | Merge pull request #59 from defencedigital/postgres-migration | Yulqen | 2024-06-03 | 1 | -2/+2 |
|\ | | | | | Postgres migration | ||||
| * | Merge branch 'postgres-migration' | Matthew Lemon | 2024-06-03 | 1 | -2/+2 |
|/| | |||||
| * | Switch to bullseye base in attempt to beat FIPS error | Matthew Lemon | 2024-06-03 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #58 from defencedigital/postgres-migration | Yulqen | 2024-06-03 | 1 | -1/+1 |
|\| | | | | | Add requirement on libgcrypt20-dev to try to fix libgcrypt error | ||||
| * | Add requirement on libgcrypt20-dev to try to fix libgcrypt error | Matthew Lemon | 2024-06-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #57 from defencedigital/postgres-migration | Yulqen | 2024-06-03 | 2 | -21/+43 |
|\| | | | | | Postgres migration | ||||
| * | Defensive settings to handle local build | Matthew Lemon | 2024-06-03 | 1 | -7/+17 |
| | | |||||
| * | Revised Dockerfile to use slim and prod config for postgres | Matthew Lemon | 2024-06-03 | 2 | -21/+33 |
|/ | |||||
* | Merge pull request #56 from defencedigital/postgres-migration | Yulqen | 2024-05-23 | 1 | -1/+1 |
|\ | | | | | Changed final django image to python312-slim in attempt to handle lib… | ||||
| * | Changed final django image to python312-slim in attempt to handle libgcrypt ↵ | Matthew Lemon | 2024-05-23 | 1 | -1/+1 |
|/ | | | | build error on OpenShift | ||||
* | Merge pull request #55 from defencedigital/postgres-migration | Yulqen | 2024-05-23 | 1 | -22/+27 |
|\ | | | | | Reverts to working Dockerfile for django - using RHEL builder | ||||
| * | Reverts to working Dockerfile for django - using RHEL builder | Matthew Lemon | 2024-05-23 | 1 | -22/+27 |
| | | |||||
* | | Merge pull request #54 from defencedigital/postgres-migration | Yulqen | 2024-05-23 | 3 | -17/+26 |
|\| | | | | | Trying with a RHEL ubi image to get round CVEs | ||||
| * | Trying with a RHEL ubi image to get round CVEs | Matthew Lemon | 2024-05-23 | 3 | -17/+26 |
|/ | |||||
* | Merge pull request #53 from defencedigital/postgres-migration | Yulqen | 2024-05-23 | 1 | -1/+2 |
|\ | | | | | Switch base container to rhel9/python3.12 to try to avoid CVEs | ||||
| * | Switch base container to rhel9/python3.12 to try to avoid CVEs | Matthew Lemon | 2024-05-23 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #52 from defencedigital/postgres-migration | Yulqen | 2024-05-23 | 1 | -14/+0 |
|\ | | | | | Removes multi-stage build for Django - uses RHEL | ||||
| * | Removes multi-stage build for Django - uses RHEL | Matthew Lemon | 2024-05-23 | 1 | -14/+0 |
|/ | |||||
* | Merge pull request #51 from defencedigital/postgres-migration | Yulqen | 2024-05-23 | 2 | -12/+28 |
|\ | | | | | Revert "Ditched the redhat builder stage" | ||||
| * | Revert "Ditched the redhat builder stage" | Matthew Lemon | 2024-05-23 | 2 | -12/+28 |
|/ | | | | This reverts commit 5f9ca9b3e597a9dfda9ffb3af25a60b2c7309986. | ||||
* | Merge pull request #50 from defencedigital/postgres-migration | Yulqen | 2024-05-23 | 7 | -37/+49 |
|\ | | | | | Postgres migration | ||||
| * | Ditched the redhat builder stage | Matthew Lemon | 2024-05-23 | 2 | -28/+12 |
| | | | | | | | | | | | | | | | | - Run make to build and run - Does not use volumes do database data is not retained May have to revert if the CICD kicks this out for using a Dockerhub image. | ||||
| * | Local Docker environment is now runnable with make | Matthew Lemon | 2024-05-23 | 6 | -18/+42 |
| | | |||||
| * | wip: moved config to base.py | Matthew Lemon | 2024-05-23 | 2 | -0/+4 |
|/ | |||||
* | Merge pull request #49 from defencedigital/pyswitch | Yulqen | 2024-05-03 | 2 | -0/+2 |
|\ | | | | | Pyswitch | ||||
| * | Updated lemon password | Matthew Lemon | 2024-05-03 | 1 | -0/+0 |
| | | |||||
| * | Adds git sync command to Makefile | Matthew Lemon | 2024-05-03 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #48 from defencedigital/pyswitch | Yulqen | 2024-05-03 | 1 | -12/+16 |
|\ | | | | | Fix for read-only sqlite file | ||||
| * | Fix for read-only sqlite file | Matthew Lemon | 2024-05-03 | 1 | -12/+16 |
|/ | |||||
* | Merge pull request #47 from defencedigital/pyswitch | Yulqen | 2024-05-02 | 1 | -1/+1 |
|\ | | | | | fix for anchore | ||||
| * | fix for anchore | Matthew Lemon | 2024-05-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #46 from defencedigital/pyswitch | Yulqen | 2024-05-02 | 1 | -1/+1 |
|\ | | | | | meaningless change to trigger pipeline | ||||
| * | Merge branch 'main' into pyswitch | Yulqen | 2024-05-02 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #45 from defencedigital/pyswitch | Yulqen | 2024-05-02 | 1 | -1/+1 |
|\ \ | | | | | | | Pushing test commit to try to sort anchore add problem | ||||
| | * | meaningless change to trigger pipeline | Matthew Lemon | 2024-05-02 | 1 | -1/+1 |
| |/ | |||||
| * | Pushing test commit to try to sort anchore add problem | Matthew Lemon | 2024-05-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #44 from defencedigital/pyswitch | Yulqen | 2024-05-02 | 1 | -1/+1 |
|\ | | | | | Adds OpenShift route to ALLOWED_HOSTS | ||||
| * | Adds OpenShift route to ALLOWED_HOSTS | Matthew Lemon | 2024-05-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #43 from defencedigital/pyswitch | Yulqen | 2024-05-01 | 1 | -1/+1 |
|\ | | | | | Removes user line from nginx.conf | ||||
| * | Removes user line from nginx.conf | Matthew Lemon | 2024-05-01 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #42 from defencedigital/pyswitch | Yulqen | 2024-04-30 | 1 | -3/+0 |
|\ | | | | | Test change | ||||
| * | Test change | Matthew Lemon | 2024-04-30 | 1 | -3/+0 |
|/ | |||||
* | Merge pull request #41 from defencedigital/pyswitch | Yulqen | 2024-04-30 | 1 | -1/+1 |
|\ | | | | | Change nginx service port | ||||
| * | Change nginx service port | Matthew Lemon | 2024-04-30 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #40 from defencedigital/pyswitch | Yulqen | 2024-04-30 | 1 | -1/+1 |
|\ | | | | | Change port Django is running on to 8000 | ||||
| * | Change port Django is running on to 8000 | Matthew Lemon | 2024-04-30 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #39 from defencedigital/pyswitch | Yulqen | 2024-04-30 | 2 | -4/+4 |
|\ | | | | | Ports changes | ||||
| * | Ports changes | Matthew Lemon | 2024-04-30 | 2 | -4/+4 |
|/ | |||||
* | Merge pull request #38 from defencedigital/pyswitch | Yulqen | 2024-04-29 | 4 | -1/+53 |
|\ | | | | | Pyswitch |