hasslesstech/devops-lab4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix all issues

Browse Source
This commit is contained in:
dymik739 2025-04-09 13:34:56 +03:00
parent 99e91324bc
commit 1d5157b635
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Dockerfile
View File

@ -1,13 +1,13 @@
# dotnet build environment # dotnet build environment
#FROM alpine:latest FROM alpine:latest as dotnet
#WORKDIR / WORKDIR /
#RUN apk add dotnet8-sdk git RUN apk add dotnet8-sdk git
#RUN git clone https://gitlab.com/kzotkin/hiveemulator RUN git clone https://gitlab.com/kzotkin/hiveemulator
#WORKDIR /hiveemulator/src/CommunicationControl/ WORKDIR /hiveemulator/src/CommunicationControl/
#RUN dotnet build DevOpsProject/DevOpsProject.CommunicationControl.API.csproj RUN dotnet build DevOpsProject/DevOpsProject.CommunicationControl.API.csproj
#RUN dotnet build DevOpsProject.HiveMind.API/DevOpsProject.HiveMind.API.csproj RUN dotnet build DevOpsProject.HiveMind.API/DevOpsProject.HiveMind.API.csproj
# nodejs build environment # nodejs build environment
@ -27,14 +27,19 @@ FROM alpine:latest
WORKDIR / WORKDIR /
#RUN apk add dotnet8-sdk redis openrc lighttpd npm #RUN apk add dotnet8-sdk redis openrc lighttpd npm
RUN apk add git dotnet8-sdk redis openrc npm #RUN apk add git dotnet8-sdk redis openrc npm
#RUN apk add git aspnetcore8-runtime redis openrc npm
RUN apk add aspnetcore8-runtime redis openrc npm
RUN git clone https://gitlab.com/kzotkin/hiveemulator #RUN git clone https://gitlab.com/kzotkin/hiveemulator
#COPY --from=nodejs /hiveemulator/ /hiveemulator/ #COPY --from=nodejs /hiveemulator/ /hiveemulator/
COPY --from=dotnet /hiveemulator/ /hiveemulator/
#COPY --from=nodejs /hiveemulator/src/MapClient/dist/* /var/www/localhost/htdocs/ #COPY --from=nodejs /hiveemulator/src/MapClient/dist/* /var/www/localhost/htdocs/
#RUN mkdir /hive-cc #RUN mkdir /hive-cc
#COPY --from=0 /hiveemulator/src/CommunicationControl/DevOpsProject/* /hive-cc/ #COPY --from=0 /hiveemulator/src/CommunicationControl/DevOpsProject/* /hive-cc/
#COPY --from=dotnet /hiveemulator/src/CommunicationControl/DevOpsProject/* /hiveemulator/src/CommunicationControl/DevOpsProject/
#COPY --from=dotnet /hiveemulator/src/CommunicationControl/DevOpsProject.HiveMind.API/* /hiveemulator/src/CommunicationControl/DevOpsProject.HiveMind.API/
#RUN mkdir /hive-hm #RUN mkdir /hive-hm
#COPY --from=0 /hiveemulator/src/CommunicationControl/DevOpsProject.HiveMind.API/* /hive-hm/ #COPY --from=0 /hiveemulator/src/CommunicationControl/DevOpsProject.HiveMind.API/* /hive-hm/
@ -43,6 +48,7 @@ WORKDIR /hiveemulator/src/MapClient/
RUN npm install RUN npm install
RUN sed -i 's/localhost/10\.1\.1\.2/' public/config.json RUN sed -i 's/localhost/10\.1\.1\.2/' public/config.json
WORKDIR /
COPY ./daemon-files/hive-cc /etc/init.d/hive-cc COPY ./daemon-files/hive-cc /etc/init.d/hive-cc
COPY ./daemon-files/hive-hm /etc/init.d/hive-hm COPY ./daemon-files/hive-hm /etc/init.d/hive-hm
COPY ./daemon-files/hive-map /etc/init.d/hive-map COPY ./daemon-files/hive-map /etc/init.d/hive-map

8
daemon-files/hive-cc
View File

@ -1,10 +1,14 @@
#!/sbin/openrc-run #!/sbin/openrc-run
command="/usr/bin/dotnet" command="./DevOpsProject.CommunicationControl.API"
command_args="run --project /hiveemulator/src/CommunicationControl/DevOpsProject/DevOpsProject.CommunicationControl.API.csproj" command_args=""
pidfile="/run/hive-cc.pid" pidfile="/run/hive-cc.pid"
supervisor="supervise-daemon" supervisor="supervise-daemon"
start_pre() {
cd /hiveemulator/src/CommunicationControl/DevOpsProject/bin/Debug/net8.0/
}
depend() { depend() {
need redis need redis
} }

8
daemon-files/hive-hm
View File

@ -1,10 +1,14 @@
#!/sbin/openrc-run #!/sbin/openrc-run
command="/usr/bin/dotnet" command="./DevOpsProject.HiveMind.API"
command_args="run --project /hiveemulator/src/CommunicationControl/DevOpsProject.HiveMind.API/DevOpsProject.HiveMind.API.csproj" command_args=""
pidfile="/run/hive-hm.pid" pidfile="/run/hive-hm.pid"
supervisor="supervise-daemon" supervisor="supervise-daemon"
start_pre() {
cd /hiveemulator/src/CommunicationControl/DevOpsProject.HiveMind.API/bin/Debug/net8.0/
}
depend() { depend() {
need hive-cc need hive-cc
} }

3
daemon-files/hive-map
View File

@ -9,7 +9,6 @@ depend() {
need hive-cc need hive-cc
} }
start() { start_pre() {
cd /hiveemulator/src/MapClient/ cd /hiveemulator/src/MapClient/
${command} ${command_args}
} }