Skip to content

Commit

Permalink
Merge pull request #460 from bcgov/CSOCA-526
Browse files Browse the repository at this point in the history
Update API requirements
  • Loading branch information
WadeBarnes authored Jul 31, 2024
2 parents 9c421b7 + db9e75e commit daa4bec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Main
django==4.0.10
django==4.2.14
django-filter>=21.1,<22
djangorestframework>=3.13.1,<4
djangorestframework-bulk>=0.2.1,<1
Expand Down Expand Up @@ -30,4 +30,4 @@ jsonschema>=3.2.0,<4
zeep>=4.0.0

setuptools>=65.5.1
certifi==2022.12.07
certifi==2024.7.4
14 changes: 7 additions & 7 deletions docker/manage
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ usage() {
start - Creates the application containers from the built images
and starts the services based on the docker-compose.yml file.
You can pass in a list of containers to start.
You can pass in a list of containers to start.
By default all containers will be started.
The API_URL used by coa-web can also be redirected.
Examples:
Expand Down Expand Up @@ -77,7 +77,7 @@ build-web() {
-t ${COMPOSE_PROJECT_NAME}'-runtime' \
-f './nginx-runtime/Dockerfile' './nginx-runtime/'
echo -e "===================================================================================================="

echo -e "\n\n===================================================================================================="
echo -e "Building the ${COMPOSE_PROJECT_NAME}-web-artifacts image using s2i (WEB_BASE_HREF: '${WEB_BASE_HREF}') ..."
echo -e "----------------------------------------------------------------------------------------------------"
Expand Down Expand Up @@ -153,7 +153,7 @@ build-api() {
${S2I_EXE} build \
--copy \
'../api' \
'centos/python-38-centos7' \
'registry.fedoraproject.org/f33/python3' \
${COMPOSE_PROJECT_NAME}'-api'
echo -e "===================================================================================================="
}
Expand All @@ -171,10 +171,10 @@ configureEnvironment () {
case "$arg" in
*=*)
export ${arg}
;;
;;
esac
done

# db
export POSTGRESQL_DATABASE="appdb"
export POSTGRESQL_USER="coa"
Expand Down Expand Up @@ -229,7 +229,7 @@ getStartupParams() {
case "$arg" in
*=*)
# Skip it
;;
;;
-*)
ARGS+=" $arg";;
*)
Expand Down

0 comments on commit daa4bec

Please sign in to comment.