Skip to content

chore: 오타 수정 및 개행 수정#129

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
nayonsoso merged 3 commits into from
Dec 27, 2024
Merged

chore: 오타 수정 및 개행 수정 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ef1537
style: 개행 수정
nayonsoso Dec 21, 2024
2554b71
chore: 오타 수정
nayonsoso Dec 21, 2024
898c18e
refactor: docker-compose 를 docker compose 로
nayonsoso Dec 21, 2024
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
Binary file modifiedREADME.md
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions local_compose_down.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@

set -e

echo "Starting all docker containers..."
docker-compose -f docker-compose.local.yml down
echo "Stopping all docker containers..."
dockercompose -f docker-compose.local.yml down

echo "Pruning unused Docker images..."
docker image prune -f

echo "Containers are up and running."
docker-compose ps -a
echo "Containers are down and not running."
dockercompose ps -a
4 changes: 2 additions & 2 deletions local_compose_up.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,10 @@ if [ ! -d "redis_data_local" ]; then
fi

echo "Starting all docker containers..."
docker-compose -f docker-compose.local.yml up -d
dockercompose -f docker-compose.local.yml up -d

echo "Pruning unused Docker images..."
docker image prune -f

echo "Containers are up and running."
docker-compose ps -a
dockercompose ps -a
2 changes: 1 addition & 1 deletion src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,4 +14,4 @@
public class CorsPropertiesConfig {

private List<String> allowedOrigins;
}
}
1 change: 0 additions & 1 deletion src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,6 @@ public class SiteUser {
@OneToMany(mappedBy = "siteUser", cascade = CascadeType.ALL, orphanRemoval = true)
private List<GpaScore> gpaScoreList = new ArrayList<>();


public SiteUser(
String email,
String nickname,
Expand Down