Fix some minor issues in linux build dockers (#3724)

- Fix a git permission issue that's currently worked around in the github workflows. - Add clang. - Move dockers out of .azure folder.
microsoft · Jun 25, 2023 · c632272 · c632272
1 parent a36c233
commit c632272
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 10 deletions.
diff --git a/.azure/OneBranch.Docker.Official.yml b/.azure/OneBranch.Docker.Official.yml
@@ -14,7 +14,7 @@ trigger:
     - main
   paths:
     include:
-    - .azure/dockers/ob/windows/*
+    - .docker/windows/*
 
 schedules:
 - cron: '0 0 * * Sat' # Every Saturday
@@ -95,13 +95,13 @@ extends:
             - task: DownloadPipelineArtifact@2
               displayName: '🔒 Download artifacts'
               inputs:
-                targetPath: $(Build.SourcesDirectory)\dst\.azure\dockers\ob\windows
+                targetPath: $(Build.SourcesDirectory)\dst\.docker\windows
                 artifact: drop_docker_download_external_libs
             - task: onebranch.pipeline.imagebuildinfo@1
               inputs:
                 repositoryName: msquicbuild
-                dockerFileRelPath: .azure\dockers\ob\windows\Dockerfile
-                dockerFileContextPath: .azure\dockers\ob\windows
+                dockerFileRelPath: .docker\windows\Dockerfile
+                dockerFileContextPath: .docker\windows
                 enable_network: true
                 build_tag: '$(Build.BuildNumber)'
                 enable_isolated_acr_push: true

diff --git a/.azure/dockers/ob/linux-20.04/Dockerfile → .docker/linux-20.04/Dockerfile b/.azure/dockers/ob/linux-20.04/Dockerfile → .docker/linux-20.04/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
     g++-aarch64-linux-gnu \
     binutils-aarch64-linux-gnu \
     cmake \
+    clang \
     git \
     make \
     sudo \
@@ -65,3 +66,6 @@ RUN apt-get install --no-install-recommends -y liblttng-ust-dev:arm64 \
     libnuma-dev:arm64 \
     libnuma-dev:armhf \
     && rm -rf /var/lib/apt/lists/*
+
+RUN git config --system --add safe.directory "*"
+
diff --git a/...inux-20.04/arm-cross-compile-sources.list → ...inux-20.04/arm-cross-compile-sources.list b/...inux-20.04/arm-cross-compile-sources.list → ...inux-20.04/arm-cross-compile-sources.list
diff --git a/.azure/dockers/ob/linux-22.04/Dockerfile → .docker/linux-22.04/Dockerfile b/.azure/dockers/ob/linux-22.04/Dockerfile → .docker/linux-22.04/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
     g++-aarch64-linux-gnu \
     binutils-aarch64-linux-gnu \
     cmake \
+    clang \
     git \
     make \
     sudo \
@@ -65,3 +66,5 @@ RUN apt-get --no-install-recommends install -y liblttng-ust-dev:arm64 \
     libnuma-dev:arm64 \
     libnuma-dev:armhf \
     && rm -rf /var/lib/apt/lists/*
+
+RUN git config --system --add safe.directory "*"
diff --git a/...inux-22.04/arm-cross-compile-sources.list → ...inux-22.04/arm-cross-compile-sources.list b/...inux-22.04/arm-cross-compile-sources.list → ...inux-22.04/arm-cross-compile-sources.list
diff --git a/.azure/dockers/ob/windows/Dockerfile → .docker/windows/Dockerfile b/.azure/dockers/ob/windows/Dockerfile → .docker/windows/Dockerfile
diff --git a/.azure/dockers/ob/windows/install-tools.ps1 → .docker/windows/install-tools.ps1 b/.azure/dockers/ob/windows/install-tools.ps1 → .docker/windows/install-tools.ps1
diff --git a/.../dockers/ob/windows/install-workloads.ps1 → .docker/windows/install-workloads.ps1 b/.../dockers/ob/windows/install-workloads.ps1 → .docker/windows/install-workloads.ps1
diff --git a/.azure/dockers/ob/windows/install.cmd → .docker/windows/install.cmd b/.azure/dockers/ob/windows/install.cmd → .docker/windows/install.cmd
diff --git a/.azure/dockers/ob/windows/msquic.vsconfig → .docker/windows/msquic.vsconfig b/.azure/dockers/ob/windows/msquic.vsconfig → .docker/windows/msquic.vsconfig
diff --git a/...kers/ob/windows/win-installer-helper.psm1 → .docker/windows/win-installer-helper.psm1 b/...kers/ob/windows/win-installer-helper.psm1 → .docker/windows/win-installer-helper.psm1
diff --git a/.github/workflows/docker-publish-xcomp.yml b/.github/workflows/docker-publish-xcomp.yml
@@ -5,14 +5,14 @@ on:
     branches: [ main ]
     paths:
     - .github/workflows/docker-publish-xcomp.yml
-    - .azure/dockers/ob/linux-20.04
-    - .azure/dockers/ob/linux-22.04
+    - .docker/linux-20.04
+    - .docker/linux-22.04
   pull_request:
     branches: [ main ]
     paths:
     - .github/workflows/docker-publish-xcomp.yml
-    - .azure/dockers/ob/linux-20.04
-    - .azure/dockers/ob/linux-22.04
+    - .docker/linux-20.04
+    - .docker/linux-22.04
 
 permissions: read-all
 
@@ -67,8 +67,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
         with:
-          context: .azure/dockers/ob/linux-${{ matrix.version }}
-          file: .azure/dockers/ob/linux-${{ matrix.version }}/Dockerfile
+          context: .docker/linux-${{ matrix.version }}
+          file: .docker/linux-${{ matrix.version }}/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.version }}
           labels: ${{ steps.meta.outputs.labels }}