Skip to content

Fix grpc security variables name and missing exec qualifier in docker.dev #935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feast-ci-bot merged 1 commit into from
Aug 6, 2020
Merged

Fix grpc security variables name and missing exec qualifier in docker.dev #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ grpc:
port: 6565
security:
enabled: false
certificateChainPath: server.crt
privateKeyPath: server.key
certificateChain: server.crt
privateKey: server.key

spring:
jpa:
Expand Down
2 changes: 1 addition & 1 deletion infra/docker/core/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:11-jre
ARG REVISION=dev
ADD $PWD/core/target/feast-core-$REVISION.jar /opt/feast/feast-core.jar
ADD $PWD/core/target/feast-core-$REVISION-exec.jar /opt/feast/feast-core.jar
CMD ["java",\
"-Xms2048m",\
"-Xmx2048m",\
Expand Down
2 changes: 1 addition & 1 deletion infra/docker/serving/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG REVISION=dev
RUN wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.3.1/grpc_health_probe-linux-amd64 \
-O /usr/bin/grpc-health-probe && \
chmod +x /usr/bin/grpc-health-probe
ADD $PWD/serving/target/feast-serving-$REVISION.jar /opt/feast/feast-serving.jar
ADD $PWD/serving/target/feast-serving-$REVISION-exec.jar /opt/feast/feast-serving.jar
CMD ["java",\
"-Xms1024m",\
"-Xmx1024m",\
Expand Down
4 changes: 2 additions & 2 deletions serving/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ grpc:
port: ${GRPC_PORT:6566}
security:
enabled: false
certificateChainPath: server.crt
privateKeyPath: server.key
certificateChain: server.crt
privateKey: server.key

server:
# The port number on which the Tomcat webserver that serves REST API endpoints should listen
Expand Down