Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
zacharyblasczyk committed Nov 27, 2024
1 parent 810cc1e commit 8200455
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
26 changes: 13 additions & 13 deletions apps/webservice/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ const config = {
],
},

// async rewrites() {
// return [
// {
// source: "/api/v1/resources/proxy/controller",
// destination: "http://localhost:4000/api/v1/resources/proxy/controller",
// },
// {
// source: "/api/v1/resources/proxy/session/:path*",
// destination:
// "http://localhost:4000/api/v1/resources/proxy/session/:path*",
// },
// ];
// },
async rewrites() {
return [
{
source: "/api/v1/resources/proxy/controller",
destination: "http://localhost:4000/api/v1/resources/proxy/controller",
},
{
source: "/api/v1/resources/proxy/session/:path*",
destination:
"http://localhost:4000/api/v1/resources/proxy/session/:path*",
},
];
},
/** We already do linting and typechecking as separate tasks in CI */
eslint: { ignoreDuringBuilds: true },
typescript: { ignoreBuildErrors: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const ProviderActionsDropdown: React.FC<{
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
{provider.googleConfig && (
{provider.googleConfig != null && (
<UpdateGoogleProviderDialog
providerId={provider.id}
name={provider.name}
Expand All @@ -80,7 +80,7 @@ export const ProviderActionsDropdown: React.FC<{
</DropdownMenuItem>
</UpdateGoogleProviderDialog>
)}
{provider.awsConfig && (
{provider.awsConfig != null && (
<UpdateAwsProviderDialog
providerId={provider.id}
name={provider.name}
Expand Down
30 changes: 15 additions & 15 deletions docker-compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ services:
volumes:
- redisinsight-data:/data

otel-collector:
image: otel/opentelemetry-collector-contrib:latest
container_name: ctrlplane-otel-collector
command: ["--config=/etc/otel-collector-config.yaml"]
environment:
- DD_API_KEY=${DD_API_KEY}
- DD_SITE=${DD_SITE}
volumes:
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
ports:
- "4317:4317" # OTLP gRPC
- "4318:4318" # OTLP HTTP
- "8125:8125" # StatsD
- "8888:8888" # Telemetry
- "9109:9109" # Prometheus endpoint
# otel-collector:
# image: otel/opentelemetry-collector-contrib:latest
# container_name: ctrlplane-otel-collector
# command: ["--config=/etc/otel-collector-config.yaml"]
# environment:
# - DD_API_KEY=${DD_API_KEY}
# - DD_SITE=${DD_SITE}
# volumes:
# - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
# ports:
# - "4317:4317" # OTLP gRPC
# - "4318:4318" # OTLP HTTP
# - "8125:8125" # StatsD
# - "8888:8888" # Telemetry
# - "9109:9109" # Prometheus endpoint

volumes:
db-data:
Expand Down

0 comments on commit 8200455

Please sign in to comment.