提交 4b143b3d 编写于 作者: 麦壳饼's avatar 麦壳饼

1. 修改docker构建,

2. 去掉前端镜像。
上级 d799a666
...@@ -12,7 +12,7 @@ jobs: ...@@ -12,7 +12,7 @@ jobs:
strategy: strategy:
matrix: matrix:
configuration: [Release] configuration: [Release]
publish_profile: [win7-x64,linux-x64,osx-x64,linux-arm64] # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog publish_profile: [win7-x64,linux-x64,osx-x64,linux-arm64,linux-arm] # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog
runs-on: windows-latest runs-on: windows-latest
...@@ -43,9 +43,9 @@ jobs: ...@@ -43,9 +43,9 @@ jobs:
Configuration: ${{ matrix.configuration }} Configuration: ${{ matrix.configuration }}
# Create the app package by building and packaging the Windows Application Packaging project # Create the app package by building and packaging the Windows Application Packaging project
# npm config set registry https://registry.npmmirror.com
- name: Building and Packaging - name: Building and Packaging
run: | run: |
npm config set registry https://registry.npmmirror.com
set NODE_OPTIONS=--openssl-legacy-provider set NODE_OPTIONS=--openssl-legacy-provider
dotnet build IoTSharp.sln -c $env:Configuration /p:DeployOnBuild=true /p:PublishProfile=$env:PublishProfile dotnet build IoTSharp.sln -c $env:Configuration /p:DeployOnBuild=true /p:PublishProfile=$env:PublishProfile
env: env:
......
...@@ -12,9 +12,9 @@ EXPOSE 8883 ...@@ -12,9 +12,9 @@ EXPOSE 8883
FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build
RUN apt-get -y update && \ RUN apt-get -y update && \
apt-get install -y --no-install-recommends apt-utils libgdiplus libc6-dev lsof net-tools wget sqlite3 iputils-ping inetutils-tools build-essential libfontconfig1 curl gnupg2 gnupg && \ apt-get install -y --no-install-recommends apt-utils libgdiplus libc6-dev lsof net-tools wget sqlite3 iputils-ping inetutils-tools build-essential libfontconfig1 curl gnupg2 gnupg && \
apt-get autoclean apt-get autoclean
RUN KEYRING=/usr/share/keyrings/nodesource.gpg && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | tee "$KEYRING" >/dev/null && \ RUN KEYRING=/usr/share/keyrings/nodesource.gpg && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | tee "$KEYRING" >/dev/null && \
gpg --no-default-keyring --keyring "$KEYRING" --list-keys && \ gpg --no-default-keyring --keyring "$KEYRING" --list-keys && \
VERSION=node_16.x && DISTRO=bullseye && \ VERSION=node_16.x && DISTRO=bullseye && \
...@@ -26,7 +26,6 @@ RUN KEYRING=/usr/share/keyrings/nodesource.gpg && curl -fsSL https://deb.nodesou ...@@ -26,7 +26,6 @@ RUN KEYRING=/usr/share/keyrings/nodesource.gpg && curl -fsSL https://deb.nodesou
export NODE_OPTIONS=--openssl-legacy-provider && \ export NODE_OPTIONS=--openssl-legacy-provider && \
apt-get autoclean apt-get autoclean
WORKDIR /src WORKDIR /src
COPY ["IoTSharp/ClientApp/package.json", "IoTSharp/ClientApp/package.json"] COPY ["IoTSharp/ClientApp/package.json", "IoTSharp/ClientApp/package.json"]
WORKDIR /src/IoTSharp/ClientApp/ WORKDIR /src/IoTSharp/ClientApp/
......
docker build -t registry.uixe.net/uixe/iotsharp . -f IoTSharp/Dockerfile_with_vue docker build -t registry.uixe.net/uixe/iotsharp . -f IoTSharp/Dockerfile
docker push registry.uixe.net/uixe/iotsharp docker push registry.uixe.net/uixe/iotsharp
docker image prune -f docker image prune -f
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册