johnbridges commited on
Commit
778e920
·
verified ·
1 Parent(s): 1481ce2

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +12 -6
Dockerfile CHANGED
@@ -50,6 +50,18 @@ RUN cd /home/user/code/models/OpenBLAS && \
50
  # Switch back to the non-root user
51
  USER user
52
 
 
 
 
 
 
 
 
 
 
 
 
 
53
  # Clone and build llama.cpp with OpenBLAS support as the non-root user
54
  RUN git clone https://github.com/ggerganov/llama.cpp /home/user/code/models/llama.cpp && \
55
  cd /home/user/code/models/llama.cpp && \
@@ -72,12 +84,6 @@ ENV PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
72
  # Verify .NET installation and current user
73
  RUN whoami && dotnet --version
74
 
75
- # Clone repositories using the GITHUB_TOKEN secret
76
- RUN --mount=type=secret,id=GITHUB_TOKEN,mode=0444,required=true \
77
- git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLib.git /home/user/code/NetworkMonitorLib && \
78
- git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLLM.git /home/user/code/NetworkMonitorLLM && \
79
- git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorData.git /home/user/code/NetworkMonitorData
80
-
81
 
82
  # Copy files into the container as the non-root user
83
  COPY --chown=user:user appsettings.json /home/user/code/app/appsettings.json
 
50
  # Switch back to the non-root user
51
  USER user
52
 
53
+ # Clone repositories using the GITHUB_TOKEN secret
54
+ RUN --mount=type=secret,id=GITHUB_TOKEN,mode=0444,required=true \
55
+ git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLib.git /home/user/code/NetworkMonitorLib && \
56
+ git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLLM.git /home/user/code/NetworkMonitorLLM && \
57
+ git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorData.git /home/user/code/NetworkMonitorData
58
+
59
+ # Apply llama.cpp patches from NetworkMonitorLLM
60
+ RUN git -C /home/user/code/models/llama.cpp apply \
61
+ /home/user/code/NetworkMonitorLLM/patches/qwen35_imrope_context_shift_fix.diff
62
+ # /home/user/code/NetworkMonitorLLM/patches/qwen35_session_tokens_insert_fix.diff \
63
+ # /home/user/code/NetworkMonitorLLM/patches/qwen35_mrope_kv_restore_fix.diff
64
+
65
  # Clone and build llama.cpp with OpenBLAS support as the non-root user
66
  RUN git clone https://github.com/ggerganov/llama.cpp /home/user/code/models/llama.cpp && \
67
  cd /home/user/code/models/llama.cpp && \
 
84
  # Verify .NET installation and current user
85
  RUN whoami && dotnet --version
86
 
 
 
 
 
 
 
87
 
88
  # Copy files into the container as the non-root user
89
  COPY --chown=user:user appsettings.json /home/user/code/app/appsettings.json