Skip to content

Commit

Permalink
BAH-2390 | Refactor. Removed default-config from OpenELIS image build (
Browse files Browse the repository at this point in the history
  • Loading branch information
mohan-13 authored Oct 20, 2022
1 parent 27e03c8 commit 395a83a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 26 deletions.
15 changes: 0 additions & 15 deletions .github/download_artifact.sh

This file was deleted.

5 changes: 0 additions & 5 deletions .github/workflows/build_publish_openelis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ on:
paths-ignore:
- '**.md'

repository_dispatch:
types: ['default-config-trigger']

jobs:
docker-build-publish:
name: Build & Publish OpenELIS Docker Image
Expand Down Expand Up @@ -45,8 +42,6 @@ jobs:
rm setArtifactVersion.sh
- name: Package
run: ant dist
- name: Download default_config.zip
run: sh .github/download_artifact.sh default-config default_config ${{secrets.BAHMNI_PAT}}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
Expand Down
8 changes: 2 additions & 6 deletions package/docker/openelis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ ENV SERVER_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
ENV DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,address=8001,server=y,suspend=n"
ENV OPENELIS_DB_SERVER='openelisdb'

# Creating Config Directories
RUN mkdir -p /tmp/artifacts/default_config/
RUN mkdir -p /etc/bahmni_config/openelis/

RUN mkdir -p ${WAR_DIRECTORY}
RUN mkdir -p /opt/bahmni-lab/migrations/db_backup/
RUN mkdir -p /opt/bahmni-lab/migrations/liquibase/
Expand All @@ -19,9 +17,7 @@ RUN yum install -y unzip

ADD https://repo.mybahmni.org/packages/build/bahmni-embedded-tomcat-8.0.42.jar /opt/bahmni-lab/lib/bahmni-lab.jar
COPY openelis/dist/openelis.war /etc/bahmni-lab/openelis.war
ADD package/resources/default_config.zip /tmp/artifacts/
RUN unzip -d /tmp/artifacts/default_config/ /tmp/artifacts/default_config.zip
RUN cp -r /tmp/artifacts/default_config/openelis/. /etc/bahmni_config/openelis/


RUN cd ${WAR_DIRECTORY} && jar xvf /etc/bahmni-lab/openelis.war

Expand Down

0 comments on commit 395a83a

Please sign in to comment.