Base images updates + surround registry password with ' (#50)
* dotnet/core/aspnet:3.1.4 * surround registry password with ' * surround registry password with ' * node:14.2.0-alpine * update nuget packages for parrot * php:7.4.6-apache
This commit is contained in:
Родитель
f61ff07c0b
Коммит
6b6ff2962c
|
@ -10,7 +10,7 @@ steps:
|
|||
az login \
|
||||
--service-principal \
|
||||
-u $(aksSpId) \
|
||||
-p $(aksSpSecret) \
|
||||
-p '$(aksSpSecret)' \
|
||||
--tenant $(aksSpTenantId)
|
||||
az aks get-credentials \
|
||||
-n $(aks) \
|
||||
|
@ -19,7 +19,7 @@ steps:
|
|||
$(registryName) \
|
||||
https://$(registryServerName)/helm/v1/repo \
|
||||
--username $(registryLogin) \
|
||||
--password $(registryPassword)
|
||||
--password '$(registryPassword)'
|
||||
helmChartVersion=$(jq .helmChartVersion $(pipeline.workspace)/ci-pipeline/build-artifact/variables.json -r)
|
||||
helm upgrade \
|
||||
--namespace $(k8sNamespace) \
|
||||
|
|
|
@ -7,7 +7,7 @@ steps:
|
|||
failOnStderr: true
|
||||
displayName: 'docker build'
|
||||
- bash: |
|
||||
echo $(registryPassword) | docker login \
|
||||
echo '$(registryPassword)' | docker login \
|
||||
$(registryServerName) \
|
||||
-u $(registryLogin) \
|
||||
--password-stdin
|
||||
|
@ -36,7 +36,7 @@ steps:
|
|||
az acr helm push \
|
||||
-n $(registryName) \
|
||||
-u $(registryLogin) \
|
||||
-p $(registryPassword) \
|
||||
-p '$(registryPassword)' \
|
||||
$chartPackage
|
||||
echo $(jq -n --arg version "$(helmChartVersion)" '{helmChartVersion: $version}') > $(build.artifactStagingDirectory)/variables.json
|
||||
failOnStderr: true
|
||||
|
|
|
@ -18,7 +18,7 @@ WORKDIR /app
|
|||
COPY . /app
|
||||
|
||||
# Release with Alpine
|
||||
FROM node:14.0.0-alpine AS release
|
||||
FROM node:14.2.0-alpine AS release
|
||||
|
||||
# Create app directory
|
||||
WORKDIR /app
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.201-alpine AS build-env
|
||||
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202-alpine AS build-env
|
||||
WORKDIR /app
|
||||
|
||||
# Copy csproj and restore as distinct layers
|
||||
|
@ -10,7 +10,7 @@ COPY . ./
|
|||
RUN dotnet publish -c Release -o out
|
||||
|
||||
# Build runtime image
|
||||
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.3-alpine
|
||||
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.4-alpine
|
||||
WORKDIR /app
|
||||
COPY --from=build-env /app/out .
|
||||
ENTRYPOINT ["dotnet", "parrot.dll"]
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.2.1" />
|
||||
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.4.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
|
||||
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
|
||||
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
|
||||
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.2" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -2,7 +2,7 @@ FROM composer:1 AS build-env
|
|||
COPY . /app
|
||||
RUN cd /app && composer install
|
||||
|
||||
FROM php:7.4.5-apache
|
||||
FROM php:7.4.6-apache
|
||||
ENV PORT 3333
|
||||
EXPOSE 3333
|
||||
COPY --from=build-env /app /var/www/html
|
||||
|
|
Загрузка…
Ссылка в новой задаче