Skip to content

Commit f840526

Browse files
committed
fix log-exporter dockerfile
Signed-off-by: neo <[email protected]>
1 parent da7107a commit f840526

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

buildSrc/src/main/kotlin/app.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,21 @@ tasks.named("mkdir") {
5353
}
5454
}
5555

56+
interface Context {
57+
@get:Inject
58+
val fs: FileSystemOperations
59+
}
60+
5661
afterEvaluate {
5762
// split dependencies lib and app classes/bin/web to support layered docker image
5863
// to cache/reuse dependencies layer
5964
tasks.register("docker") {
6065
group = "distribution"
6166
dependsOn("installDist")
67+
val context = project.objects.newInstance<Context>()
6268
doLast {
6369
val rootGroup = if (parent!!.depth > 0) parent!!.group else project.group
64-
project.sync {
70+
context.fs.sync {
6571
val destinationDir = tasks.named<Sync>("installDist").get().destinationDir
6672
from(destinationDir) {
6773
exclude("lib/${rootGroup}.*.jar")
@@ -78,7 +84,7 @@ afterEvaluate {
7884
into(layout.buildDirectory.dir("docker/package").get())
7985
}
8086
if (file("docker/Dockerfile").exists()) {
81-
project.sync {
87+
context.fs.sync {
8288
from(file("docker"))
8389
into(layout.buildDirectory.dir("docker").get())
8490
preserve {

docker/jre/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:24.0.1_9-jdk-alpine as build
1+
FROM eclipse-temurin:24.0.1_9-jdk-alpine AS build
22
RUN jlink --add-modules java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management.rmi,java.naming,java.security.jgss,java.security.sasl,java.sql,java.xml \
33
--add-modules jdk.charsets,jdk.crypto.cryptoki,jdk.jdi,jdk.localedata,jdk.management.jfr,jdk.naming.dns,jdk.naming.rmi,jdk.net,jdk.unsupported \
44
--output /opt/jre --strip-java-debug-attributes --no-man-pages --no-header-files

ext/log-exporter/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN apk add --no-cache python3 curl
55
RUN addgroup --gid 1000 --system app && adduser --system --ingroup app --uid 1000 app
66
RUN curl -SL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz | tar xzf - -C /opt \
77
&& ln -s /opt/google-cloud-sdk/bin/gcloud /usr/local/bin/gcloud \
8-
&& mkdir -p /var/log/app && chown -R app.app /var/log/app
8+
&& mkdir -p /var/log/app && chown -R app:app /var/log/app
99
VOLUME /var/log/app
1010
USER 1000
1111
COPY package/dependency /opt/app

0 commit comments

Comments
 (0)