Skip to content

Update v1.1.0 #122

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
LucJosin merged 9 commits into from
Aug 17, 2023
Merged

Update v1.1.0 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
80debef
revert: Commit 3d9346e
LucJosin Aug 16, 2023
839e3ed
feat: Expose port 8000 on docker
LucJosin Aug 16, 2023
0248a30
fix: Wrong `build-website` script
LucJosin Aug 16, 2023
744f11f
fix: Wrong project name
LucJosin Aug 16, 2023
5efa8cd
fix: Wrong `on push tag` configuration on release action
LucJosin Aug 16, 2023
eef5fd5
feat: Enable http2 and define default port to 8000 on production
LucJosin Aug 16, 2023
bdc94f4
feat: Define `INFO` as default root logging on production
LucJosin Aug 16, 2023
12e54ec
fix: TestContainers running after tests
LucJosin Aug 16, 2023
b216410
Merge branch 'main' into dev
LucJosin Aug 16, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Build, Publish and Release"
on:
push:
tags:
- 'v*.*.*'
- 'v[0-9].[0-9]+.[0-9]'

env:
GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
Expand Down Expand Up @@ -62,4 +62,4 @@ jobs:
# Release

- name: Deploy to Koyeb
run: koyeb service redeploy hawapi/hawapi
run: koyeb service redeploy project/hawapi
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ WORKDIR /app

COPY target/hawapi-*.jar hawapi.jar

EXPOSE 8080:8080
CMD ["java","-jar","hawapi.jar", "-Dspring.profiles.active=prod"]
EXPOSE 8000
ENTRYPOINT ["java","-jar","-Dspring.profiles.active=prod","hawapi.jar"]
4 changes: 2 additions & 2 deletions scripts/build-website.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ if ! [ -d ".hawapi/website" ]; then
if ! [ -d ".downloads/" ]; then
echo "${cyan}[$0] ${green}Directory '.downloads/' not found!"
mkdir -p .downloads/
wget ${website_zip} -q --show-progress -P .downloads/
wget ${website_zip} -O "./.downloads/${website_repository}-main.zip" -q --show-progress
echo "${cyan}[$0] Downloading '${org_name}/${website_repository}' from Github..."
wget ${docs_zip} -q --show-progress -P .downloads/
wget ${docs_zip} -O "./.downloads/${docs_repository}-main.zip" -q --show-progress
echo "${cyan}[$0] Downloading '${org_name}/${docs_repository}' from Github..."
fi

Expand Down
7 changes: 6 additions & 1 deletion src/main/resources/application-prod.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ spring.config.activate.on-profile=prod
logging.level.org.springframework.web.servlet.mvc.method.annotation.HttpEntityMethodProcessor=WARN
logging.level.org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor=WARN

# CONFIG

server.http2.enabled=true
server.port=8000

# ENDPOINTS

# Enable/Disable '/register' endpoint.
Expand All @@ -25,7 +30,7 @@ logging.file.name=logs/application.log
logging.file.max-history=30
logging.file.max-size=10MB

logging.level.root=WARN
logging.level.root=INFO
logging.level.org.hibernate=WARN
logging.level.org.springframework.web=WARN
logging.level.org.springframework.security=WARN
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/com/lucasjosino/hawapi/configs/initializer/DatabaseContainerInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ abstract public class DatabaseContainerInitializer {
@SuppressWarnings("resource")
private static final PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>(DB_NAME_AND_VERSION)
.withCopyFileToContainer(MountableFile.forClasspathResource(SCHEMA_LOCATION), DB_ENTRY_POINT)
.withExposedPorts(5432)
.withReuse(true);
.withExposedPorts(5432);

static {
postgreSQLContainer.start();
Expand Down