From 489fb3236ad8b7cb46586ea23244427307be0c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Gro=C3=9F?= <julian.g@posteo.de>
Date: Tue, 9 Aug 2022 16:53:04 +0200
Subject: [PATCH] Update docker_server.yml

---
 .woodpecker/docker_server.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.woodpecker/docker_server.yml b/.woodpecker/docker_server.yml
index 88e4eea875..d5fc70a76e 100644
--- a/.woodpecker/docker_server.yml
+++ b/.woodpecker/docker_server.yml
@@ -10,16 +10,7 @@ platform: ${platform}
 pipeline:
   setup_environment:
     image: docker.io/juliangro/overte-server-build:0.1
-
-
     commands:
-      # Deliberately fail immediately
-      - return 1
-
-      #- if [ "CI_BUILD_EVENT" = "pull_request" ]; then
-      #    export UPLOAD_PREFIX=build/overte/PR
-      #  fi
-      - echo ::set-output name=commit_sha_short::`echo $CI_COMMIT_SHA | cut -c1-7`
       - >
         if [ "${platform}" = "aarch64" ]; then
           export VCPKG_FORCE_SYSTEM_BINARIES=true
@@ -54,13 +45,13 @@ pipeline:
   build_assignment_client:
     image: docker.io/juliangro/overte-server-build:0.1
     commands:
+      - cd build
       - make -j$(nproc) assignment-client
 
 
   create_docker_runtime_image:
     image: docker.io/juliangro/overte-server-build:0.1
     commands:
-      - cd ..
       - docker build -t overte-org/overte-server:${CI_COMMIT_SHA}_${CI_BUILD_NUMBER} -f tools/ci-scripts/docker_package/Dockerfile_runtime .
 
 
@@ -86,6 +77,7 @@ pipeline:
           return 0
         fi
 
+
   upload_docker_runtime_image:
     image: woodpeckerci/plugin-s3
     settings: