fix/#191 Docker build 실패 버그 수정

.github/workflows/dev-build-deploy.yml

@@ -55,11 +55,6 @@ jobs:
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }} -f aics-auth/Dockerfile .
           docker tag ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }} ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:latest
 
-      - name: Docker image build for aics-auth
-        run: |
-          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }} -f aics-auth/Dockerfile .
-          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }} ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:latest
-
       # Docker Hub 이미지 푸시
       - name: docker Hub push for aics-admin
         run: |
@@ -76,11 +71,6 @@ jobs:
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }}
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:latest
 
-      - name: docker Hub push for aics-auth
-        run: |
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:${{ github.sha }}
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/aics-auth:latest
-
   deploy-to-dev:
     runs-on: ubuntu-latest
     needs: build-docker-image
@@ -90,20 +80,29 @@ jobs:
       - name: checkout repository
         uses: actions/checkout@v3
 
-      - name: SSH to server and deploy
+      - name: scp docker-compose.yml to server
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          password: ${{ secrets.SERVER_PASSWORD }}
+          port: ${{ secrets.SERVER_PORT }}
+          source: docker/development/docker-compose.yml
+          target: ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}
+          strip_components: 2
+
+      - name: ssh to server and deploy
         uses: appleboy/ssh-action@v1.1.0
         with:
           host: ${{ secrets.SERVER_HOST }}
           username: ${{ secrets.SERVER_USERNAME }}
           password: ${{ secrets.SERVER_PASSWORD }}
           port: ${{ secrets.SERVER_PORT }}
           script: |
-            echo "${{ secrets.SERVER_PASSWORD }}" | scp docker/development/docker-compose.yml ${{ secrets.SERVER_USERNAME }}@${{ secrets.SERVER_HOST }}:${{ secrets.DOCKER_COMPOSE_PATH }}
-
-            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} pull aics-api
-            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} pull aics-admin
-            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} pull aics-auth
-
-            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} up -d aics-api
-            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} up -d aics-admin
-            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }} up -d aics-auth
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml pull aics-api
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml pull aics-admin
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml pull aics-auth
+
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml --env-file ${{ secrets.ENVIRONMENT_PATH }} up -d aics-api
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml --env-file ${{ secrets.ENVIRONMENT_PATH }} up -d aics-admin
+            echo "${{ secrets.SERVER_PASSWORD }}" | sudo -S docker-compose -f ${{ secrets.DOCKER_COMPOSE_YAML_PATH }}/docker-compose.yml --env-file ${{ secrets.ENVIRONMENT_PATH }} up -d aics-auth

aics-admin/src/main/java/kgu/developers/admin/config/SwaggerConfig.java

@@ -1,136 +1,96 @@
 package kgu.developers.admin.config;
 
+import static java.lang.String.format;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
-import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.lang.String.format;
-import static org.springframework.security.config.Elements.JWT;
 
 @Configuration
 @RequiredArgsConstructor
 public class SwaggerConfig {
 
-	private final Environment environment;
-
-	@Value("${profiles.current-ip}")
-	private String currentIp;
+	@Value("${docs.api-docs-url}")
+	private String apiDocsUrl;
 
-	@Value("${profiles.api-port}")
-	private int apiPort;
+	@Value("${docs.admin-docs-url}")
+	private String adminDocsUrl;
 
-	@Value("${profiles.admin-api-port}")
-	private int adminApiPort;
+	@Value("${docs.auth-docs-url}")
+	private String authDocsUrl;
 
-	@Value("${profiles.auth-api-port}")
-	private int authApiPort;
+	private final Environment environment;
 
-	private final Map<String, Map<String, Object>> profileServerConfig = new HashMap<>();
-
-	@PostConstruct
-	public void initializeProfileServerConfig() {
-		profileServerConfig.put("local", Map.of("url", "http://localhost", "port", adminApiPort));
-		profileServerConfig.put("dev", Map.of("url", "http://" + currentIp, "port", adminApiPort));
-	}
+	private static final Map<String, String> PROFILE_SERVER_URL_MAP = Map.of(
+		"dev", "https://aics-admin.ummdev.com",
+		"local", "http://localhost:8081"
+	);
 
 	@Bean
 	public OpenAPI openAPI() {
 		return new OpenAPI()
 			.info(apiInfo())
 			.addSecurityItem(securityRequirement())
-			.servers(initializeServers())
-			.components(components());
+			.components(components())
+			.servers(initializeServers());
+	}
+
+	private List<Server> initializeServers() {
+		String activeProfile = environment.getActiveProfiles()[0];
+		String serverUrl = PROFILE_SERVER_URL_MAP.getOrDefault(activeProfile, "http://localhost:8081");
+		return List.of(new Server().url(serverUrl).description("AICS-HOME ADMIN (" + activeProfile + ")"));
 	}
 
 	private SecurityRequirement securityRequirement() {
-		return new SecurityRequirement().addList(JWT);
+		return new SecurityRequirement().addList("bearer");
 	}
 
 	private Info apiInfo() {
 		return new Info()
-			.title("AICS-HOME ADMIN API")
+			.title("AICS-HOME ADMIN")
 			.description(getDescription());
 	}
 
-	private List<Server> initializeServers() {
-		return profileServerConfig.entrySet().stream()
-			.filter(entry -> environment.matchesProfiles(entry.getKey()))
-			.map(entry -> {
-				String url = (String) entry.getValue().get("url");
-				int port = (int) entry.getValue().get("port");
-				return openApiServer(url + ":" + port, "AICS-HOME ADMIN API " + entry.getKey().toUpperCase());
-			})
-			.collect(Collectors.toList());
-	}
-
-	private Server openApiServer(String url, String description) {
-		return new Server().url(url).description(description);
-	}
-
 	private Components components() {
-		return new Components().addSecuritySchemes(JWT, securityScheme());
+		return new Components().addSecuritySchemes("bearer", securityScheme());
 	}
 
 	private SecurityScheme securityScheme() {
 		return new SecurityScheme()
-			.name(JWT)
+			.name("bearer")
 			.type(SecurityScheme.Type.HTTP)
 			.scheme("bearer")
-			.bearerFormat(JWT);
+			.bearerFormat("JWT");
 	}
 
 	private String getDescription() {
-		String activeProfile = getActiveProfile();
 		return format("""
-				AI 컴퓨터공학부 커뮤니티 관리자, AICS-HOME ADMIN API 입니다.
+				AI 컴퓨터공학부 커뮤니티 관리자, AICS-HOME ADMIN 입니다.
 
 				로그인 API를 통해 액세스 토큰을 발급 받고 헤더에 값을 넣어주세요.
 
 				별다른 절차 없이 API를 사용하실 수 있습니다.
 
-				사용자 API 문서는 다음 링크에서 확인하실 수 있습니다.
 				<ul>
-				    <li>AICS-HOME API : <a href="%s" target="_blank">%s</a></li>
-				</ul>
-
-				인증 인가 API 문서는 다음 링크에서 확인하실 수 있습니다.
-				<ul>
-				    <li>AICS-HOME AUTH API : <a href="%s" target="_blank">%s</a></li>
-				</ul>
+					<li>사용자 API 문서: <a href="%s" target="_blank">%s</a></li><br>
+					<li>관리자 API 문서: <a href="%s" target="_blank">%s</a></li><br>
+					<li>인증/인가 API 문서: <a href="%s" target="_blank">%s</a></li>
+            	</ul>
 				""",
-			getApiSwaggerByProfile(activeProfile), getApiSwaggerByProfile(activeProfile),
-			getAuthSwaggerByProfile(activeProfile), getAuthSwaggerByProfile(activeProfile)
-		);
-	}
-
-	private String getAuthSwaggerByProfile(String profile) {
-		String url = (String) profileServerConfig.get(profile).get("url");
-		return url + ":" + authApiPort + "/swagger-ui/index.html";
-	}
-
-	private String getApiSwaggerByProfile(String profile) {
-		String url = (String) profileServerConfig.get(profile).get("url");
-		return url + ":" + apiPort + "/swagger-ui/index.html";
-	}
-
-	private String getActiveProfile() {
-		return Arrays.stream(environment.getActiveProfiles())
-			.findFirst()
-			.orElse("local");
+			apiDocsUrl, apiDocsUrl,
+			adminDocsUrl, adminDocsUrl,
+			authDocsUrl, authDocsUrl);
 	}
 }

aics-admin/src/main/resources/application-dev.yml

@@ -7,9 +7,3 @@ spring:
       host: ${REDIS_HOST:redis}
       port: ${REDIS_PORT:6379}
       password: ${REDIS_PASSWORD}
-
-profiles:
-  current-ip: ${CURRENT_IP}
-  api-port: ${API_SERVER_PORT:8080}
-  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
-  auth-api-port: ${AUTH_API_SERVER_PORT:8082}

aics-admin/src/main/resources/application-local.yml

@@ -2,9 +2,3 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
-
-profiles:
-  current-ip: ${CURRENT_IP:localhost}
-  api-port: ${API_SERVER_PORT:8080}
-  admin-api-port: ${ADMIN_API_SERVER_PORT:8081}
-  auth-api-port: ${AUTH_API_SERVER_PORT:8082}

aics-admin/src/main/resources/application.yml

@@ -49,3 +49,8 @@ springdoc:
 jwt:
   issuer: ${JWT_ISSUER}
   secret_key: ${JWT_SECRET_KEY}
+
+docs:
+  admin-docs-url: ${ADMIN_DOCS_URL}
+  api-docs-url: ${API_DOCS_URL}
+  auth-docs-url: ${AUTH_DOCS_URL}