From 4766dea3d59569cc8b590696e479002b3677fe66 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 14 Jan 2025 17:27:01 +0100 Subject: [PATCH] ci(azure-pipelines): cleanup yaml --- azure-pipelines.yaml | 71 ++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 52 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 4511b2469..00e76a5d9 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -5,18 +5,7 @@ pool: 'Prod Private Agent Pool' jobs: -# - job: HelloWorld -# container: -# image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04' -# endpoint: devfra -# steps: -# - script: echo Hello, world! -# displayName: 'Run a one-line script' -# - script: | -# echo Add other tasks to build, test, and deploy your project. -# echo See https://aka.ms/yaml -# displayName: 'Run a multi-line script' -- job: DockerTaskTest +- job: BuildImages container: image: devfra.azurecr.io/de.fraport.build/tools:1.1.0 endpoint: devfra @@ -42,43 +31,21 @@ jobs: --build-arg MOUNT_DIR=$(Build.Repository.LocalPath) \ --build-arg PROJECT_DIR=/fradrive \ . - - task: Docker@2 - name: dockerBuild - displayName: Backend image build test - inputs: - command: build - Dockerfile: docker/backend/Dockerfile - buildContext: . - tags: | - $(Build.BuildNumber) - backend - arguments: | - --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 - --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 - --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' - --build-arg FROM_IMG=devfra.azurecr.io/de.fraport.build/haskell - --build-arg MOUNT_DIR=$(Build.Repository.LocalPath) - --build-arg PROJECT_DIR=/fradrive - # -v $(Build.Repository.LocalPath):/mnt/fradrive # supported in podman build, but not in docker build -# - job: BuildKitTest -# container: -# image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1' -# endpoint: devfra -# steps: -# - script: buildctl build \ -# --frontend=dockerfile.v0 \ -# --local context=. \ -# --local dockerfile=docker/backend/Dockerfile -# displayName: BuildKit test -# - job: CustomBuildahTest -# container: -# image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04' -# endpoint: devfra -# steps: -# - script: | -# id -# docker build --help -# sudo apt-get -y update -# sudo apt-get -y install buildah -# buildah bud -t fradrive-backend-test --volume .:/mnt/fradrive --file docker/backend/Dockerfile -# displayName: Build buildah image \ No newline at end of file + # - task: Docker@2 + # name: dockerBuild + # displayName: Backend image build test + # inputs: + # command: build + # Dockerfile: docker/backend/Dockerfile + # buildContext: . + # tags: | + # $(Build.BuildNumber) + # backend + # arguments: | + # --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 + # --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 + # --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' + # --build-arg FROM_IMG=devfra.azurecr.io/de.fraport.build/haskell + # --build-arg MOUNT_DIR=$(Build.Repository.LocalPath) + # --build-arg PROJECT_DIR=/fradrive + # # -v $(Build.Repository.LocalPath):/mnt/fradrive # supported in podman build, but not in docker build \ No newline at end of file