gg

Oslandia · Apr 26, 2024 · 45ee359 · 45ee359
1 parent d37ee97
commit 45ee359
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.gitlab/pipeline/build-windows.yml b/.gitlab/pipeline/build-windows.yml
@@ -15,13 +15,8 @@ build:windows:
     - Start-Service -Name "docker"
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
-    - docker build
-      --pull
-      --cache-from $CI_REGISTRY_IMAGE:latest
-      --tag $CI_REGISTRY_IMAGE:windows_$CI_COMMIT_SHA
-      -f Dockerfile.windows
-      .
-    - docker push $CI_REGISTRY_IMAGE:windows_$CI_COMMIT_SHA
+    - docker build --tag foo -f Dockerfile.windows .
+    - docker push foo
   after_script:
     - docker logout $CI_REGISTRY
 

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -8,3 +8,9 @@ RUN Invoke-WebRequest "https://aka.ms/vs/17/release/vs_buildtools.exe" \
 RUN "%TEMP%\vs_buildtools.exe"  --quiet --wait --norestart --noUpdateInstaller \
     --add Microsoft.VisualStudio.Workload.VCTools \
     --includeRecommended
+
+# install vcpkg
+RUN $Env:VCPKG_INSTALL_DIR = "c:\\vcpkg"
+RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
+    cd %VCPKG_INSTALL_DIR% && \
+    bootstrap-vcpkg.bat