Skip to content

Commit

Permalink
**bug fixing*
Browse files Browse the repository at this point in the history
  • Loading branch information
Ozcan Aytac; Insylva project committed Aug 3, 2020
1 parent ec1ca77 commit dfbc6e2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 30 deletions.
25 changes: 3 additions & 22 deletions portal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,34 +38,16 @@ ENV PORT=3000
RUN yarn build

# production environment
FROM nginx:1.18.0
FROM nginx:latest

RUN apt-get update && apt-get install wget -y && apt-get install telnet -y && apt-get install vim -y

RUN apt-get install iputils-ping -y
# RUN apt-get install iputils-ping -y

RUN apt-get update && apt-get install nginx-extras -y

RUN apt-get install curl gnupg2 ca-certificates lsb-release -y

RUN echo "deb http://nginx.org/packages/debian `lsb_release -cs` nginx" \
| tee /etc/apt/sources.list.d/nginx.list
RUN echo "deb http://nginx.org/packages/mainline/debian `lsb_release -cs` nginx" \
| tee /etc/apt/sources.list.d/nginx.list

RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add -

RUN apt-key fingerprint ABF5BD827BD9BF62

# RUN apt-get update && apt-get upgrade && apt-get install nginx-module-njs -y

# RUN apt-get update && apt-get install nginx-module-geoip -y

# RUN apt-get update && apt-get install nginx-module-image-filter -y
# RUN apt-get update && apt-get install nginx-module-njs -y
# RUN apt-get update && apt-get install nginx-module-perl -y
# RUN apt-get update && apt-get install nginx-module-xslt -y

COPY --from=portal /app/in-sylva.portal/build /usr/share/nginx/html

RUN rm /etc/nginx/conf.d/default.conf
Expand All @@ -74,7 +56,7 @@ RUN chown -R :www-data /usr/share/nginx/html

COPY nginx/nginx.conf /etc/nginx/conf.d
COPY nginx/gzip.conf /etc/nginx/conf.d
COPY nginx/hello_world.js /etc/nginx/conf.d/hello_world.js
# COPY nginx/hello_world.js /etc/nginx/conf.d/hello_world.js

WORKDIR /usr/share/nginx/html
COPY ./env.sh .
Expand All @@ -85,6 +67,5 @@ RUN chmod +x env.sh
RUN ./env.sh

EXPOSE 3000
EXPOSE 80

CMD ["nginx", "-g", "daemon off;"]
6 changes: 0 additions & 6 deletions portal/env-config.js

This file was deleted.

3 changes: 2 additions & 1 deletion search/.env
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ REACT_APP_IN_SYLVA_LOGIN_HOST=http://w3.avignon.inra.fr/bas_insylva/login/
REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app
REACT_APP_IN_SYLVA_GRANT_TYPE=password
REACT_APP_IN_SYLVA_REALM=in-sylva
REACT_APP_PORT=3001
REACT_APP_PORT=3001
REACT_KEYCLOAK_TOKEN_VALIDITY=60
2 changes: 1 addition & 1 deletion search/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ FROM nginx:latest

RUN apt-get update && apt-get install wget -y && apt-get install telnet -y && apt-get install vim -y

RUN apt-get install iputils-ping -y
# RUN apt-get install iputils-ping -y

RUN apt-get update && apt-get install nginx-extras -y

Expand Down

0 comments on commit dfbc6e2

Please sign in to comment.