Skip to content

Commit bb32874

Browse files
committed
fix: simplify further
1 parent 1679360 commit bb32874

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/build-and-publish.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
docker build `
4040
--build-arg WINDOWS_VERSION=ltsc2022 `
4141
--build-arg VECTOR_VERSION=0.51.0 `
42-
-t ${{ github.repository_owner }}/vector-windows-container-image:latest `
43-
-t ${{ github.repository_owner }}/vector-windows-container-image:v0.51.0 `
42+
-t ghcr.io/${{ github.repository_owner }}/vector-windows-container-image:latest `
43+
-t ghcr.io/${{ github.repository_owner }}/vector-windows-container-image:v0.51.0 `
4444
.
4545
46-
docker push ${{ github.repository_owner }}/vector-windows-container-image:latest
47-
docker push ${{ github.repository_owner }}/vector-windows-container-image:v0.51.0
46+
docker push ghcr.io/${{ github.repository_owner }}/vector-windows-container-image:latest
47+
docker push ghcr.io/${{ github.repository_owner }}/vector-windows-container-image:v0.51.0

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ FROM mcr.microsoft.com/windows/servercore:$WINDOWS_VERSION
77

88
WORKDIR C:/Program Files/Vector
99

10-
RUN powershell -Command \
11-
Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/vectordotdev/vector/releases/download/v$env:VECTOR_VERSION/vector-$env:VECTOR_VERSION-x86_64-pc-windows-msvc.zip" -OutFile "vector.zip"; \
10+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
11+
12+
RUN Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/vectordotdev/vector/releases/download/v$env:VECTOR_VERSION/vector-$env:VECTOR_VERSION-x86_64-pc-windows-msvc.zip" -OutFile "vector.zip"; \
1213
Expand-Archive -Path "vector.zip" -DestinationPath "."; \
1314
Remove-Item "vector.zip"
1415

0 commit comments

Comments
 (0)