From 1ac92ae031de0d70b4e05ce31e1e56fd8cbe325e Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 20:35:03 -0300 Subject: [PATCH 01/12] chore: adding metric network to podman --- start-container.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/start-container.sh b/start-container.sh index 9debda8..c5c850c 100644 --- a/start-container.sh +++ b/start-container.sh @@ -41,6 +41,7 @@ podman run -d \ --name $CONTAINER_NAME \ --restart always \ --network slirp4netns:allow_host_loopback=true \ + --network metrics \ $CONTAINER_REPOSITORY || { echo 'Failed to start container failed'; exit 1; } From a1a8aeff68942c3911aec0210f2f84e597d252fd Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 20:41:38 -0300 Subject: [PATCH 02/12] fix: fixing dependency --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 20ad79c..1730bf8 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,6 @@ dependencies { exclude module: 'spring-boot-starter-logging' } - implementation 'org.springframework.boot:spring-boot-starter-log4j2:2.7.0' implementation 'javax.xml.bind:jaxb-api:2.3.1' implementation 'com.h2database:h2:2.1.212' From e8aa52bc2dcc06f35e6e06f520bf251994f36ce7 Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 20:54:40 -0300 Subject: [PATCH 03/12] chore: removing old pipe option --- start-container.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/start-container.sh b/start-container.sh index c5c850c..0acd023 100644 --- a/start-container.sh +++ b/start-container.sh @@ -40,7 +40,6 @@ podman run -d \ --memory 400M \ --name $CONTAINER_NAME \ --restart always \ - --network slirp4netns:allow_host_loopback=true \ --network metrics \ $CONTAINER_REPOSITORY || { echo 'Failed to start container failed'; exit 1; } From 1e18678eb514046fb174fd43efbef199fb6f9760 Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 21:47:58 -0300 Subject: [PATCH 04/12] container fix --- .github/workflows/deploy-prod.yaml | 2 +- start-container.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml index 6d54336..6a04bd4 100644 --- a/.github/workflows/deploy-prod.yaml +++ b/.github/workflows/deploy-prod.yaml @@ -69,4 +69,4 @@ jobs: key: ${{ secrets.VM_SSH_PRIVATE_KEY }} script: | cd /home/${{ secrets.SSH_USERNAME }}/capivara - DISCORD_TOKEN='${{ secrets.DISCORD_BOT_TOKEN }}' LOG_CHANNEL_ID='${{ secrets.DISCORD_LOG_CHANNEL_ID }}' CURUPIRA_RESET='true' DATABASE_DRIVER='org.postgresql.Driver' DATABASE_DIALECT='org.hibernate.dialect.PostgreSQL95Dialect' DATABASE_URL='jdbc:postgresql://host.containers.internal:5432/capivara' DATABASE_USERNAME='${{ secrets.DATABASE_USERNAME }}' DATABASE_PASSWORD='${{ secrets.DATABASE_PASSWORD }}' JAVA_ARGS='-Xmx350M' /bin/bash start-container.sh docker.io/eduardoferro/capivara:${{ github.sha }} + DISCORD_TOKEN='${{ secrets.DISCORD_BOT_TOKEN }}' LOG_CHANNEL_ID='${{ secrets.DISCORD_LOG_CHANNEL_ID }}' CURUPIRA_RESET='true' DATABASE_DRIVER='org.postgresql.Driver' DATABASE_DIALECT='org.hibernate.dialect.PostgreSQL95Dialect' DATABASE_URL='jdbc:postgresql://capivara_database:5432/capivara' DATABASE_USERNAME='${{ secrets.DATABASE_USERNAME }}' DATABASE_PASSWORD='${{ secrets.DATABASE_PASSWORD }}' JAVA_ARGS='-Xmx350M' /bin/bash start-container.sh docker.io/eduardoferro/capivara:${{ github.sha }} diff --git a/start-container.sh b/start-container.sh index 0acd023..0f44541 100644 --- a/start-container.sh +++ b/start-container.sh @@ -41,6 +41,7 @@ podman run -d \ --name $CONTAINER_NAME \ --restart always \ --network metrics \ + --network capivara \ $CONTAINER_REPOSITORY || { echo 'Failed to start container failed'; exit 1; } From ea7405059ad557cab131f7bf92539c763cfd30af Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 22:24:20 -0300 Subject: [PATCH 05/12] feat: fixing startup --- .../java/com/softawii/capivara/config/SpringConfig.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/softawii/capivara/config/SpringConfig.java b/src/main/java/com/softawii/capivara/config/SpringConfig.java index af11e49..641cdd6 100644 --- a/src/main/java/com/softawii/capivara/config/SpringConfig.java +++ b/src/main/java/com/softawii/capivara/config/SpringConfig.java @@ -11,6 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.ApplicationArguments; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -38,8 +39,6 @@ public class SpringConfig { private static final Logger LOGGER = LogManager.getLogger(SpringConfig.class); private final Environment env; - @Value("${token}") - private String discordToken; public SpringConfig(Environment env) { this.env = env; @@ -63,7 +62,9 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() { } @Bean - public JDA jda() { + public JDA jda(ApplicationArguments args) { + String discordToken = args.getOptionValues("token").get(0); + JDA jda; try { JDABuilder builder = JDABuilder.create( From 69f1b58dea54eaa5bd0603956a529818537a9231 Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 22:35:49 -0300 Subject: [PATCH 06/12] fix: temporary fix to startup --- src/main/java/com/softawii/capivara/Main.java | 7 ++++--- start-container.sh | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/softawii/capivara/Main.java b/src/main/java/com/softawii/capivara/Main.java index 8d9c38a..c5670d6 100644 --- a/src/main/java/com/softawii/capivara/Main.java +++ b/src/main/java/com/softawii/capivara/Main.java @@ -19,8 +19,9 @@ public class Main { public static void main(String[] args) { ConfigurableApplicationContext context = SpringApplication.run(Main.class, args); JDA jda = context.getBean(JDA.class); - BuildProperties buildProperties = context.getBean(BuildProperties.class); - jda.getPresence().setPresence(Activity.of(Activity.ActivityType.PLAYING, buildProperties.getVersion()), true); - LOGGER.info(buildProperties.getVersion() + " Bot is ready as " + jda.getSelfUser().getName()); + // BuildProperties buildProperties = context.getBean(BuildProperties.class); + String version = "unknown"; + jda.getPresence().setPresence(Activity.of(Activity.ActivityType.PLAYING, version), true); + LOGGER.info(version + " Bot is ready as " + jda.getSelfUser().getName()); } } diff --git a/start-container.sh b/start-container.sh index 0f44541..81bb383 100644 --- a/start-container.sh +++ b/start-container.sh @@ -36,6 +36,7 @@ podman run -d \ -e DATABASE_USERNAME=${DATABASE_USERNAME:-sa} \ -e DATABASE_PASSWORD=${DATABASE_PASSWORD:-sa} \ -e JAVA_ARGS=${JAVA_ARGS:--Xmx200M} \ + -p 8080:8080 \ --cpus 0.5 \ --memory 400M \ --name $CONTAINER_NAME \ From f6bd0daeae5caf279a98b7f9fb3aca78a1cc228b Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 23:21:36 -0300 Subject: [PATCH 07/12] removing shadow-jar from deploy file --- build.gradle | 14 ++------------ src/main/resources/application.properties | 1 + start-container.sh | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 1730bf8..e166ebe 100644 --- a/build.gradle +++ b/build.gradle @@ -58,20 +58,10 @@ tasks.register('deploy') { jar { enabled = false } - shadowJar { + bootJar { archiveFileName = "CapivaraBot.jar" } - dependsOn 'shadowJar' -} - -tasks.register('homolog') { - jar { - enabled = false - } - shadowJar { - archiveFileName = "CapivaraBotHomolog.jar" - } - dependsOn 'shadowJar' + dependsOn 'bootJar' } test { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7131a7a..31ca00e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,4 @@ +spring.config.location=classpath:/com/softawii/capivara spring.application.name=softawii-capivara spring.datasource.url=jdbc:h2:file:./banco_h2;DB_CLOSE_DELAY=-1 spring.datasource.driverClassName=org.h2.Driver diff --git a/start-container.sh b/start-container.sh index 81bb383..810711e 100644 --- a/start-container.sh +++ b/start-container.sh @@ -42,7 +42,6 @@ podman run -d \ --name $CONTAINER_NAME \ --restart always \ --network metrics \ - --network capivara \ $CONTAINER_REPOSITORY || { echo 'Failed to start container failed'; exit 1; } From 25ff14791f7a74fb3ffccb3c40301d8fe57a15a4 Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 23:26:38 -0300 Subject: [PATCH 08/12] removing unused property file --- Dockerfile | 2 -- src/main/resources/application.properties | 1 - 2 files changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82b4c72..b5a6cbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,6 @@ COPY --from=builder /app . ENV JAVA_ARGS="-Xmx350M" ENV LOG_DIRECTORY="/app/logs" -ENV SPRING_CONFIG_LOCATION="/app/main.properties" ENV DISCORD_TOKEN="invalid" ENV CURUPIRA_RESET="true" ENV LOG_CHANNEL_ID="invalid" @@ -30,7 +29,6 @@ ENV DATABASE_PASSWORD="database-password" ENTRYPOINT java ${JAVA_ARGS} -jar CapivaraBot.jar \ --token=${DISCORD_TOKEN} \ - --spring.config.location=file:${SPRING_CONFIG_LOCATION} \ --curupira.reset=${CURUPIRA_RESET} \ --log.directory=${LOG_DIRECTORY} \ --log.channel.id=${LOG_CHANNEL_ID} \ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 31ca00e..7131a7a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,3 @@ -spring.config.location=classpath:/com/softawii/capivara spring.application.name=softawii-capivara spring.datasource.url=jdbc:h2:file:./banco_h2;DB_CLOSE_DELAY=-1 spring.datasource.driverClassName=org.h2.Driver From 09acdfad94a9bdbb526e94be5ad6e79938f0a3fb Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 23:31:17 -0300 Subject: [PATCH 09/12] idk --- start-container.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/start-container.sh b/start-container.sh index 810711e..0acd023 100644 --- a/start-container.sh +++ b/start-container.sh @@ -36,7 +36,6 @@ podman run -d \ -e DATABASE_USERNAME=${DATABASE_USERNAME:-sa} \ -e DATABASE_PASSWORD=${DATABASE_PASSWORD:-sa} \ -e JAVA_ARGS=${JAVA_ARGS:--Xmx200M} \ - -p 8080:8080 \ --cpus 0.5 \ --memory 400M \ --name $CONTAINER_NAME \ From f9477315231e225636fe6ea1ef1f60335f9cb1a8 Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 23:41:38 -0300 Subject: [PATCH 10/12] god please --- src/main/resources/application.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7131a7a..81bd982 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,4 +12,7 @@ management.metrics.tags.application=${spring.application.name} management.endpoints.web.exposure.include=prometheus management.metrics.export.prometheus.enabled=true server.tomcat.mbeanregistry.enabled=true -management.metrics.distribution.percentiles-histogram.http.server.requests=true \ No newline at end of file +management.metrics.distribution.percentiles-histogram.http.server.requests=true + +security.basic.enabled=false +management.security.enabled=false \ No newline at end of file From cf7fad8b73a76f77aaeaa296ab7484604fe5b8d1 Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 23:44:14 -0300 Subject: [PATCH 11/12] agora vai --- start-container.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start-container.sh b/start-container.sh index 0acd023..78b0a97 100644 --- a/start-container.sh +++ b/start-container.sh @@ -11,7 +11,7 @@ if [[ -z "${DISCORD_TOKEN}" ]] || [[ -z "${LOG_CHANNEL_ID}" ]] ; then exit 1 fi -CONTAINER_NAME="capivara_bot" +CONTAINER_NAME="capivarabot" OLD_CONTAINER_ID=$(podman ps --all --quiet --filter "name=$CONTAINER_NAME") if [[ -z "${OLD_CONTAINER_ID}" ]]; then From 17db33f855fb55fda09bf841b271e1d3af0ee9c7 Mon Sep 17 00:00:00 2001 From: yaansz Date: Sun, 13 Oct 2024 23:47:09 -0300 Subject: [PATCH 12/12] Fixing Version!!!! --- src/main/java/com/softawii/capivara/Main.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/softawii/capivara/Main.java b/src/main/java/com/softawii/capivara/Main.java index c5670d6..8d9c38a 100644 --- a/src/main/java/com/softawii/capivara/Main.java +++ b/src/main/java/com/softawii/capivara/Main.java @@ -19,9 +19,8 @@ public class Main { public static void main(String[] args) { ConfigurableApplicationContext context = SpringApplication.run(Main.class, args); JDA jda = context.getBean(JDA.class); - // BuildProperties buildProperties = context.getBean(BuildProperties.class); - String version = "unknown"; - jda.getPresence().setPresence(Activity.of(Activity.ActivityType.PLAYING, version), true); - LOGGER.info(version + " Bot is ready as " + jda.getSelfUser().getName()); + BuildProperties buildProperties = context.getBean(BuildProperties.class); + jda.getPresence().setPresence(Activity.of(Activity.ActivityType.PLAYING, buildProperties.getVersion()), true); + LOGGER.info(buildProperties.getVersion() + " Bot is ready as " + jda.getSelfUser().getName()); } }