Skip to content

Commit bf8d4c2

Browse files
author
David Baum
committed
fix permission issues with output and log directory
1 parent 17817cf commit bf8d4c2

6 files changed

Lines changed: 17 additions & 17 deletions

File tree

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ services:
3939
#- ./generator2/org.getaviz.generator/target/org.getaviz.generator-1.0.0-SNAPSHOT.war:/var/lib/jetty/webapps/root.war # uncomment only for generator development
4040
#- ./generator2/org.getaviz.generator/settings.properties:/opt/config/settings.properties # uncomment only for generator development
4141
#- ./generator2/output:/var/lib/jetty/output/ # uncomment only for generator development
42+
#- ./generator2/logs:/var/lib/jetty/logs # uncomment only for generator development
4243
ports:
4344
- "8083:8080"
4445
networks:

generator2/org.getaviz.generator/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ RUN mvn package
88
FROM jetty:9.4.12-jre8-alpine
99
COPY --from=MAVEN_TOOL_CHAIN /tmp/generator2/target/org.getaviz.generator*.war /var/lib/jetty/webapps/root.war
1010
COPY --from=MAVEN_TOOL_CHAIN /opt/jqassistant-commandline-neo4jv3-1.6.0/ /opt/jqassistant/
11+
COPY start.sh /start.sh
1112
COPY settings.properties /opt/config/settings.properties
12-
RUN mkdir -p /var/lib/jetty/data-gen/ && mkdir -p /var/lib/jetty/logs/ && mkdir -p /var/lib/jetty/output/
13+
RUN mkdir -p /var/lib/jetty/data-gen/ && mkdir -p /var/lib/jetty/logs/ && mkdir -p /var/lib/jetty/output/ && chown -R jetty:jetty /var/lib/jetty/logs/ /var/lib/jetty/output/
1314
EXPOSE 8080
14-
VOLUME ["/var/lib/jetty/webapps/", "/opt/config/", "/var/lib/jetty/output/", "/var/lib/jetty/data-gen/"]
15+
ENTRYPOINT ["/start.sh"]
16+
USER root
17+
RUN sed -i 's/\/home\/jetty:\/sbin\/nologin/\/home\/jetty:\/bin\/sh/g' /etc/passwd
18+
VOLUME ["/var/lib/jetty/webapps/", "/opt/config/", "/var/lib/jetty/output/", "/var/lib/jetty/logs/", "/var/lib/jetty/data-gen/"]
1519
LABEL maintainer="[email protected]" \
1620
version="1.0"

generator2/org.getaviz.generator/pom.xml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
</properties>
2323
<dependencies>
24-
<!-- Apache Commons -->
25-
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
26-
<dependency>
27-
<groupId>commons-logging</groupId>
28-
<artifactId>commons-logging</artifactId>
29-
<version>1.2</version>
30-
</dependency>
3124
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
3225
<dependency>
3326
<groupId>org.apache.commons</groupId>
@@ -57,7 +50,6 @@
5750
<artifactId>commons-beanutils</artifactId>
5851
<version>1.9.3</version>
5952
</dependency>
60-
6153
<!-- neo4j -->
6254
<dependency>
6355
<groupId>org.neo4j.driver</groupId>
@@ -115,9 +107,9 @@
115107
<scope>provided</scope>
116108
</dependency>
117109
<dependency>
118-
<groupId>org.apache.logging.log4j</groupId>
119-
<artifactId>log4j-core</artifactId>
120-
<version>2.11.1</version>
110+
<groupId>log4j</groupId>
111+
<artifactId>log4j</artifactId>
112+
<version>1.2.17</version>
121113
</dependency>
122114
<dependency>
123115
<groupId>org.testcontainers</groupId>
@@ -163,8 +155,8 @@
163155
<configuration>
164156
<skip>false</skip>
165157
<quiet>true</quiet>
166-
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
167-
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
158+
<!--<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
159+
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>-->
168160
</configuration>
169161
</plugin>
170162
<!-- <plugin> -->

generator2/org.getaviz.generator/src/main/resources/log4j.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ log4j.logger.org.apache.commons.beanutils.converters=ERROR
55
# Direct log messages to a log file
66
log4j.appender.file=org.apache.log4j.FileAppender
77
log4j.appender.file.Append=false
8-
log4j.appender.file.File=${jetty.base}/jetty.log
8+
log4j.appender.file.File=${jetty.base}/logs/jetty.log
99
log4j.appender.file.layout=org.apache.log4j.PatternLayout
1010
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
1111
log4j.appender.file.Threshold=DEBUG
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
chown -R jetty:jetty /var/lib/jetty/logs/ /var/lib/jetty/output/
4+
su jetty -c /docker-entrypoint.sh

generator2/output/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)