Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • prosper/docker-template-repo
1 result
Show changes
Commits on Source (31)
...@@ -48,7 +48,7 @@ jobs: ...@@ -48,7 +48,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v3.4.1 uses: actions/setup-node@v3.5.1
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.13.1' node-version: '>= 16.13.1'
...@@ -126,7 +126,7 @@ jobs: ...@@ -126,7 +126,7 @@ jobs:
# 2. ubuntu-latest # 2. ubuntu-latest
# 3. windows-latest # 3. windows-latest
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v3.4.1 uses: actions/setup-node@v3.5.1
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1' node-version: '>= 16.9.1'
......
...@@ -16,7 +16,7 @@ variables: ...@@ -16,7 +16,7 @@ variables:
SECRET_DETECTION_EXCLUDED_PATHS: "" SECRET_DETECTION_EXCLUDED_PATHS: ""
services: services:
- name: ghcr.io/griefed/gitlab-ci-cd:2.2.1 - name: ghcr.io/griefed/gitlab-ci-cd:2.2.3
alias: docker alias: docker
workflow: workflow:
...@@ -134,7 +134,7 @@ secret_detection: ...@@ -134,7 +134,7 @@ secret_detection:
Gradle Test: Gradle Test:
stage: Tests stage: Tests
image: ghcr.io/griefed/baseimage-ubuntu-jdk-8:2.0.13 image: ghcr.io/griefed/baseimage-ubuntu-jdk-8:2.0.15
before_script: before_script:
- echo "**** Running in $CI_JOB_ID ****" - echo "**** Running in $CI_JOB_ID ****"
- echo "**** Java location ****" - echo "**** Java location ****"
...@@ -354,7 +354,7 @@ Gradle Test: ...@@ -354,7 +354,7 @@ Gradle Test:
coverage: coverage:
stage: Other stage: Other
image: registry.gitlab.com/haynes/jacoco2cobertura:1.0.8 image: registry.gitlab.com/haynes/jacoco2cobertura:1.0.9
allow_failure: true allow_failure: true
script: script:
- python /opt/cover2cover.py build/jacoco/test/jacocoTestReport.xml $CI_PROJECT_DIR/backend/main/java/ > build/cobertura.xml || true - python /opt/cover2cover.py build/jacoco/test/jacocoTestReport.xml $CI_PROJECT_DIR/backend/main/java/ > build/cobertura.xml || true
...@@ -366,7 +366,7 @@ coverage: ...@@ -366,7 +366,7 @@ coverage:
path: build/cobertura.xml path: build/cobertura.xml
Gradle Dependency-Checks: Gradle Dependency-Checks:
image: griefed/baseimage-ubuntu-jdk-8:2.0.13 image: griefed/baseimage-ubuntu-jdk-8:2.0.15
stage: Other stage: Other
allow_failure: true allow_failure: true
before_script: before_script:
......
FROM griefed/baseimage-ubuntu-jdk-8:2.0.13 AS builder FROM griefed/baseimage-ubuntu-jdk-8:2.0.15 AS builder
ARG BRANCH_OR_TAG=main ARG BRANCH_OR_TAG=main
...@@ -15,7 +15,7 @@ RUN \ ...@@ -15,7 +15,7 @@ RUN \
./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \ ./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \
ls -ahl ./build/libs/ ls -ahl ./build/libs/
FROM griefed/baseimage-ubuntu-jdk-8:2.0.13 FROM griefed/baseimage-ubuntu-jdk-8:2.0.15
LABEL maintainer="Griefed <griefed@griefed.de>" LABEL maintainer="Griefed <griefed@griefed.de>"
LABEL description="DESCRIPTION" LABEL description="DESCRIPTION"
......
FROM griefed/baseimage-ubuntu-jdk-8:2.0.13 AS builder FROM griefed/baseimage-ubuntu-jdk-8:2.0.15 AS builder
ARG BRANCH_OR_TAG=main ARG BRANCH_OR_TAG=main
...@@ -15,7 +15,7 @@ RUN \ ...@@ -15,7 +15,7 @@ RUN \
./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \ ./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \
ls -ahl ./build/libs/ ls -ahl ./build/libs/
FROM griefed/baseimage-ubuntu-jdk-8:2.0.13 FROM griefed/baseimage-ubuntu-jdk-8:2.0.15
LABEL maintainer="Griefed <griefed@griefed.de>" LABEL maintainer="Griefed <griefed@griefed.de>"
LABEL description="DESCRIPTION" LABEL description="DESCRIPTION"
......
...@@ -18,8 +18,8 @@ plugins { ...@@ -18,8 +18,8 @@ plugins {
id 'edu.sc.seis.launch4j' version '2.5.3' id 'edu.sc.seis.launch4j' version '2.5.3'
id 'org.siouan.frontend-jdk8' version '6.0.0' id 'org.siouan.frontend-jdk8' version '6.0.0'
id 'io.spring.dependency-management' version '1.0.13.RELEASE' id 'org.springframework.boot' version '2.7.5'
id 'org.springframework.boot' version '2.7.3' id 'io.spring.dependency-management' version '1.1.0'
} }
sourceCompatibility = targetCompatibility = '1.8' sourceCompatibility = targetCompatibility = '1.8'
...@@ -70,27 +70,27 @@ dependencies { ...@@ -70,27 +70,27 @@ dependencies {
// WEB // WEB
//embed 'org.springframework.boot:spring-boot-starter-security:2.5.6' //embed 'org.springframework.boot:spring-boot-starter-security:2.5.6'
//embed 'org.springframework.boot:spring-boot-starter-validation:2.6.2' //embed 'org.springframework.boot:spring-boot-starter-validation:2.6.2'
embed 'org.springframework.boot:spring-boot-starter-web:2.7.3' embed 'org.springframework.boot:spring-boot-starter-web:2.7.5'
embed 'org.springframework.boot:spring-boot-starter-log4j2:2.7.3' embed 'org.springframework.boot:spring-boot-starter-log4j2:2.7.5'
embed 'org.springframework.boot:spring-boot-starter-quartz:2.7.3' embed 'org.springframework.boot:spring-boot-starter-quartz:2.7.5'
//embed 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.2' //embed 'org.springframework.boot:spring-boot-starter-data-jpa:2.6.2'
//embed 'org.springframework.boot:spring-boot-starter-artemis:2.6.2' //embed 'org.springframework.boot:spring-boot-starter-artemis:2.6.2'
//embed 'org.apache.activemq:artemis-jms-server:2.19.0' //embed 'org.apache.activemq:artemis-jms-server:2.19.0'
embed 'org.apache.logging.log4j:log4j-core:2.18.0' embed 'org.apache.logging.log4j:log4j-core:2.18.0'
embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0' embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0'
embed 'org.apache.logging.log4j:log4j-api:2.18.0' embed 'org.apache.logging.log4j:log4j-api:2.18.0'
embed 'org.apache.logging.log4j:log4j-web:2.18.0' embed 'org.apache.logging.log4j:log4j-web:2.19.0'
embed 'org.apache.logging.log4j:log4j-jul:2.18.0' embed 'org.apache.logging.log4j:log4j-jul:2.18.0'
// Dev tools // Dev tools
developmentOnly 'org.springframework.boot:spring-boot-devtools:2.7.3' developmentOnly 'org.springframework.boot:spring-boot-devtools:2.7.5'
// Testing // Testing
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0' testImplementation 'org.springframework.boot:spring-boot-starter-test:2.7.5'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
testImplementation 'org.junit.platform:junit-platform-commons:1.9.0' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.7.3' testImplementation 'org.junit.platform:junit-platform-commons:1.9.1'
} }
// Launch4j builds our .exe. // Launch4j builds our .exe.
......
This diff is collapsed.
...@@ -26,20 +26,20 @@ ...@@ -26,20 +26,20 @@
"test": "echo \"No test specified\" && exit 0" "test": "echo \"No test specified\" && exit 0"
}, },
"dependencies": { "dependencies": {
"@quasar/extras": "1.15.4", "@quasar/extras": "1.15.5",
"axios": "0.27.2", "axios": "0.27.2",
"quasar": "2.7.7", "quasar": "2.10.1",
"core-js": "3.25.5", "core-js": "3.25.5",
"tsparticles": "1.43.1" "tsparticles": "1.43.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "7.18.9", "@babel/eslint-parser": "7.18.9",
"electron": "20.1.1", "electron": "21.2.2",
"@quasar/app": "3.3.3", "@quasar/app": "3.3.3",
"electron-packager": "15.5.1", "electron-packager": "15.5.1",
"eslint": "8.23.0", "eslint": "8.26.0",
"eslint-config-prettier": "8.5.0", "eslint-config-prettier": "8.5.0",
"eslint-plugin-vue": "9.4.0", "eslint-plugin-vue": "9.7.0",
"eslint-webpack-plugin": "3.2.0" "eslint-webpack-plugin": "3.2.0"
}, },
"browserslist": [ "browserslist": [
......