From 395a83ab1fc3dfb21a84eff28bdd73cd6fc7a13b Mon Sep 17 00:00:00 2001 From: MOHANKUMAR T <31698165+mohan-13@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:55:44 +0530 Subject: [PATCH] BAH-2390 | Refactor. Removed default-config from OpenELIS image build (#62) --- .github/download_artifact.sh | 15 --------------- .github/workflows/build_publish_openelis.yml | 5 ----- package/docker/openelis/Dockerfile | 8 ++------ 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100755 .github/download_artifact.sh diff --git a/.github/download_artifact.sh b/.github/download_artifact.sh deleted file mode 100755 index 4524e671..00000000 --- a/.github/download_artifact.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -#Parameters (repository_name,artifact_name,github_pat) - -if [ $# -ne 3 ] -then -echo "Invalid Arguments. Need repository_name, artifact_name, github_pat" -exit 2 -fi - -curl -s https://api.github.com/repos/Bahmni/$1/actions/artifacts | \ - jq '[.artifacts[] | select (.name == '\"$2\"')]' | jq -r '.[0] | .archive_download_url' | \ - xargs curl -L -o $2.zip -H "Authorization: token $3" -unzip -d package/resources/ $2.zip && rm $2.zip \ No newline at end of file diff --git a/.github/workflows/build_publish_openelis.yml b/.github/workflows/build_publish_openelis.yml index 22d139cc..ae4783ee 100644 --- a/.github/workflows/build_publish_openelis.yml +++ b/.github/workflows/build_publish_openelis.yml @@ -10,9 +10,6 @@ on: paths-ignore: - '**.md' - repository_dispatch: - types: ['default-config-trigger'] - jobs: docker-build-publish: name: Build & Publish OpenELIS Docker Image @@ -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 diff --git a/package/docker/openelis/Dockerfile b/package/docker/openelis/Dockerfile index 8c451f72..5f605c7a 100644 --- a/package/docker/openelis/Dockerfile +++ b/package/docker/openelis/Dockerfile @@ -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/ @@ -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