diff --git a/.dockerignore b/.dockerignore index 1ec56340b956468ff6fcb143cd2baebe653ab370..44faecd4af9ed09fccdf5046decdabe4cf14e97b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,6 +6,7 @@ **/.settings **/.toolstarget **/*.lock +**/package-lock.json **/.vs **/.vscode **/*.*proj.user diff --git a/IoTSharp/Dockerfile_with_vue b/IoTSharp/Dockerfile_with_vue index 6ed171a52fe33229ee7be24ccfed05b47f7ef33f..42ef61bbcc1fdde7177bfab30d83779f2332b130 100644 --- a/IoTSharp/Dockerfile_with_vue +++ b/IoTSharp/Dockerfile_with_vue @@ -17,7 +17,7 @@ RUN apt-get -y update && \ 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 && \ gpg --no-default-keyring --keyring "$KEYRING" --list-keys && \ - VERSION=node_14.x && DISTRO=bullseye && \ + VERSION=node_12.x && DISTRO=bullseye && \ echo "deb [signed-by=$KEYRING] https://deb.nodesource.com/$VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list && \ apt-get -y -q update && \ apt-get install -y nodejs && \ @@ -29,9 +29,11 @@ RUN KEYRING=/usr/share/keyrings/nodesource.gpg && curl -fsSL https://deb.nodesou WORKDIR /src COPY ["IoTSharp/ClientAppVue/package.json", "IoTSharp/ClientAppVue/package.json"] -RUN npm install -g yarn && yarn config set sass_binary_site http://cdn.npm.taobao.org/dist/node-sass -g && \ - yarn config set registry https://registry.npm.taobao.org -g && \ - yarn add sass@1.26.5 --cwd ./IoTSharp/ClientAppVue/ && yarn install --cwd ./IoTSharp/ClientAppVue/ +WORKDIR /src/IoTSharp/ClientApp/ +RUN npm install yarn -g +RUN yarn add node-sass@4.12.0 +RUN yarn install +WORKDIR /src COPY ["IoTSharp/IoTSharp.csproj", "IoTSharp/"] COPY ["IoTSharp.Contracts/IoTSharp.Contracts.csproj", "IoTSharp.Contracts/"] COPY ["IoTSharp.Data.Storage/IoTSharp.Data.Cassandra/IoTSharp.Data.Cassandra.csproj", "IoTSharp.Data.Storage/IoTSharp.Data.Cassandra/"] diff --git a/IoTSharp/IoTSharp.csproj b/IoTSharp/IoTSharp.csproj index ebb5d196ef852e50435744079d806dabb4379049..f7cdc92bd5934861955974994d5a50de2cbc0700 100644 --- a/IoTSharp/IoTSharp.csproj +++ b/IoTSharp/IoTSharp.csproj @@ -193,13 +193,13 @@ - + - +