From 26671368a285c4d93e09aa2f46332e950d2e0e88 Mon Sep 17 00:00:00 2001 From: Sundareswar Pullela <110754869+sundareswarpullela@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:03:47 -0800 Subject: [PATCH] Make cicd use the ARAX Dockerfile #2411 --- .github/workflows/pytest.yml | 2 +- DockerBuild/Dockerfile | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index deaaae44b..3f1425e36 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -67,7 +67,7 @@ jobs: run: sudo docker rmi $(sudo docker images -q) - name: Build docker image - run: sudo docker build --no-cache=true --rm -t rtx:test DockerBuild/ -f DockerBuild/Merged-Dockerfile + run: sudo docker build --no-cache=true --rm -t rtx:test DockerBuild/ -f DockerBuild/Dockerfile - name: Run docker container run: sudo docker run -d -it --name rtx_test -v /mnt/data/orangeboard/databases:/mnt/data/orangeboard/databases -v /mnt/config/config_secrets.json:/mnt/data/orangeboard/production/RTX/code/config_secrets.json rtx:test diff --git a/DockerBuild/Dockerfile b/DockerBuild/Dockerfile index e38facf94..adb97f293 100644 --- a/DockerBuild/Dockerfile +++ b/DockerBuild/Dockerfile @@ -32,16 +32,13 @@ RUN chmod -R 700 /home/rt/.ssh RUN mkdir -p /mnt/data/orangeboard/production RUN chown -R rt.rt /mnt/data/orangeboard/production RUN su rt && cd /mnt/data/orangeboard/production && git clone https://github.com/RTXteam/RTX.git -# 08/12/2022 NCATS change -RUN su rt && cd /mnt/data/orangeboard/production/RTX && git checkout ${BUILD_BRANCH} -RUN chown -R rt.rt /mnt/data/orangeboard/production/RTX # install apache2 and copy config file RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -yq apache2 COPY 000-default.conf /etc/apache2/sites-available/000-default.conf RUN cd /var/www && mv html html-orig && ln -s /mnt/data/orangeboard/production/RTX/code/UI/interactive html RUN cd /var/www && a2enmod proxy && a2enmod proxy_html && a2enmod proxy_http && a2enmod rewrite && a2enmod headers -RUN a2enmod remoteip +RUN a2enconf remoteip COPY remoteip.conf /etc/apache2/conf-available/remoteip.conf RUN a2enconf remoteip RUN cd /var/www && /usr/sbin/apachectl configtest