diff --git a/Dockerfile b/Dockerfile index 0292ecd..73e4bdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /mc_data RUN chown -R minecraft:minecraft . # Copy the modpack -COPY the-1122-pack/the-1122-pack_1.3.7.zip /the-1122-pack/the-1122-pack_1.3.7.zip +COPY the-1122-pack/the-1122-pack_1.3.7.zip /the-1122-pack/the-1122-pack.zip RUN chown -R minecraft:minecraft /the-1122-pack USER minecraft diff --git a/helm/templates/deploy.yaml b/helm/templates/deploy.yaml index ffc837b..4139ac5 100644 --- a/helm/templates/deploy.yaml +++ b/helm/templates/deploy.yaml @@ -18,7 +18,15 @@ spec: image: {{ .Values.image }} imagePullPolicy: Always command: ["/bin/bash"] - args: ["-c", "unzip -n -d . /the-1122-pack/the-1122-pack_1.3.7.zip"] + args: ["-c", "unzip -o -d . /the-1122-pack/the-1122-pack.zip"] + volumeMounts: + - mountPath: /mc_data + name: data + - name: rename + image: {{ .Values.image }} + imagePullPolicy: Always + command: ["/bin/bash"] + args: ["-c", "mv $(find . -d 1 -name forge\*.jar) forge.jar"] volumeMounts: - mountPath: /mc_data name: data @@ -38,7 +46,7 @@ spec: image: {{ .Values.image }} imagePullPolicy: Always command: ["/bin/bash"] - args: ["-c", 'java -server -Xmx"$MAX_RAM"G -Dfml.queryResult=confirm -jar forge-1.12.2-14.23.5.2855.jar nogui'] + args: ["-c", 'java -server -Xmx"$MAX_RAM"G -Dfml.queryResult=confirm -jar forge.jar nogui'] ports: - containerPort: 25565 volumeMounts: