Skip to content

Commit ae7f361

Browse files
authored
Merge branch 'develop' into feature/ohid-420_upload_additional_document_to_ha
2 parents 5d88d5f + 6b9b26c commit ae7f361

634 files changed

Lines changed: 74575 additions & 10543 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
FROM public.ecr.aws/bitnami/python:3.12.4
2-
3-
WORKDIR /opt/app-root/src
1+
FROM python:3.12.4
42

3+
WORKDIR /opt/app-root/src/
54

65
# Install dependencies
7-
RUN install_packages gcc libc6-dev libpq-dev libmagic-dev
6+
RUN apt-get update -yqq && \
7+
apt-get install -y gcc libc6-dev libpq-dev libmagic-dev && \
8+
rm -rf /var/lib/apt/lists/*
9+
810

911
# Install the requirements
1012
COPY ./requirements.txt .
@@ -14,9 +16,13 @@ RUN pip install wheel && \
1416
RUN apt-get purge -y --auto-remove gcc libc6-dev
1517

1618
COPY . .
19+
# 4. CRITICAL FOR OPENSHIFT: Fix permissions for random user execution
20+
RUN chgrp -R 0 /opt/app-root && \
21+
chmod -R g=u /opt/app-root && \
22+
chmod +x /opt/app-root/src/app.sh
1723

1824
ENV FLASK_APP app.py
1925

2026
# Run the server
2127
EXPOSE 5001 9191
22-
ENTRYPOINT /opt/app-root/src/app.sh backend
28+
ENTRYPOINT ["./app.sh", "backend"]

infrastructure/backup-container.yml

Lines changed: 0 additions & 135 deletions
This file was deleted.

infrastructure/fluentbit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# A Sidecar for collecting/processing Logs
22

3-
[Fluent-bit](https://docs.fluentbit.io/manual/about/what-is-fluent-bit) is basically a `log forwarder` tool that can be run as a sidecar container (a docker image) in each pod containing our apps, although it can also be deployed as a stand-alone service (servicing multiple apps). Fluent-bit can forward logs to lots of different outputs for example, HTTP, Opensearch, Slack, AWS Lamda and a lot more (see: https://docs.fluentbit.io/manual/pipeline/outputs). The steps required for deploying a Fluent-bit sidecar are shown below. Note: These steps are to deploy the sidecar.
3+
[Fluent-bit](https://docs.fluentbit.io/manual/about/what-is-fluent-bit) is basically a `log forwarder` tool that can be run as a sidecar container (a docker image) in each pod containing our apps, although it can also be deployed as a stand-alone service (servicing multiple apps). Fluent-bit can forward logs to lots of different outputs for example, HTTP, Opensearch, Slack, AWS Lamda and a lot more (see: https://docs.fluentbit.io/manual/pipeline/outputs).
44

55
You can read about a common-service-showcase in BCGOV which has deployed a Fluent-bit sidecar for CDOGS node application [here](https://github.com/bcgov/common-service-showcase/wiki/Logging-to-a-Sidecar).
66

infrastructure/helm/Chart.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v2
2+
name: prime
3+
description: Prime Helm Chart
4+
icon: https://www2.gov.bc.ca/StaticWebResources/static/gov3/images/gov_bc_logo.svg
5+
type: application
6+
version: 0.1.0
7+
appVersion: "0.1.0"

0 commit comments

Comments
 (0)