Skip to content

Commit

Permalink
feat(devcontainer): enhance Dockerfile and devcontainer configuration…
Browse files Browse the repository at this point in the history
… with additional libraries and new Maven commands
  • Loading branch information
pethers authored Jan 12, 2025
1 parent b4d523a commit ade9731
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
libgbm1 \
libasound2 \
libxtst6 \
libx11-6 \
libxext6 \
libxi6 \
x11-xserver-utils \
&& sh -c 'echo "deb [signed-by=/usr/share/keyrings/postgres-archive-keyring.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/postgresql.list' \
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/postgres-archive-keyring.gpg \
&& apt-get update \
Expand Down
48 changes: 47 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
"args": [
"exec:java",
"-Dexec.classpathScope=test",
"-Dexec.mainClass=com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer"
"-Dexec.mainClass=com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer",
"-Djava.awt.headless=true"
],
"options": {
"cwd": "${workspaceFolder}/citizen-intelligence-agency"
Expand All @@ -75,6 +76,51 @@
"reveal": "always",
"panel": "new"
}
},
{
"label": "Unit Tests",
"type": "shell",
"command": "mvn",
"args": [
"-B",
"clean",
"install",
"-Prelease-site,all-modules",
"-DforkMode=once",
"-Dtest=!**ITest*,!**DocumentationTest*",
"-Dmaven.test.failure.ignore=true",
"-DfailIfNoTests=false",
"-Dsurefire.failIfNoSpecifiedTests=false",
"-Dsurefire.reportNameSuffix=UNIT"
],
"options": {
"cwd": "${workspaceFolder}/../parent-pom",
"env": {
"MAVEN_OPTS": "-server -Xmx2048m -Xms2048m"
}
},
"group": "test"
},
{
"label": "Clean Install (No Tests)",
"type": "shell",
"command": "mvn",
"args": [
"clean",
"install",
"-Dtest=no",
"-DfailIfNoTests=false",
"-Dsurefire.failIfNoSpecifiedTests=false",
"-Pall-modules",
"-Dhttps.protocols=TLSv1.2"
],
"options": {
"cwd": "${workspaceFolder}/../parent-pom",
"env": {
"MAVEN_OPTS": "-server -Xmx2048m -Xms2048m"
}
},
"group": "build"
}
]
}
Expand Down

0 comments on commit ade9731

Please sign in to comment.