Skip to content

Commit

Permalink
docker: fix reverted changes solving conflicts #TASK-6559
Browse files Browse the repository at this point in the history
  • Loading branch information
juanrizetta committed Dec 11, 2024
1 parent 87d0ad3 commit ea69f08
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions docker/iva-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM httpd:2.4-bullseye
## Custom httpd.conf file to update exposed port from 80 to 8080
COPY ./docker/iva-app/custom-httpd.conf /usr/local/apache2/conf/httpd.conf

## To run the docker use:
## docker build -f ./docker/iva-app/Dockerfile -t iva-httpd .
## docker run --name jsorolla -p 8888:80 opencb/iva-app
## docker run --name jsorolla -p 8888:8080 opencb/iva-app
## Then open: http://localhost:8888/iva o http://localhost:8888/api

LABEL org.label-schema.vendor="OpenCB" \
Expand All @@ -15,19 +17,23 @@ LABEL org.label-schema.vendor="OpenCB" \
## Update and create iva user
RUN apt-get update && apt-get -y upgrade && \
apt-get install -y vim jq && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/* \
chown -R www-data /usr/local/apache2/logs/

## Allow to build different images by passing the path to the SITE
ARG SITE=src/sites

## Copy files
## IVA
COPY ./build/iva /usr/local/apache2/htdocs/iva
COPY ./${SITE}/iva/conf /usr/local/apache2/htdocs/iva/conf/
COPY ./${SITE}/iva/img /usr/local/apache2/htdocs/iva/img/
COPY --chown=www-data ./build/iva /usr/local/apache2/htdocs/iva
COPY --chown=www-data ./${SITE}/iva/conf /usr/local/apache2/htdocs/iva/conf/
COPY --chown=www-data ./${SITE}/iva/img /usr/local/apache2/htdocs/iva/img/

RUN true

## Run Docker images as non root
USER www-data

## Genome Maps (Coming soon :-) )
#COPY ./build/genome-maps /usr/local/apache2/htdocs/genome-maps

Expand Down

0 comments on commit ea69f08

Please sign in to comment.