Skip to content

Commit

Permalink
*general bug fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
anatolicvs committed Mar 12, 2020
1 parent da4477b commit 8a8dc60
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
8 changes: 3 additions & 5 deletions portal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,12 @@ RUN yarn build
# production environment
FROM nginx:latest

RUN apt-get update && apt-get install wget && apt-get install telnet -y
RUN apt-get update && apt-get install wget -y && apt-get install telnet -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 telnet

ARG REACT_APP_IN_SYLVA_GATEKEEPER_HOST
ARG REACT_APP_IN_SYLVA_GATEKEEPER_PORT
ARG REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST
Expand All @@ -67,7 +65,7 @@ COPY --from=portal /app/in-sylva.portal/build /usr/share/nginx/html
RUN rm /etc/nginx/conf.d/default.conf

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

WORKDIR /usr/share/nginx/html
COPY ./env.sh .
Expand Down
2 changes: 1 addition & 1 deletion portal/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ while [ "$1" != "" ]; do
shift
done
# --no-cache
docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.portal .
docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.portal .
2 changes: 1 addition & 1 deletion portal/nginx/gzip.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Enable Gzip compressed.
gzip on;
# gzip on;

# Enable compression both for HTTP/1.0 and HTTP/1.1 (required for CloudFront).
gzip_http_version 1.0;
Expand Down
2 changes: 1 addition & 1 deletion search/nginx/gzip.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Enable Gzip compressed.
gzip on;
# gzip on;

# Enable compression both for HTTP/1.0 and HTTP/1.1 (required for CloudFront).
gzip_http_version 1.0;
Expand Down

0 comments on commit 8a8dc60

Please sign in to comment.