Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ public static void main(String[] args) {
org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
"/swagger-resources/**",
"/webjars/**",
"/demo-ui.html",
"/nowait/management",
"/nowait/management/**",
"/health-check"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ public static void main(String[] args) {
SpringApplication.run(ApiUserApplication.class, args);
}
}

14 changes: 0 additions & 14 deletions scripts/deploy-admin-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,6 @@ else
echo "No admin container found."
fi

if [ -n "$CONTAINER_PROMETHEUS_ID" ]; then
echo "Stopping container $CONTAINER_PROMETHEUS_ID"
docker rm -f "$CONTAINER_PROMETHEUS_ID"
else
echo "No admin container found."
fi

if [ -n "$CONTAINER_GRAFANA_ID" ]; then
echo "Stopping container $CONTAINER_GRAFANA_ID"
docker rm -f "$CONTAINER_GRAFANA_ID"
else
echo "No admin container found."
fi

echo "3. start container"
sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev pull nowait-app-admin-api prometheus-admin grafana-admin
sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev up -d nowait-app-admin-api prometheus-admin grafana-admin
Expand Down
14 changes: 0 additions & 14 deletions scripts/deploy-user-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,6 @@ else
echo "No admin container found."
fi

if [ -n "$CONTAINER_PROMETHEUS_ID" ]; then
echo "Stopping container $CONTAINER_PROMETHEUS_ID"
docker rm -f "$CONTAINER_PROMETHEUS_ID"
else
echo "No admin container found."
fi

if [ -n "$CONTAINER_GRAFANA_ID" ]; then
echo "Stopping container $CONTAINER_GRAFANA_ID"
docker rm -f "$CONTAINER_GRAFANA_ID"
else
echo "No admin container found."
fi

echo "3. start container"
sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev pull nowait-app-user-api prometheus-user grafana-user
sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev up -d nowait-app-user-api prometheus-user grafana-user
Expand Down