From f3661d2e7601bcb9c93fc247c2702ede8f0c2847 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 6 Jan 2022 01:28:07 -0600 Subject: [PATCH] Altered the default app image to permit for performing git operations within the container via manipulating the /gemp-src folder --- gemp-lotr/docker/docker-compose.yml | 3 +++ gemp-lotr/docker/gemp_app.Dockerfile | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/docker/docker-compose.yml b/gemp-lotr/docker/docker-compose.yml index 4c8eef46c..bb2b5f55e 100644 --- a/gemp-lotr/docker/docker-compose.yml +++ b/gemp-lotr/docker/docker-compose.yml @@ -39,6 +39,9 @@ services: source: ../../replay target: /replay target: /etc/gemp-lotr/replay + - type: bind + source: ../.. + target: /gemp-src networks: gemp_net_1: ipv4_address: ${APP_IP} diff --git a/gemp-lotr/docker/gemp_app.Dockerfile b/gemp-lotr/docker/gemp_app.Dockerfile index f61884d10..abf9f7efc 100644 --- a/gemp-lotr/docker/gemp_app.Dockerfile +++ b/gemp-lotr/docker/gemp_app.Dockerfile @@ -1,7 +1,7 @@ FROM alpine RUN apk update; \ - apk update --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing; \ + apk update --allow-untrusted --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community; \ apk add --no-cache procps; \ apk add --no-cache net-tools; \ apk add --no-cache iputils; \ @@ -14,7 +14,9 @@ RUN apk update; \ apk add --no-cache binutils; \ apk add --no-cache freetype; \ apk add --no-cache fontconfig; \ - apk add --no-cache openjdk14-jdk --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing; + apk add --no-cache git; \ + apk add --no-cache nano; \ + apk add --no-cache openjdk14-jdk --allow-untrusted --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community; @@ -39,7 +41,7 @@ ENV MAVEN_HOME /usr/share/maven ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" # Enables the JRE remote debugging; perhaps comment this out in a production build -ENV JAVA_TOOL_OPTIONS -agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n +#ENV JAVA_TOOL_OPTIONS -agentlib:jdwp=transport=dt_socket,address=*:8000,server=y,suspend=n #####################################################################