1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
20240812 now based on the java-21 branch, no longer on develop.
Only here because patch file cannot be empty
--- a/poms/service/paisa-service-superpom/pom.xml
+++ b/poms/service/paisa-service-superpom/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>paisa-superpom</artifactId>
<groupId>ch.post.it.paisa</groupId>
Mit mario debugging herausgefunden
--- a/alice/alice-docker/alice-docker-service-base/Dockerfile
+++ b/alice/alice-docker/alice-docker-service-base/Dockerfile
@@ -17,7 +17,7 @@ COPY install/jetty/ ${JETTY_HOME}/
# copy slimmed libraries, generated in alice-docker-service-base pom
COPY target/jetty/ ${JETTY_HOME}/
-RUN chmod 755 /usr/lib64/libmscan_api.so /usr/lib64/libmdis_api.so
+RUN chmod 755 /usr/lib/libmscan_api.so /usr/lib/libmdis_api.so
RUN sed -i -e "s|platform_version|${PROJECT_VERSION}|g" ${JETTY_HOME}/modules/AllowNullPathInfo.mod
WORKDIR ${JETTY_HOME}
@@ -26,12 +26,18 @@
pulseaudio pulseaudio-utils \
libncurses5 \
i2c-tools sudo vim gzip procps psmisc tar socat \
+ libusb-1.0-0 `# used by allitnil/caveman` \
tcpdump lsof telnet net-tools && \
apt-get clean all && \
# TODO: may be unused
chmod +x ./bin/jetty.sh && \
- chmod +x ./bin/start-jetty.sh && \
- chmod u+s /usr/bin/tcpdump
+ chmod +x ./bin/start-jetty.sh && \
+ chmod u+s /usr/bin/tcpdump && \
+ # needed for tty devices (add to base-jetty)
+ groupmod -g 18 dialout && \
+ groupmod -g 63 audio && \
+ # remove as soon as it is fixed in base-jetty
+ usermod -a -G 5,7,18,63,jetty,2001,2002 jetty
# switch back to non-root
USER jetty
diff --git a/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmdis_api.so b/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmdis_api.so
similarity index 100%
rename from alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmdis_api.so
rename to alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmdis_api.so
diff --git a/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmscan_api.so b/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmscan_api.so
similarity index 100%
rename from alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmscan_api.so
rename to alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmscan_api.so
|
