Skip to content

Commit f378512

Browse files
committed
Merge remote-tracking branch 'origin-jinr/master'
# Conflicts: # README.md
2 parents 5af7622 + c0d3483 commit f378512

File tree

6 files changed

+276
-183
lines changed

6 files changed

+276
-183
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
/testing/event_db
88
/kotlin-js-store/yarn.lock
99
ems.config.yaml
10+
/ems-stat-collector/src/__pycache__
11+
/ems-stat-collector/src/orm/__pycache__

Dockerfile.with-build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM gradle:7.6.4-jdk17 as builder
1+
FROM gradle:7.6.4-jdk17 AS builder
22
COPY src ./src
33
COPY build.gradle.kts ./build.gradle.kts
44
COPY settings.gradle.kts ./settings.gradle.kts
5+
COPY gradle.properties ./gradle.properties
56
RUN gradle installDist
67

78
FROM azul/zulu-openjdk:17

0 commit comments

Comments
 (0)