Skip to content
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.

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

Fix order details page and migrate dependencies #211

Merged
merged 2 commits into from
Jul 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions deploy/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
- SMTP_AUTH=true
- SMTP_STARTTLS=true
- ENABLE_LOG4J=${ENABLE_LOG4J:-false}
- API_GATEWAY_URL=https://api.crapi.io
- API_GATEWAY_URL=https://api.mypremiumdealership.com
- TLS_ENABLED=${TLS_ENABLED:-false}
- TLS_KEYSTORE_TYPE=PKCS12
- TLS_KEYSTORE=classpath:certs/server.p12
Expand Down Expand Up @@ -121,7 +121,7 @@ services:
- MONGO_DB_PASSWORD=crapisecretpassword
- MONGO_DB_NAME=crapi
- SECRET_KEY=crapi
- API_GATEWAY_URL=https://api.crapi.io
- API_GATEWAY_URL=https://api.mypremiumdealership.com
- TLS_ENABLED=${TLS_ENABLED:-false}
- TLS_CERTIFICATE=certs/server.crt
- TLS_KEY=certs/server.key
Expand Down Expand Up @@ -239,8 +239,8 @@ services:
cpus: '0.3'
memory: 128M

api.crapi.io:
container_name: api.crapi.io
api.mypremiumdealership.com:
container_name: api.mypremiumdealership.com
image: crapi/gateway-service:${VERSION:-latest}
#ports:
# - "${LISTEN_IP:-127.0.0.1}:8443:443" # https
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/values-tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.
replicaCount: 1
imagePullPolicy: Always
apiGatewayServiceUrl: https://api.tr4t.io
apiGatewayServiceUrl: https://api.mypremiumdealership.com
apiGatewayServiceInstall: false
enableLog4j: true
enableShellInjection: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jwtSecret: crapi
enableLog4j: false
enableShellInjection: true
imagePullPolicy: Always
apiGatewayServiceUrl: https://api.crapi.io
apiGatewayServiceUrl: https://api.mypremiumdealership.com
apiGatewayServiceInstall: true
apiGatewayPassword:
tlsEnabled: false
Expand Down
2 changes: 1 addition & 1 deletion services/gateway-service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN go build -v -o server
RUN wget https://github.com/minio/certgen/releases/latest/download/certgen-linux-amd64 -O /tmp/certgen \
&& chmod +x /tmp/certgen

RUN /tmp/certgen -host "127.0.0.1,gateway-service,api.crapi.io,crapi.io"
RUN /tmp/certgen -host "127.0.0.1,gateway-service,api.mypremiumdealership.com,mypremiumdealership.com"
RUN ls -la

FROM debian:buster-slim
Expand Down
2 changes: 1 addition & 1 deletion services/gateway-service/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module api.crapi.io/v1
module api.mypremiumdealership.com/v1

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion services/identity/.env
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export SMTP_FROM=no-reply@example.com
export ENABLE_SHELL_INJECTION=false
export JWT_SECRET=crapi
export SMTP_HOST=smtp.example.com
export API_GATEWAY_URL=https://api.crapi.io:9443
export API_GATEWAY_URL=https://api.mypremiumdealership.com
export TLS_ENABLED=false
export TLS_KEYSTORE_TYPE=PKCS12
export TLS_KEYSTORE=classpath:certs/server.p12
Expand Down
Loading
Loading