summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kobert <dennis@kobert.dev>2019-09-05 11:25:26 +0000
committerDennis Kobert <dennis@kobert.dev>2019-09-05 11:25:26 +0000
commit99491d6a2151d8abeb3fe99a3cf043f0773126b6 (patch)
treef8b5252e84745043d68226899dd7cca6146de8ef
parent3efe26690a1e0b041fee559c93c6e8c1814a95db (diff)
Adjust Core
-rw-r--r--core/Dockerfile20
-rwxr-xr-xdeploy.sh15
-rw-r--r--node/Dockerfile24
-rw-r--r--web-server/Dockerfile6
4 files changed, 31 insertions, 34 deletions
diff --git a/core/Dockerfile b/core/Dockerfile
index 04cc96d..6a0f64d 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -1,20 +1,26 @@
FROM microsoft/dotnet:sdk AS build-env
MAINTAINER Dennis Kobert <d-kobert@web.de>
# Install cgit
-RUN git clone git://github.com/TrueDoctor/DiscoBot && cd DiscoBot && mkdir app && cp DSACore/*.csproj app/
-WORKDIR /DiscoBot/app
+#RUN git clone git://github.com/TrueDoctor/DiscoBot && mkdir DiscoBot/app && cp DiscoBot/dsa/*.sln DiscoBot/app/
+#WORKDIR /DiscoBot/app
-RUN dotnet restore
+#RUN ls -la && dotnet restore
# Copy everything else and build
-RUN cp -r ../DSACore/ ../app && dotnet publish -c Release -o out
+#RUN cp -r ../DSACore/ ../app && dotnet publish -c Release -o out
+RUN git clone git://github.com/TrueDoctor/DiscoBot && cd DiscoBot/dsa && dotnet restore
+WORKDIR /DiscoBot/DSACore
+
+# Copy everything else and build
+RUN dotnet publish -c Release -o out
# Build runtime image
FROM microsoft/dotnet:aspnetcore-runtime
WORKDIR /app/
COPY Token ./
-COPY --from=build-env /DiscoBot/app/out .
-RUN cp -r DSACore/Properties ./
-EXPOSE 5000
+COPY --from=build-env /DiscoBot/DSACore/out .
+COPY --from=build-env /DiscoBot/DSACore/Properties ./Properties
+RUN ls /app/Properties
+#RUN cp -r /DiscoBot/DSACore/Properties ./
ENTRYPOINT ["dotnet", "DSACore.dll"]
diff --git a/deploy.sh b/deploy.sh
new file mode 100755
index 0000000..4ac622c
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/sh
+# deploy containers
+
+#sudo docker stop dsa-web
+#sudo docker stop dsa-core
+
+#sudo docker build -t truedoctor/dsa-core core
+#sudo docker build -t truedoctor/dsa-web web-server
+
+#sudo docker run --name dsa-web -d --rm --network frontend truedoctor/dsa-web
+#sudo docker run --name dsa-core -p 5000:5000 -d --rm truedoctor/dsa-core
+
+
+
+
diff --git a/node/Dockerfile b/node/Dockerfile
deleted file mode 100644
index 5dabb24..0000000
--- a/node/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM node:latest
-
-# Create app directory
-WORKDIR /usr/src/app
-
-# Install app dependencies
-# A wildcard is used to ensure both package.json AND package-lock.json are copied
-# where available (npm@5+)
-
-RUN git clone git://github.com/TrueDoctor/DiscoBot && cd DiscoBot && cp WebInterface/NodeJSServer/package*.json ./
-
-
-#COPY package*.json ./
-
-RUN npm install
-# If you are building your code for production
-# RUN npm ci --only=production
-
-RUN cp -r WebInterface/NodeJSServer/* ./
-# Bundle app source
-#COPY . .
-
-EXPOSE 8080
-CMD [ "npm", "start" ]
diff --git a/web-server/Dockerfile b/web-server/Dockerfile
index 7ee5d6d..e716551 100644
--- a/web-server/Dockerfile
+++ b/web-server/Dockerfile
@@ -7,11 +7,11 @@ WORKDIR /
# A wildcard is used to ensure both package.json AND package-lock.json are copied
# where available (npm@5+)
-RUN git clone git://github.com/TrueDoctor/DiscoBot
-WORKDIR /DiscoBot/WebInterface/NodeJSServer
+RUN git clone git://github.com/TrueDoctor/GameLobby
+WORKDIR /GameLobby
RUN npm install && npm run build
FROM httpd:latest
WORKDIR /usr/local/apache2/
COPY httpd.conf conf/
-COPY --from=build-env /DiscoBot/WebInterface/NodeJSServer/dist htdocs/
+COPY --from=build-env /GameLobby/WebInterface/dist htdocs/