Merge pull request #182 from AndrewCS149/testWorkflow

testWorkflow

Author: The-DevBlog

.github/workflows/staging.yml

@@ -38,6 +38,20 @@ jobs:
               run: trunk build --release  
               working-directory: client
 
+            - name: Set up .NET
+              uses: actions/setup-dotnet@v1
+              with:
+                dotnet-version: '8.0.x'
+        
+            - name: Restore dependencies
+              run: dotnet restore ./server/devblog.csproj
+        
+            - name: Build application
+              run: dotnet build ./sever/devblog.csproj -c Release -o ./app/build
+        
+            - name: Publish application
+              run: dotnet publish ./server/devblog.csproj -c Release -o ./app/publish /p:UseAppHost=false
+
             - name: Create SSH Key
               run: |
                 mkdir -p ${{ secrets.SSH_PRIVATE_KEY_PATH }}
@@ -50,13 +64,17 @@ jobs:
 
             - name: Copy Files to Server
               run: |
-                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} -r client/dist ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ vars.DEVBLOG_ROOT_PATH }}/client
-                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} docker-compose.yml ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ vars.DEVBLOG_ROOT_PATH }}
+                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} -r client/dist ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}/client
+                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} docker-compose.yml ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}
+                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} client/Dockerfile ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}/client
+                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} server/Dockerfile ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}/server
+                scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} -r ./app/publish ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}/server/publish
 
             - name: Restart Container
               run: |
                 ssh -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "\
-                cd ${{ vars.DEVBLOG_ROOT_PATH }} && \
-                docker container rm -f ${{ vars.DEVBLOG_CONTAINER }} || true && \
+                cd ${{ secrets.DEVBLOG_ROOT_PATH }} && \
+                docker container rm -f ${{ secrets.DEVBLOG_CLIENT_CONTAINER }} || true && \
+                docker container rm -f ${{ secrets.DEVBLOG_SERVER_CONTAINER }}
                 docker compose up -d"
           

.gitignore

@@ -3,7 +3,6 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 .env
-Dockerfile
 
 # rust
 /target

client/Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:latest
+RUN apt update
+RUN apt install nano -y

docker-compose.yml

@@ -5,21 +5,29 @@ services:
     container_name: ${PROXY_CONTAINER_NAME}
     depends_on:
       - devblog_client
+      - devblog_server
     volumes:
-      - ${PROXY_CONFIG_VOLUME}
+      - ${PROXY_NGINX_CONFIG_VOLUME}
       - ${CLIENT_SSL_VOLUME}
     restart: on-failure
     ports:
       - ${SSL_PORTS}
 
   devblog_client:
-   image: ${DEVBLOG_CONTAINER_NAME}
+   image: ${DEVBLOG_CLIENT_CONTAINER_NAME}
    build: ./client
-   container_name: ${DEVBLOG_CONTAINER_NAME}
+   container_name: ${DEVBLOG_CLIENT_CONTAINER_NAME}
    restart: on-failure
    volumes:
      - ${CLIENT_WASM_VOLUME}
-     - ${CLIENT_CONFIG_VOLUME}
+     - ${CLIENT_NGINX_CONFIG_VOLUME}
      - ${CLIENT_SSL_VOLUME}
    ports:
-     - ${CLIENT_PORTS}
+     - ${CLIENT_PORTS}
+  
+  devblog_server:
+   image: ${DEVBLOG_SERVER_CONTAINER_NAME}
+   build: ./server
+   container_name: ${DEVBLOG_SERVER_CONTAINER_NAME}
+   ports:
+     - ${SERVER_PORTS}

server/Dockerfile

@@ -0,0 +1,23 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+USER app
+WORKDIR /app
+COPY ./https ./https
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+COPY ["devblog.csproj", "app/"]
+RUN dotnet restore "./app/devblog.csproj"
+COPY . app/
+WORKDIR "/app"
+RUN dotnet build "./devblog.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./devblog.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "devblog.dll"]