Skip to content

Commit dfeb031

Browse files
LoboMetalurgicoLoboMetalurgico
authored
Merge branch 'bleeding' into fix-exporb-target
2 parents ec95157 + 030cc24 commit dfeb031

File tree

109 files changed

+2518
-431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+2518
-431
lines changed

‎.dockerignore

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
Jenkinsfile
1+
#Jenkinsfile
22
circle.yml
3-
README.md
3+
#README.md
44
data
55
run
66
*.iml
77
logs
88
.idea
9-
.github
10-
Dockerfile
11-
docker-compose.yml
12-
target
9+
#!.idea/codeStyles/codeStyleConfig.xml
10+
#!.idea/codeStyles/Project.xml
11+
#.github
12+
#Dockerfile
13+
#docker-compose.yml
14+
/target
15+
/release-script
16+
/worlds
17+
#.mvn
18+
dependency-reduced-pom.xml

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,7 @@ data/*
243243

244244
# a file that can be used for your helm chart values
245245
/helm-values.local.yaml
246+
247+
__pycache__
248+
*.pyo
249+
/release-script/release_config_local.py

‎Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ FROM alpine/git:v2.26.2 AS prepare
77

88
# Copy the source
99
WORKDIR /src
10-
COPY ./ /src
10+
COPY pom.xml /src
11+
12+
COPY src/main/java /src/src/main/java
13+
COPY src/main/resources /src/src/main/resources
14+
15+
COPY src/test/java/cn /src/src/test/java/cn
16+
COPY src/test/resources /src/src/test/resources
1117

1218
# Update the language submodule
1319
RUN if [ -z "$(ls -A /src/src/main/resources/lang)" ]; then git submodule update --init; fi
@@ -20,7 +26,7 @@ WORKDIR /src
2026
COPY --from=prepare /src /src
2127

2228
# Build the source
23-
RUN mvn clean package
29+
RUN mvn --no-transfer-progress -Dmaven.javadoc.skip=true clean package
2430

2531
# Use OpenJDK JRE image to runtime
2632
FROM openjdk:8-jre-slim AS run

‎mvnw

100644100755
File mode changed.

‎pom.xml

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,14 @@
7676
<log4j2.version>2.13.3</log4j2.version>
7777
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7878
<jline.version>3.9.0</jline.version>
79+
<skipTests>true</skipTests>
7980
</properties>
8081

8182
<distributionManagement>
8283
<repository>
8384
<id>powernukkit-releases</id>
8485
<name>powernukkit-releases</name>
85-
<url>https://api.bintray.com/maven/powernukkit/powernukkit/PowerNukkit</url>
86+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
8687
</repository>
8788
<snapshotRepository>
8889
<id>powernukkit-snapshots</id>
@@ -91,22 +92,15 @@
9192
</snapshotRepository>
9293
</distributionManagement>
9394

94-
<repositories>
95+
<!--<repositories>
9596
<repository>
9697
<id>powernukkit-snapshots</id>
9798
<name>powernukkit-snapshots</name>
9899
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
99100
<releases><enabled>false</enabled></releases>
100101
<snapshots><enabled>true</enabled></snapshots>
101102
</repository>
102-
<repository>
103-
<id>powernukkit-bintray</id>
104-
<name>powernukkit-bintray</name>
105-
<url>https://dl.bintray.com/powernukkit/powernukkit</url>
106-
<releases><enabled>true</enabled></releases>
107-
<snapshots><enabled>false</enabled></snapshots>
108-
</repository>
109-
</repositories>
103+
</repositories>-->
110104

111105
<dependencies>
112106
<dependency>
@@ -136,7 +130,7 @@
136130
<dependency>
137131
<groupId>com.google.guava</groupId>
138132
<artifactId>guava</artifactId>
139-
<version>24.1.1-jre</version>
133+
<version>29.0-jre</version>
140134
<scope>compile</scope>
141135
<exclusions>
142136
<exclusion>
@@ -344,6 +338,9 @@
344338
<version>${junit.platform.version}</version>
345339
</dependency>
346340
</dependencies>
341+
<configuration>
342+
<skipTests>${skipTests}</skipTests>
343+
</configuration>
347344
</plugin>
348345
<plugin>
349346
<groupId>org.apache.maven.plugins</groupId>
@@ -355,6 +352,9 @@
355352
<configuration>
356353
<rules>
357354
<DependencyConvergence />
355+
<requireJavaVersion>
356+
<version>1.8</version>
357+
</requireJavaVersion>
358358
</rules>
359359
</configuration>
360360
<goals>
@@ -383,6 +383,7 @@
383383
<configuration> <!-- add this to disable checking -->
384384
<source>8</source>
385385
<doclint>none</doclint>
386+
<quiet>true</quiet>
386387
</configuration>
387388
<executions>
388389
<execution>
@@ -488,6 +489,20 @@
488489
</gitDescribe>
489490
</configuration>
490491
</plugin>
492+
<plugin>
493+
<groupId>org.apache.maven.plugins</groupId>
494+
<artifactId>maven-gpg-plugin</artifactId>
495+
<version>1.6</version>
496+
<executions>
497+
<execution>
498+
<id>sign-artifacts</id>
499+
<phase>verify</phase>
500+
<goals>
501+
<goal>sign</goal>
502+
</goals>
503+
</execution>
504+
</executions>
505+
</plugin>
491506
</plugins>
492507
</build>
493508
</project>

‎pterodactyl-image-java11.Dockerfile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#
2+
# Get the pterodacty egg from https://github.com/PowerNukkit/PowerNukkit-Pterodactyl-Egg!
3+
#
4+
# Prepare the source
5+
FROM alpine/git:v2.26.2 AS prepare
6+
7+
# Copy the source
8+
WORKDIR /src
9+
COPY pom.xml /src
10+
11+
COPY src/main/java /src/src/main/java
12+
COPY src/main/resources /src/src/main/resources
13+
14+
COPY src/test/java/cn /src/src/test/java/cn
15+
COPY src/test/resources /src/src/test/resources
16+
17+
# Update the language submodule
18+
RUN if [ -z "$(ls -A /src/src/main/resources/lang)" ]; then git submodule update --init; fi
19+
20+
# Prepare to build the source
21+
FROM maven:3.8.1-jdk-11-slim as build
22+
23+
# Copy the source
24+
WORKDIR /src
25+
COPY --from=prepare /src /src
26+
27+
# Build the source
28+
RUN mvn -Dmaven.javadoc.skip=true -Denforcer.skip=true --no-transfer-progress clean package
29+
30+
# Final image
31+
FROM quay.io/pterodactyl/core:java-11 as pterodactyl
32+
33+
LABEL author="José Roberto de Araújo Júnior" maintainer="[email protected]"
34+
35+
USER root
36+
ENV USER=root HOME=/root
37+
38+
RUN mkdir -p /opt/PowerNukkit
39+
COPY --from=build /src/target/powernukkit-*-shaded.jar /opt/PowerNukkit/PowerNukkit.jar
40+
41+
USER container
42+
ENV USER=container HOME=/home/container

‎pterodactyl-image-java8.Dockerfile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#
2+
# Get the pterodacty egg from https://github.com/PowerNukkit/PowerNukkit-Pterodactyl-Egg!
3+
#
4+
# Prepare the source
5+
FROM alpine/git:v2.26.2 AS prepare
6+
7+
# Copy the source
8+
WORKDIR /src
9+
COPY pom.xml /src
10+
11+
COPY src/main/java /src/src/main/java
12+
COPY src/main/resources /src/src/main/resources
13+
14+
COPY src/test/java/cn /src/src/test/java/cn
15+
COPY src/test/resources /src/src/test/resources
16+
17+
# Update the language submodule
18+
RUN if [ -z "$(ls -A /src/src/main/resources/lang)" ]; then git submodule update --init; fi
19+
20+
# Prepare to build the source
21+
FROM maven:3.6-jdk-8-alpine as build
22+
23+
# Copy the source
24+
WORKDIR /src
25+
COPY --from=prepare /src /src
26+
27+
# Build the source
28+
RUN mvn -Dmaven.javadoc.skip=true --no-transfer-progress clean package
29+
30+
# Final image
31+
FROM quay.io/pterodactyl/core:java as pterodactyl
32+
33+
LABEL author="José Roberto de Araújo Júnior" maintainer="[email protected]"
34+
35+
USER root
36+
ENV USER=root HOME=/root
37+
38+
RUN mkdir -p /opt/PowerNukkit
39+
COPY --from=build /src/target/powernukkit-*-shaded.jar /opt/PowerNukkit/PowerNukkit.jar
40+
41+
USER container
42+
ENV USER=container HOME=/home/container

‎release-script/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
secrets.json

0 commit comments

Comments
 (0)