Skip to content

Commit 624e0dd

Browse files
BAH-1416 | refactor. updated path references in bahmni-proxy build
Co-authored-by: Kavitha S <[email protected]>
1 parent 2dffb5a commit 624e0dd

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ bahmni-pacs/resources/dcm4chee/oviyam2.war
6161
*.class
6262
bahmni-lab/resources/openelis_demo_dump.sql
6363
bahmni-erp/resources/odoo_demo_dump.sql
64+
bahmni-proxy/resources/client_side_logging

bahmni-proxy/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ COPY resources/favicon.png /usr/local/apache2/htdocs/favicon.png
1010
COPY resources/maintenance.html /usr/local/apache2/htdocs/maintenance.html
1111
COPY resources/src.jpeg /usr/local/apache2/htdocs/src.jpeg
1212
RUN mkdir /var/cache/mod_proxy
13-
COPY resources/__init__.py \
14-
resources/client_side_logging.py \
15-
resources/client_side_logging.wsgi \
16-
resources/logging.yml \
17-
resources/RotatingLogger.py \
13+
COPY resources/client_side_logging/__init__.py \
14+
resources/client_side_logging/client_side_logging.py \
15+
resources/client_side_logging/client_side_logging.wsgi \
16+
resources/client_side_logging/logging.yml \
17+
resources/client_side_logging/RotatingLogger.py \
1818
/usr/local/apache2/htdocs/client_side_logging/
1919

2020
RUN apk add --update openssl && \

bahmni-proxy/README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,13 @@
33
This directory contains resources for building Docker image for Bahmni Proxy Container. The proxy container is a Apache Httpd server with overridden configurations. The proxy container is used for the following purposes.
44
1. Serve `Bahmni Index Page`
55
2. Proxy rules for different components of the application is configured.
6-
3. SSL configurations for the application are done through this service.
6+
3. SSL configurations for the application are done through this service.
7+
8+
## Building the image locally
9+
1. Checkout the [client_side_logging](https://github.com/Bahmni/client_side_logging) repository in the same location as bahmni-package.
10+
2. Navigate into bahmni-package directory.
11+
3. Set the environment variables.
12+
> export BAHMNI_VERSION=0.94
13+
14+
> export GITHUB_RUN_NUMBER=1
15+
4. Run the build script `./bahmni-proxy/scripts/docker_build.sh`

bahmni-proxy/scripts/docker_build.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#!/bin/bash
22
set -xe
33

4-
cp client_side_logging/{__init__.py,client_side_logging.py,client_side_logging.wsgi,logging.yml,RotatingLogger.py} bahmni-package/bahmni-proxy/resources/
4+
mkdir -p bahmni-proxy/resources/client_side_logging
5+
cp ../client_side_logging/{__init__.py,client_side_logging.py,client_side_logging.wsgi,logging.yml,RotatingLogger.py} bahmni-proxy/resources/client_side_logging
56

7+
cd bahmni-proxy
68
#Building Docker images
79
PROXY_IMAGE_TAG=${BAHMNI_VERSION}-${GITHUB_RUN_NUMBER}
810
docker build -t bahmni/proxy:${PROXY_IMAGE_TAG} -f Dockerfile . --no-cache

0 commit comments

Comments
 (0)