fix all issues
This commit is contained in:
24
Dockerfile
24
Dockerfile
@@ -1,13 +1,13 @@
|
||||
# dotnet build environment
|
||||
#FROM alpine:latest
|
||||
#WORKDIR /
|
||||
FROM alpine:latest as dotnet
|
||||
WORKDIR /
|
||||
|
||||
#RUN apk add dotnet8-sdk git
|
||||
#RUN git clone https://gitlab.com/kzotkin/hiveemulator
|
||||
RUN apk add dotnet8-sdk git
|
||||
RUN git clone https://gitlab.com/kzotkin/hiveemulator
|
||||
|
||||
#WORKDIR /hiveemulator/src/CommunicationControl/
|
||||
#RUN dotnet build DevOpsProject/DevOpsProject.CommunicationControl.API.csproj
|
||||
#RUN dotnet build DevOpsProject.HiveMind.API/DevOpsProject.HiveMind.API.csproj
|
||||
WORKDIR /hiveemulator/src/CommunicationControl/
|
||||
RUN dotnet build DevOpsProject/DevOpsProject.CommunicationControl.API.csproj
|
||||
RUN dotnet build DevOpsProject.HiveMind.API/DevOpsProject.HiveMind.API.csproj
|
||||
|
||||
|
||||
# nodejs build environment
|
||||
@@ -27,14 +27,19 @@ FROM alpine:latest
|
||||
WORKDIR /
|
||||
|
||||
#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=dotnet /hiveemulator/ /hiveemulator/
|
||||
#COPY --from=nodejs /hiveemulator/src/MapClient/dist/* /var/www/localhost/htdocs/
|
||||
|
||||
#RUN mkdir /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
|
||||
#COPY --from=0 /hiveemulator/src/CommunicationControl/DevOpsProject.HiveMind.API/* /hive-hm/
|
||||
@@ -43,6 +48,7 @@ WORKDIR /hiveemulator/src/MapClient/
|
||||
RUN npm install
|
||||
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-hm /etc/init.d/hive-hm
|
||||
COPY ./daemon-files/hive-map /etc/init.d/hive-map
|
||||
|
||||
Reference in New Issue
Block a user