Merge branch 'main' of https://gitlab.nrp-nautilus.io/ar-noc/arnobeta

.gitlab-ci.yml

@@ -23,7 +23,7 @@ build-and-push-job-server:
   stage: build-and-push-ps-ds
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --cache=true --context $CI_PROJECT_DIR --dockerfile "$CI_PROJECT_DIR/Docker/ARNocAlphaLinuxServer" --destination "${CI_REGISTRY_IMAGE}/arnolinuxserver:{CI_COMMIT_SHA}" --destination "${CI_REGISTRY_IMAGE}/arnolinuxserver:latest"
+    - /kaniko/executor --cache=true --context $CI_PROJECT_DIR --dockerfile "$CI_PROJECT_DIR/Docker/ARNocAlphaLinuxServer" --destination "${CI_REGISTRY_IMAGE}/arnolinuxserver:${CI_COMMIT_SHA}" --destination "${CI_REGISTRY_IMAGE}/arnolinuxserver:latest"
     
 #pull-job:
 #  stage: pull-linux-build

Docker/ARNocAlphaLinuxServer

@@ -20,7 +20,7 @@ RUN /home/ue4/UnrealEngine/Engine/Build/BatchFiles/RunUAT.sh \
 -platform=Linux \
 -clientconfig=Development \
 -serverconfig=Development \
--project=/tmp/project/CollabViewer.uproject \
+-project=/tmp/project/arnocMain.uproject \
 -noP4 -nodebuginfo -allmaps \
 -cook -build -stage -prereqs -pak -archive \
 -archivedirectory=/tmp/project/Packaged