Skip to content

Commit cd07577

Browse files
rshourourshourou
authored
Merge branch 'develop' into feature/ohid-395_update_auto-adjudication_message
2 parents 9585d5a + 5b4c0e7 commit cd07577

704 files changed

Lines changed: 162463 additions & 10442 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.

‎.github/workflows/build-demo.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ jobs:
7575
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
7676
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
7777

78-
- name: "Login to RedHat container repository"
79-
uses: docker/login-action@v2
80-
with:
81-
registry: ${{secrets.REDHAT_REGISTRY_URL}}
82-
username: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_USER}}
83-
password: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_AUTH_TOKEN}}
84-
8578
- name: "Build .NET web API image"
8679
run: |
8780
docker build prime-dotnet-webapi/ \

‎.github/workflows/build-develop.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ jobs:
7575
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
7676
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
7777

78-
- name: "Login to RedHat container repository"
79-
uses: docker/login-action@v2
80-
with:
81-
registry: ${{secrets.REDHAT_REGISTRY_URL}}
82-
username: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_USER}}
83-
password: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_AUTH_TOKEN}}
84-
8578
- name: "Build .NET web API image"
8679
run: |
8780
docker build prime-dotnet-webapi/ \

‎.github/workflows/build-main.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ jobs:
7575
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
7676
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
7777

78-
- name: "Login to RedHat container repository"
79-
uses: docker/login-action@v2
80-
with:
81-
registry: ${{secrets.REDHAT_REGISTRY_URL}}
82-
username: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_USER}}
83-
password: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_AUTH_TOKEN}}
84-
8578
- name: "Build .NET web API image"
8679
run: |
8780
docker build prime-dotnet-webapi/ \

‎.github/workflows/build-pr.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ jobs:
8888
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
8989
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
9090

91-
- name: "Login to RedHat container repository"
92-
uses: docker/login-action@v2
93-
with:
94-
registry: ${{secrets.REDHAT_REGISTRY_URL}}
95-
username: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_USER}}
96-
password: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_AUTH_TOKEN}}
97-
9891
- name: "Get current pull request"
9992
uses: 8BitJonny/gh-get-current-pr@2.2.0
10093
id: PR

‎.github/workflows/build-test.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ jobs:
7575
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
7676
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
7777

78-
- name: "Login to RedHat container repository"
79-
uses: docker/login-action@v2
80-
with:
81-
registry: ${{secrets.REDHAT_REGISTRY_URL}}
82-
username: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_USER}}
83-
password: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_AUTH_TOKEN}}
84-
8578
- name: "Build .NET web API image"
8679
run: |
8780
docker build prime-dotnet-webapi/ \

‎.github/workflows/build-tools.yml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ jobs:
2828
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
2929
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
3030

31-
- name: "Login to RedHat container repository"
32-
uses: docker/login-action@v1
33-
with:
34-
registry: ${{secrets.REDHAT_REGISTRY_URL}}
35-
username: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_USER}}
36-
password: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_AUTH_TOKEN}}
37-
3831
- name: "Build, tag and push Document Manager image"
3932
id: build-image
4033
env:
@@ -66,13 +59,6 @@ jobs:
6659
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
6760
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
6861

69-
- name: "Login to RedHat container repository"
70-
uses: docker/login-action@v1
71-
with:
72-
registry: ${{secrets.REDHAT_REGISTRY_URL}}
73-
username: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_USER}}
74-
password: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_AUTH_TOKEN}}
75-
7662
- name: "Build, tag and push .NET web API image"
7763
id: build-image
7864
env:
@@ -119,12 +105,6 @@ jobs:
119105
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
120106
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
121107

122-
- name: "Login to RedHat container repository"
123-
uses: docker/login-action@v1
124-
with:
125-
registry: ${{secrets.REDHAT_REGISTRY_URL}}
126-
username: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_USER}}
127-
password: ${{secrets.REDHAT_REGISTRY_SERVICE_ACCOUNT_AUTH_TOKEN}}
128108

129109
- name: "Build, tag & push Angular frontend image"
130110
id: build-image

‎document-manager/backend/openshift.dockerfile‎

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/backup-container/docker/backup.file.utils‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,32 @@ function generateFilename(){
214214
)
215215
}
216216

217+
function generateBackupLogFilename(){
218+
(
219+
_backupDir=${1}
220+
_databaseSpec=${2}
221+
_database=$(getDatabaseName ${_databaseSpec})
222+
223+
# Only generate backup log filename for prime databases since the backup log is only applicable to prime databases.
224+
if [[ ${_database} == "prime-prod" || ${_database} == "prime-test" || ${_database} == "prime-dev" ]]; then
225+
226+
_dateRangeString=$(get_archive_date_range)
227+
if [[ -z "${_dateRangeString}" ]]; then
228+
logError "Failed to get date range string for backup log filename."
229+
echo ""
230+
else
231+
_coreFilename=$(generateCoreFilename ${_databaseSpec})
232+
_filename="${_backupDir}${_coreFilename}_transaction_log_${_dateRangeString}"
233+
echo ${_filename}
234+
fi
235+
else
236+
logError "Database ${_database} is not a prime database. do not generate backup log filename."
237+
echo ""
238+
fi
239+
240+
)
241+
}
242+
217243
function generateCoreFilename(){
218244
(
219245
_databaseSpec=${1}

‎infrastructure/backup-container/docker/backup.postgres.plugin‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ function onBackupDatabase(){
1818

1919
_databaseSpec=${1}
2020
_backupFile=${2}
21+
_logBackupFile=${3}
2122

2223
_hostname=$(getHostname ${_databaseSpec})
2324
_database=$(getDatabaseName ${_databaseSpec})
@@ -28,10 +29,24 @@ function onBackupDatabase(){
2829
echoGreen "Backing up '${_hostname}${_port:+:${_port}}${_database:+/${_database}}' to '${_backupFile}' ..."
2930

3031
export PGPASSWORD=${_password}
32+
# Create a backup of the database, excluding the transaction log tables, and a backup of the roles.
3133
pg_dump -Fp -T '"PharmanetTransactionLog"' -T 'pharmanettransactionlog*' -h "${_hostname}" ${_portArg} -U "${_username}" "${_database}" > "${BACKUP_DIR}backup.sql"
3234
pg_dumpall -h "${_hostname}" ${_portArg} -U "${_username}" --roles-only --no-role-passwords > "${BACKUP_DIR}roles.sql"
3335
tar -C ${BACKUP_DIR} -cvzf ${_backupFile} backup.sql roles.sql
3436
rm "${BACKUP_DIR}roles.sql" && rm "${BACKUP_DIR}backup.sql"
37+
38+
# If a log backup file was specified, backup the transaction log archive table.
39+
40+
if [[ ! -z "${_logBackupFile}" ]]; then
41+
logInfo "Try to create log backup file '${_logBackupFile}'\n"
42+
43+
pg_dump --data-only -t '"PharmanetTransactionLogArchive"' -h "${_hostname}" ${_portArg} -U "${_username}" "${_database}" > "${BACKUP_DIR}log_backup.sql"
44+
tar -C ${BACKUP_DIR} -cvzf ${_logBackupFile} log_backup.sql
45+
rm "${BACKUP_DIR}log_backup.sql"
46+
else
47+
echoYellow "No log backup file specified. Skipping backup of the transaction log archive table."
48+
fi
49+
3550
return ${PIPESTATUS[0]}
3651
)
3752
}

0 commit comments

Comments
 (0)